aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-03-31 23:06:18 +0800
committerChristian Persch <chpe@src.gnome.org>2004-03-31 23:06:18 +0800
commit6ef42cdcc21de3408de6929d6d623483a5be60d2 (patch)
tree35f15b31fbc9a374c48e66c56b667f0c0382bc29
parent6d8743277819e635fe8254974e4a7233c5afa4d7 (diff)
downloadgsoc2013-epiphany-6ef42cdcc21de3408de6929d6d623483a5be60d2.tar
gsoc2013-epiphany-6ef42cdcc21de3408de6929d6d623483a5be60d2.tar.gz
gsoc2013-epiphany-6ef42cdcc21de3408de6929d6d623483a5be60d2.tar.bz2
gsoc2013-epiphany-6ef42cdcc21de3408de6929d6d623483a5be60d2.tar.lz
gsoc2013-epiphany-6ef42cdcc21de3408de6929d6d623483a5be60d2.tar.xz
gsoc2013-epiphany-6ef42cdcc21de3408de6929d6d623483a5be60d2.tar.zst
gsoc2013-epiphany-6ef42cdcc21de3408de6929d6d623483a5be60d2.zip
Fix the --with-mozilla-snapshot help string to list all supported mozilla
2004-03-31 Christian Persch <chpe@cvs.gnome.org> * configure.in: Fix the --with-mozilla-snapshot help string to list all supported mozilla versions, and only them.
-rw-r--r--ChangeLog7
-rw-r--r--configure.in9
2 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 2503dc103..1bfd2e8b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-03-31 Christian Persch <chpe@cvs.gnome.org>
+
+ * configure.in:
+
+ Fix the --with-mozilla-snapshot help string to list all supported
+ mozilla versions, and only them.
+
2004-03-29 Christian Persch <chpe@cvs.gnome.org>
* src/ephy-completion-model.h:
diff --git a/configure.in b/configure.in
index 28dfe08f0..08d0b61ff 100644
--- a/configure.in
+++ b/configure.in
@@ -179,8 +179,8 @@ MOZILLA_VERSION="`$PKG_CONFIG --modversion mozilla-gtkmozembed`"
dnl allow user to override the autodetected mozilla version
dnl - without arguments for cvs head
AC_ARG_WITH(mozilla-snapshot,
- AC_HELP_STRING([--with-mozilla-snapshot@<:@=1.4|1.4.1|1.5|1.6a|1.6b|trunk@:>@],
- [Whether to try building against mozilla 1.4|1.4.1|1.5|1.6|1.7a|1.7b|trunk
+ AC_HELP_STRING([--with-mozilla-snapshot@<:@=1.4|1.4.1|1.4.2|1.5|1.6@:>@],
+ [Whether to try building against mozilla 1.4|1.4.1|1.4.2|1.5|1.6
snapshot. @<:@guessed@:>@]),
[autodetect=" (guessed: $MOZILLA_VERSION)"; MOZILLA_VERSION="$withval"])
@@ -190,6 +190,7 @@ case "$MOZILLA_VERSION" in
1.4) MOZILLA_SNAPSHOT=8 ;;
1.4.1) MOZILLA_SNAPSHOT=9 ;;
1.4.2) MOZILLA_SNAPSHOT=9 ;;
+1.4.2) MOZILLA_SNAPSHOT=9 ;;
1.5a) MOZILLA_SNAPSHOT=10 ;;
1.5b) MOZILLA_SNAPSHOT=11 ;;
1.5) MOZILLA_SNAPSHOT=11 ;;
@@ -202,8 +203,8 @@ case "$MOZILLA_VERSION" in
trunk) MOZILLA_SNAPSHOT=15 ;;
*) AC_ERROR([
*****************************************************************************
-Epiphany can be built using Mozilla 1.4, 1.4.1, 1.5, 1.6, 1.7a, 1.7b, or
-trunk snapshot, but the version available is $MOZILLA_VERSION.
+Epiphany can be built using Mozilla 1.4, 1.4.1, 1.4.2, 1.5, or 1.6,
+but the version available is $MOZILLA_VERSION.
When using Mozilla trunk snapshot, a successful build is not guaranteed due
to the frequently changing state of the Mozilla interfaces and the limited