From 20feb46533bc952744580cc2825265b6ba0d98ef Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Wed, 28 May 2003 09:41:47 +0000 Subject: Make it build with mozilla cvs. Remove only pages on history clear, the 2003-05-28 Marco Pesenti Gritti * configure.in: * embed/ephy-history.c: (ephy_history_clear): * embed/mozilla/GlobalHistory.cpp: Make it build with mozilla cvs. Remove only pages on history clear, the sites are automatically removed (fix freeze). --- configure.in | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index b52ff8fa1..8772afe56 100644 --- a/configure.in +++ b/configure.in @@ -180,8 +180,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.3|1.3.1|1.4a|trunk@:>@], - [Whether to try building against mozilla 1.3|1.3.1|1.4a|trunk + AC_HELP_STRING([--with-mozilla-snapshot@<:@=1.3|1.3.1|1.4a|1.4|trunk@:>@], + [Whether to try building against mozilla 1.3|1.3.1|1.4a|1.4|trunk snapshot. @<:@guessed@:>@]), [autodetect=" (guessed: $MOZILLA_VERSION)"; MOZILLA_VERSION="$withval"]) @@ -193,10 +193,11 @@ case "$MOZILLA_VERSION" in "") MOZILLA_SNAPSHOT=7 ;; 1.4a) MOZILLA_SNAPSHOT=7 ;; 1.4b) MOZILLA_SNAPSHOT=7 ;; -trunk) MOZILLA_SNAPSHOT=7 ;; + 1.4) MOZILLA_SNAPHOST=8 ;; +trunk) MOZILLA_SNAPSHOT=8 ;; *) AC_ERROR([ ***************************************************************************** -Epiphany can be built using mozilla 1.3, 1.3.1, 1.4a, 1.4b or trunk snapshot, but the +Epiphany can be built using mozilla 1.3, 1.3.1, 1.4a, 1.4b, 1.4 or trunk snapshot, but the version available is $MOZILLA_VERSION. When using mozilla trunk snapshot successful build is not guaranteed due to @@ -205,6 +206,8 @@ resources of the epiphany team to support non-release mozilla snapshots. *****************************************************************************]) esac +AC_DEFINE_UNQUOTED(MOZILLA_SNAPSHOT, $MOZILLA_SNAPSHOT, [Define mozilla snapshot]) + dnl ******************************* dnl Internationalization dnl ******************************* -- cgit v1.2.3