diff options
| author | Xan Lopez <xan@igalia.com> | 2012-08-10 05:01:09 +0800 |
|---|---|---|
| committer | Xan Lopez <xan@igalia.com> | 2012-08-10 05:01:09 +0800 |
| commit | 95f5095199ea70eb5e0305e2e56a73a61058d015 (patch) | |
| tree | d990ef4777ca0813baf061cd65032db89d45b6c9 /configure.ac | |
| parent | d83176ba808aa06b3ef52fa6f500c74d8b3449e0 (diff) | |
| download | gsoc2013-epiphany-95f5095199ea70eb5e0305e2e56a73a61058d015.tar.gz gsoc2013-epiphany-95f5095199ea70eb5e0305e2e56a73a61058d015.tar.zst gsoc2013-epiphany-95f5095199ea70eb5e0305e2e56a73a61058d015.zip | |
Mave avahi a hard dependency
It's listed as a OS core dependency in jhbuild, so let's reduce the
number of moving pieces on our side.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 41 |
1 files changed, 4 insertions, 37 deletions
diff --git a/configure.ac b/configure.ac index 7269f0bdd..5ce9a4dc8 100644 --- a/configure.ac +++ b/configure.ac @@ -90,6 +90,7 @@ GNOME_KEYRING_REQUIRED=2.26.0 GSETTINGS_DESKTOP_SCHEMAS_REQUIRED=0.0.1 LIBNOTIFY_REQUIRED=0.5.1 GCR_REQUIRED=3.5.5 +AVAHI_REQUIRED=0.6.22 AC_ARG_WITH(webkit2, [AC_HELP_STRING([--with-webkit2], [build with WebKit2 [default=no]])], @@ -131,7 +132,9 @@ PKG_CHECK_MODULES([DEPENDENCIES], [ gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED libnotify >= $LIBNOTIFY_REQUIRED sqlite3 - gcr-3 >= $GCR_REQUIRED + gcr-3 >= $GCR_REQUIRED + avahi-gobject >= $AVAHI_REQUIRED + avahi-client >= $AVAHI_REQUIRED ]) # ****************** @@ -190,41 +193,6 @@ AM_CONDITIONAL([ENABLE_NSS],[test "$enable_nss" = "yes"]) AC_SUBST([EPIPHANY_FEATURES]) -# ******************* -# Additional features -# ******************* - -# Zeroconf bookmarks sites - -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: autodetect)]), - [], [enable_zeroconf=auto]) -AC_MSG_RESULT([$enable_zeroconf]) - -if test "$enable_zeroconf" != "no"; then - AVAHI_REQUIRED=0.6.22 - - PKG_CHECK_MODULES(AVAHI, - [avahi-gobject >= $AVAHI_REQUIRED - avahi-client >= $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 -fi - -if test "$enable_zeroconf" = "yes"; then - AC_DEFINE([ENABLE_ZEROCONF],[1],[Define to enable zeroconf bookmarks support]) -fi - -AM_CONDITIONAL([ENABLE_ZEROCONF],[test "$enable_zeroconf" = "yes"]) - # ******************************* # Add warning flags # ******************************* @@ -337,7 +305,6 @@ Epiphany was configured with the following options: Prefix : $prefix Extra debugging support : $enable_debug - Zeroconf bookmarks support : $enable_zeroconf GObject introspection : $found_introspection NSS support : $enable_nss Build tests : $enable_tests |