diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rw-r--r-- | configure.ac | 6 |
3 files changed, 21 insertions, 4 deletions
@@ -1,3 +1,12 @@ +2006-01-12 Christian Persch <chpe@cvs.gnome.org> + + * configure.ac: + * Makefile.am: + + Enable zeroconf by default now that gnome-vfs dns-sd can use + avahi and more distros are hopefully shipping with that. + Still can be disabled by --disable-zeroconf. + 2006-01-12 Jean-François Rameau <jframeau@cvs.gnome.org> * src/ephy-dbus.c: (ephy_dbus_connect_to_session_bus): diff --git a/Makefile.am b/Makefile.am index 517dc3ada..bf4029566 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,4 +21,12 @@ DISTCLEANFILES = \ intltool-update \ gnome-doc-utils.make -DISTCHECK_CONFIGURE_FLAGS = --enable-python --enable-gtk-doc --disable-schemas-install --disable-scrollkeeper --with-gecko=$(MOZILLA) +DISTCHECK_CONFIGURE_FLAGS = \ + --enable-python \ + --enable-zeroconf \ + --enable-desktop-file-plugin \ + --enable-certificate-manager \ + --enable-gtk-doc \ + --disable-schemas-install \ + --disable-scrollkeeper \ + --with-gecko=$(MOZILLA) diff --git a/configure.ac b/configure.ac index cd6ea1596..bdcedf332 100644 --- a/configure.ac +++ b/configure.ac @@ -353,7 +353,7 @@ GECKO_CHECK_CONTRACTID([@mozilla.org/PopupWindowManager;1], GECKO_CHECK_CONTRACTID([@mozilla.org/cookie/permission;1], [],[AC_MSG_ERROR([Gecko needs to be compiled with at least --enable-extensions=default,$REQUIRED_EXTENSIONS])]) -if test "$gecko_cv_gecko_version_major" = 1 -a "$gecko_cv_gecko_version_minor" -ge "8"; then +if test "$gecko_cv_gecko_version_major" = "1" -a "$gecko_cv_gecko_version_minor" -ge "8"; then GECKO_CHECK_CONTRACTID([@mozilla.org/permissions/contentblocker;1], [],[AC_MSG_ERROR([Gecko needs to be compiled with at least --enable-extensions=default,$REQUIRED_EXTENSIONS])]) fi @@ -529,8 +529,8 @@ fi AC_MSG_CHECKING([whether to enable zeroconf bookmarks support]) AC_ARG_ENABLE([zeroconf], - AS_HELP_STRING([--enable-zeroconf],[Whether to enable zeroconf bookmarks support (default:disabled)]), - [], [enable_zeroconf=no]) + AS_HELP_STRING([--disable-zeroconf],[Whether to enable zeroconf bookmarks support (default: enabled)]), + [], [enable_zeroconf=yes]) AC_MSG_RESULT([$enable_zeroconf]) if test "x$enable_zeroconf" = "xyes"; then |