aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--configure.in6
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d6e4fa241..6e99b7464 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
2004-05-29 Christian Persch <chpe@cvs.gnome.org>
* configure.in:
+
+ Depend on glib >= 2.4.1 because of the fix for bug #112222.
+ Increase mozilla snapshot level for 1.8a2/trunk.
+ (backported from HEAD)
+
+2004-05-29 Christian Persch <chpe@cvs.gnome.org>
+
+ * configure.in:
* po/tk.po:
Merged from HEAD.
diff --git a/configure.in b/configure.in
index 52c55b4f5..873ffd107 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_PROG_INTLTOOL([0.29])
dnl put the ACLOCAL flags in the Makefile
ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
-GLIB_REQUIRED=2.4.0
+GLIB_REQUIRED=2.4.1
GTK_REQUIRED=2.4.0
LIBBONOBOUI_REQUIRED=2.1.1
LIBXML_REQUIRED=2.6.6
@@ -196,8 +196,8 @@ case "$MOZILLA_VERSION" in
branch1.7) MOZILLA_SNAPSHOT=16 ;;
1.8a) MOZILLA_SNAPSHOT=18 ;;
1.8a1) MOZILLA_SNAPSHOT=18 ;;
-1.8a2) MOZILLA_SNAPSHOT=18 ;;
-trunk) MOZILLA_SNAPSHOT=18 ;;
+1.8a2) MOZILLA_SNAPSHOT=19 ;;
+trunk) MOZILLA_SNAPSHOT=19 ;;
*) AC_ERROR([
*****************************************************************************
Epiphany can be built using Mozilla 1.4, 1.4.1, 1.4.2, 1.5, 1.6 or 1.7,