diff options
| author | Christian Persch <chpe@src.gnome.org> | 2008-01-15 07:30:54 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2008-01-15 07:30:54 +0800 |
| commit | e4f73934ba57b0d2a58d5f73f5c1fc3cdeba3be8 (patch) | |
| tree | 7fe6271837ec4d74f4e20b30020f75ef5302c239 /configure.ac | |
| parent | db1ee3594adb541f39a1aab477e952157a0be4ad (diff) | |
| download | gsoc2013-epiphany-e4f73934ba57b0d2a58d5f73f5c1fc3cdeba3be8.tar gsoc2013-epiphany-e4f73934ba57b0d2a58d5f73f5c1fc3cdeba3be8.tar.gz gsoc2013-epiphany-e4f73934ba57b0d2a58d5f73f5c1fc3cdeba3be8.tar.bz2 gsoc2013-epiphany-e4f73934ba57b0d2a58d5f73f5c1fc3cdeba3be8.tar.lz gsoc2013-epiphany-e4f73934ba57b0d2a58d5f73f5c1fc3cdeba3be8.tar.xz gsoc2013-epiphany-e4f73934ba57b0d2a58d5f73f5c1fc3cdeba3be8.tar.zst gsoc2013-epiphany-e4f73934ba57b0d2a58d5f73f5c1fc3cdeba3be8.zip | |
Release 2.21.5RELEASE_2_21_5
svn path=/trunk/; revision=7866
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 6d92db6e4..75a7406f3 100644 --- a/configure.ac +++ b/configure.ac @@ -95,7 +95,7 @@ if test "$enable_maintainer_mode" = "yes"; then fi GLIB_REQUIRED=2.15.2 -GTK_REQUIRED=2.11.6 +GTK_REQUIRED=2.12.0 LIBXML_REQUIRED=2.6.12 LIBXSLT_REQUIRED=1.1.7 LIBGLADE_REQUIRED=2.3.1 @@ -586,17 +586,28 @@ AM_CONDITIONAL([ENABLE_DESKTOP_FILE_PLUGIN],[test "$enable_desktop_file_plugin" AC_MSG_CHECKING([whether to enable zeroconf bookmarks support]) AC_ARG_ENABLE([zeroconf], - AS_HELP_STRING([--disable-zeroconf],[Whether to enable zeroconf bookmarks support (default: enabled)]), - [], [enable_zeroconf=yes]) + AS_HELP_STRING([--disable-zeroconf],[Whether to enable zeroconf bookmarks support (default: autodetect)]), + [], [enable_zeroconf=auto]) AC_MSG_RESULT([$enable_zeroconf]) -if test "$enable_zeroconf" = "yes"; then +if test "$enable_zeroconf" != "no"; then AVAHI_REQUIRED=0.6.22 - PKG_CHECK_MODULES(AVAHI, [avahi-gobject >= $AVAHI_REQUIRED]) + PKG_CHECK_MODULES(AVAHI, [avahi-gobject >= $AVAHI_REQUIRED],[have_avahi=yes],[have_avahi=no]) + + if test "$enable_zeroconf" = "yes" -a "$have_avahi" = "no"; then + AC_MSG_ERROR([zeroconf support was requested but avahi not found]) + elif test "$have_avahi" = "yes"; then + enable_zeroconf=yes + else + enable_zeroconf=no + fi + AC_SUBST(AVAHI_CFLAGS) AC_SUBST(AVAHI_LIBS) +fi +if test "$enable_zeroconf" = "yes"; then AC_DEFINE([ENABLE_ZEROCONF],[1],[Define to enable zeroconf bookmarks support]) fi |