diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2004-04-18 10:53:07 +0000 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2004-04-18 10:53:07 +0000 |
| commit | 3000ddd04f374dca1ebbe88f9a5617fac0dc5c0c (patch) | |
| tree | 49f1e582e439d5c55b2bebbd3968395d26ebfe10 | |
| parent | 6eb040b00c56499fd7d6f8537a6d1314026ab14b (diff) | |
| download | epiphany-3000ddd04f374dca1ebbe88f9a5617fac0dc5c0c.tar.gz | |
Add 1.7 to the list of supported mozilla versions.
2004-04-18 Christian Persch <chpe@cvs.gnome.org>
* Makefile.am:
* configure.in:
Add 1.7 to the list of supported mozilla versions.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.in | 13 |
3 files changed, 13 insertions, 10 deletions
@@ -1,3 +1,10 @@ +2004-04-18 Christian Persch <chpe@cvs.gnome.org> + + * Makefile.am: + * configure.in: + + Add 1.7 to the list of supported mozilla versions. + 2004-04-08 Piers Cornwell <piers@gnome.org> * embed/mozilla/ContentHandler.cpp: diff --git a/Makefile.am b/Makefile.am index 8da6a72f9..2f964bebc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,7 +12,8 @@ EXTRA_DIST = \ intltool-extract.in \ xmldocs.make \ omf.make \ - COPYING.README + COPYING.README \ + ChangeLog-20030925 DISTCLEANFILES = \ intltool-extract \ diff --git a/configure.in b/configure.in index 0568cf161..4f84cb403 100644 --- a/configure.in +++ b/configure.in @@ -176,9 +176,9 @@ 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.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@:>@]), + AC_HELP_STRING([--with-mozilla-snapshot@<:@=1.4|1.4.1|1.4.2|1.5|1.6|1.7@:>@], + [Whether to try building against mozilla 1.4|1.4.1|1.4.2|1.5|1.6|1.7 + @<:@guessed@:>@]), [autodetect=" (guessed: $MOZILLA_VERSION)"; MOZILLA_VERSION="$withval"]) AC_MSG_RESULT($MOZILLA_VERSION$autodetect) @@ -197,15 +197,10 @@ case "$MOZILLA_VERSION" in 1.7a) MOZILLA_SNAPSHOT=14 ;; 1.7b) MOZILLA_SNAPSHOT=15 ;; 1.7) MOZILLA_SNAPSHOT=15 ;; -trunk) MOZILLA_SNAPSHOT=15 ;; *) AC_ERROR([ ***************************************************************************** -Epiphany can be built using Mozilla 1.4, 1.4.1, 1.4.2, 1.5, or 1.6, +Epiphany can be built using Mozilla 1.4, 1.4.1, 1.4.2, 1.5, 1.6 or 1.7, 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 -resources of the Epiphany team to support non-release Mozilla snapshots. *****************************************************************************]) esac |