Fix configure check for gecko >= 1.8.

2005-08-25  Christian Persch  <chpe@cvs.gnome.org>

	* configure.ac:

	Fix configure check for gecko >= 1.8.

2 files changed, 23 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 93d6533cb..be520c32c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-25  Christian Persch  <chpe@cvs.gnome.org>
+
+	* configure.ac:
+
+	Fix configure check for gecko >= 1.8.
+
 2005-08-22  Christian Persch  <chpe@cvs.gnome.org>
 
 	* embed/mozilla/EphyBrowser.cpp:
diff --git a/configure.ac b/configure.ac
index 7884f341d..6957484c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -305,15 +305,14 @@ dnl and not the Gecko version
 
 AC_MSG_CHECKING([[for gecko version]])
 
-gecko_version_major=`cat $MOZILLA_INCLUDE_ROOT/mozilla-config.h | grep MOZILLA_VERSION_MAJOR | awk '{ print $[3]; }'`
-gecko_version_minor=`cat $MOZILLA_INCLUDE_ROOT/mozilla-config.h | grep MOZILLA_VERSION_MINOR | awk '{ print $[3]; }'`
-
-dnl These variables are only available since gecko 1.8
-if test -z "$gecko_version_major" -o -z "$gecko_version_minor"; then
-	gecko_version_major=1
-	gecko_version_minor=7
+gecko_version=`cat $MOZILLA_INCLUDE_ROOT/mozilla-config.h | grep MOZILLA_VERSION_U | awk '{ print $[3]; }' | tr ".ab+" " "`
+if test -z "$gecko_version"; then
+	gecko_version="1.7"
 fi
 
+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 "$gecko_version_major" = "1" -a "$gecko_version_minor" = "9"; then
@@ -327,11 +326,15 @@ else
 	AC_MSG_ERROR([Unsupported Gecko version $gecko_version_major.$gecko_version_minor])
 fi
 
-if test "x$have_gecko_1_8" = "xyes"; then
+if test "$gecko_version_major" = "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
+	AC_DEFINE([HAVE_GECKO_1_9],[1],[Define if we have gecko 1.9])
+fi
 
-AM_CONDITIONAL([HAVE_GECKO_1_8],[test "x$have_gecko_1_8" = "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"])
 
 dnl Changed from PRUnichar* to nsAString& in 1.8a1 and on aviary branch
 
@@ -491,7 +494,11 @@ AC_MSG_CHECKING([whether to enable native gtk+ filepicker])
 AC_ARG_ENABLE([filepicker],
 	AS_HELP_STRING([--enable-filepicker],[Whether to enable the gtk+ native filepicker; not needed when the mozilla build itself has native gtk+ filepicker enabled (default:enabled)]),
 	[filepicker=$enableval],
-	[if test "x$have_gecko_1_8" = "xyes"; then filepicker=no; else filepicker=yes; fi])
+	[if test "$gecko_version_major" = "1" -a "$gecko_version_minor" -ge "8"; then
+		filepicker=no
+ 	 else
+		filepicker=yes
+ 	 fi])
 AC_MSG_RESULT([$filepicker])
 
 AM_CONDITIONAL([ENABLE_FILEPICKER],[test "x$filepicker" = "xyes"])