svnno****@sourc*****
svnno****@sourc*****
Mon Mar 26 15:26:10 JST 2007
Revision: 3022
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3022
Author: kous
Date: 2007-03-26 15:26:10 +0900 (Mon, 26 Mar 2007)
Log Message:
-----------
* macros/gecko.m4: follow-up the previous commit.
Modified Paths:
--------------
kazehakase/trunk/macros/gecko.m4
Modified: kazehakase/trunk/macros/gecko.m4
===================================================================
--- kazehakase/trunk/macros/gecko.m4 2007-03-26 06:11:23 UTC (rev 3021)
+++ kazehakase/trunk/macros/gecko.m4 2007-03-26 06:26:10 UTC (rev 3022)
@@ -310,19 +310,21 @@
AM_CONDITIONAL(ENABLE_GTKMOZEMBED, test x"$enable_gtkmozembed" = "xyes")
+have_gecko_version_1_8=no
+have_gecko_version_1_9=no
if test -n "$gecko_version_major" -a -n "$gecko_version_minor"; then
- gecko_version_is_detected=yes
-else
- gecko_version_is_detected=no
+ if test $gecko_version_major -eq 1; then
+ if test $gecko_version_minor -ge 8; then
+ have_gecko_version_1_8=yes
+ fi
+ if test $gecko_version_minor -ge 9; then
+ have_gecko_version_1_9=yes
+ fi
+ fi
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([HAVE_GECKO_1_8], [test $have_gecko_version_1_8 = "yes"])
+AM_CONDITIONAL([HAVE_GECKO_1_9], [test $have_gecko_version_1_9 = "yes"])
AM_CONDITIONAL([MOZ_NO_NSICANVASRENDERINGCONTEXTINTERNAL_HAVE_GETINPUTSTREAM_],
[test "$no_nsicanvasrenderingcontextinternal_have_getinputstream" = "no"])