aboutsummaryrefslogtreecommitdiffstats
path: root/configure.in
diff options
context:
space:
mode:
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in32
1 files changed, 25 insertions, 7 deletions
diff --git a/configure.in b/configure.in
index ef1d04c8f..9b483ed43 100644
--- a/configure.in
+++ b/configure.in
@@ -14,13 +14,17 @@ AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
dnl put the ACLOCAL flags in the Makefile
ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
-GTK_REQUIRED=2.3
+dnl you really need cvs for those two, but their version number is still 2.3.0
+dnl in cvs HEAD
+GLIB_REQUIRED=2.3.0
+GTK_REQUIRED=2.3.0
LIBBONOBOUI_REQUIRED=2.1.1
LIBXML_REQUIRED=2.6.0
LIBGNOMEVFS_REQUIRED=2.3.1
-AC_SUBST(LIBBONOBOUI_REQUIRED)
+AC_SUBST(GLIB_REQUIRED)
AC_SUBST(GTK_REQUIRED)
+AC_SUBST(LIBBONOBOUI_REQUIRED)
AC_SUBST(LIBXML_REQUIRED)
AC_SUBST(LIBGNOMEVFS_REQUIRED)
@@ -70,7 +74,20 @@ fi
AC_MSG_RESULT($enable_nautilus_view)
AM_CONDITIONAL(ENABLE_NAUTILUS_VIEW, test "x$enable_nautilus_view" = "xyes")
-PKG_CHECK_MODULES(EPIPHANY_DEPENDENCY, gtk+-2.0 >= $GTK_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED libgnomeui-2.0 libglade-2.0 bonobo-activation-2.0 libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED ORBit-2.0 libglade-2.0 gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED gnome-vfs-module-2.0 gconf-2.0 $nautilusview_pkgs)
+PKG_CHECK_MODULES(EPIPHANY_DEPENDENCY, \
+ glib-2.0 >= $GLIB_REQUIRED \
+ gtk+-2.0 >= $GTK_REQUIRED \
+ libxml-2.0 >= $LIBXML_REQUIRED \
+ libgnomeui-2.0 libglade-2.0 \
+ bonobo-activation-2.0 \
+ libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED \
+ ORBit-2.0 \
+ libglade-2.0 \
+ gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED \
+ gnome-vfs-module-2.0 \
+ gconf-2.0 \
+ $nautilusview_pkgs \
+ )
AC_SUBST(EPIPHANY_DEPENDENCY_CFLAGS)
AC_SUBST(EPIPHANY_DEPENDENCY_LIBS)
@@ -153,8 +170,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|trunk@:>@],
- [Whether to try building against mozilla 1.4|trunk
+ 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.6a|1.6b|trunk
snapshot. @<:@guessed@:>@]),
[autodetect=" (guessed: $MOZILLA_VERSION)"; MOZILLA_VERSION="$withval"])
@@ -165,12 +182,13 @@ case "$MOZILLA_VERSION" in
1.4.1) MOZILLA_SNAPSHOT=9 ;;
1.5a) MOZILLA_SNAPSHOT=10 ;;
1.5b) MOZILLA_SNAPSHOT=11 ;;
- 1.5) MOZILLA_SNAPSHOT=11 ;;
+ 1.5) MOZILLA_SNAPSHOT=11 ;;
1.6a) MOZILLA_SNAPSHOT=12 ;;
+ 1.6b) MOZILLA_SNAPSHOT=12 ;;
trunk) MOZILLA_SNAPSHOT=12 ;;
*) AC_ERROR([
*****************************************************************************
-Epiphany can be built using Mozilla 1.4, 1.5a, 1.5b, 1.5 or
+Epiphany can be built using Mozilla 1.4, 1.4.1, 1.5, 1.6a, 1.6b or
trunk snapshot, but the version available is $MOZILLA_VERSION.
When using Mozilla trunk snapshot, a successful build is not guaranteed due