aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--m4/gecko.m44
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index eb022130a..43e6d7f20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2007-09-10 Christian Persch <chpe@gnome.org>
+ * m4/gecko.m4:
+
+ Make sure the gecko version is set to 0 if we're not compiling with
+ the gecko backend. Bug #475461, patch by Cyril Brulebois.
+
+2007-09-10 Christian Persch <chpe@gnome.org>
+
* configure.ac:
Error out if the C++ compiler wasn't found. Bug #475360.
diff --git a/m4/gecko.m4 b/m4/gecko.m4
index f35e12add..0e8d58813 100644
--- a/m4/gecko.m4
+++ b/m4/gecko.m4
@@ -340,6 +340,10 @@ $1[]_GLUE_LIBS="$gecko_cv_glue_libs"
AC_DEFUN([GECKO_DEFINES],
[
+# Ensure we have an integer variable to compare with
+if test -z "$gecko_cv_gecko_version_int"; then
+ gecko_cv_gecko_version_int=0
+fi
AM_CONDITIONAL([HAVE_MOZILLA_TOOLKIT],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_flavour" = "toolkit"])
AM_CONDITIONAL([HAVE_GECKO_DEBUG],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_have_debug" = "yes"])
AM_CONDITIONAL([HAVE_GECKO_1_7],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1007000"])