svnno****@sourc*****
svnno****@sourc*****
Mon Mar 26 15:11:24 JST 2007
Revision: 3021
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3021
Author: kous
Date: 2007-03-26 15:11:23 +0900 (Mon, 26 Mar 2007)
Log Message:
-----------
* macros/gecko.m4: suppressed warnings.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/macros/gecko.m4
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2007-03-26 05:24:20 UTC (rev 3020)
+++ kazehakase/trunk/ChangeLog 2007-03-26 06:11:23 UTC (rev 3021)
@@ -1,5 +1,7 @@
2007-03-26 Kouhei Sutou <kou****@cozmi*****>
+ * macros/gecko.m4: suppressed warnings.
+
* configure.ac: added ${srcdir}/ prefix to support building in
different directory.
Modified: kazehakase/trunk/macros/gecko.m4
===================================================================
--- kazehakase/trunk/macros/gecko.m4 2007-03-26 05:24:20 UTC (rev 3020)
+++ kazehakase/trunk/macros/gecko.m4 2007-03-26 06:11:23 UTC (rev 3021)
@@ -55,16 +55,23 @@
gecko_version_major=`echo $gecko_version | awk '{ print $[1]; }'`
gecko_version_minor=`echo $gecko_version | awk '{ print $[2]; }'`
-AC_MSG_RESULT([$gecko_version_major.$gecko_version_minor])
+if test -n "$gecko_version_major" -a -n "$gecko_version_minor"; then
+ AC_MSG_RESULT([$gecko_version_major.$gecko_version_minor])
+else
+ AC_MSG_RESULT([no])
+ AC_MSG_ERROR([Can't detect Gecko version])
+fi
-if test "$gecko_version_major" != "1" -o "$gecko_version_minor" -lt "7" -o "$gecko_version_minor" -gt "9"; then
+if test $gecko_version_major -ne 1 -o \
+ $gecko_version_minor -lt 7 -o \
+ $gecko_version_minor -gt 9; then
AC_MSG_ERROR([Unsupported Gecko version $gecko_version_major.$gecko_version_minor])
fi
-if test "$gecko_version_major" = "1" -a "$gecko_version_minor" -ge "8"; then
+if test $gecko_version_major -eq 1 -a $gecko_version_minor -ge 8; then
AC_DEFINE([HAVE_GECKO_1_8],[1],[Define if we have gecko 1.8])
fi
-if test "$gecko_version_major" = "1" -a "$gecko_version_minor" -ge "9"; then
+if test $gecko_version_major -eq 1 -a $gecko_version_minor -ge 9; then
AC_DEFINE([HAVE_GECKO_1_9],[1],[Define if we have gecko 1.9])
fi
@@ -302,8 +309,21 @@
fi
AM_CONDITIONAL(ENABLE_GTKMOZEMBED, test x"$enable_gtkmozembed" = "xyes")
-AM_CONDITIONAL([HAVE_GECKO_1_8],[test "$gecko_version_major" = "1" -a "$gecko_version_minor" -ge "8"])
-AM_CONDITIONAL([HAVE_GECKO_1_9],[test "$gecko_version_major" = "1" -a "$gecko_version_minor" -ge "9"])
-AM_CONDITIONAL([MOZ_NO_NSICANVASRENDERINGCONTEXTINTERNAL_HAVE_GETINPUTSTREAM_], [test "$no_nsicanvasrenderingcontextinternal_have_getinputstream" = "no"])
+if test -n "$gecko_version_major" -a -n "$gecko_version_minor"; then
+ gecko_version_is_detected=yes
+else
+ gecko_version_is_detected=no
+fi
+AM_CONDITIONAL([HAVE_GECKO_1_8],
+ [test $gecko_version_is_detected = "yes" -a \
+ $gecko_version_major -eq 1 -a \
+ $gecko_version_minor -ge 8])
+AM_CONDITIONAL([HAVE_GECKO_1_9],
+ [test $gecko_version_is_detected = "yes" -a \
+ $gecko_version_major -eq 1 -a \
+ $gecko_version_minor -ge 9])
+AM_CONDITIONAL([MOZ_NO_NSICANVASRENDERINGCONTEXTINTERNAL_HAVE_GETINPUTSTREAM_],
+ [test "$no_nsicanvasrenderingcontextinternal_have_getinputstream" = "no"])
+
])