X-Git-Url: http://pileus.org/git/?p=~andy%2Fgtk;a=blobdiff_plain;f=configure.ac;h=6d075c3d436b939edcdbca1c222248ff2be39e55;hp=259adca1ee84198235b6ef81f42dee655bc71ca9;hb=HEAD;hpb=07bf19d512052f5a8c29b06f9546af04755f6db9

diff --git a/configure.ac b/configure.ac
index 259adca1e..6d075c3d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@
 
 m4_define([gtk_major_version], [3])
 m4_define([gtk_minor_version], [7])
-m4_define([gtk_micro_version], [12])
+m4_define([gtk_micro_version], [13])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
@@ -390,6 +390,7 @@ else
   AM_CONDITIONAL(USE_BROADWAY, false)
 fi
 
+DISABLE_ON_WAYLAND=''
 if test "x$enable_wayland_backend" = "xyes"; then
   # For the cairo image backend
   cairo_backends="$cairo_backends cairo"
@@ -397,11 +398,13 @@ if test "x$enable_wayland_backend" = "xyes"; then
   have_gio_unix=yes
   GDK_WINDOWING="$GDK_WINDOWING
 #define GDK_WINDOWING_WAYLAND"
+  DISABLE_ON_WAYLAND='%'
   WAYLAND_PACKAGES="wayland-client >= 1.0.0 xkbcommon >= 0.2.0 wayland-cursor"
   AM_CONDITIONAL(USE_WAYLAND, true)
 else
   AM_CONDITIONAL(USE_WAYLAND, false)
 fi
+AC_SUBST(DISABLE_ON_WAYLAND)
 
 # strip leading space
 GDK_BACKENDS=${GDK_BACKENDS#* }
@@ -1452,45 +1455,6 @@ else
   fi
 fi
 
-# Check for Avahi flags
-AC_ARG_ENABLE(avahi-browsing,
-              [AS_HELP_STRING([--disable-avahi-browsing],
-                              [disable avahi browsing of printers])],,
-              [enable_avahi_browsing=auto])
-
-have_avahi_browsing=no
-if test "x$enable_avahi_browsing" != "xno" -a \
-        "x$have_cups_api_1_6" = "xyes"; then
-  AC_MSG_CHECKING([avahi-gobject])
-
-  if $PKG_CONFIG --exists avahi-gobject ; then
-    AVAHI_CFLAGS=`$PKG_CONFIG --cflags avahi-gobject`
-    AC_SUBST(AVAHI_CFLAGS)
-    AVAHI_LIBS=`$PKG_CONFIG --libs avahi-gobject`
-    AC_SUBST(AVAHI_LIBS)
-    have_avahi_gobject=yes
-    AC_MSG_RESULT([yes])
-  else
-    AC_MSG_RESULT([no])
-  fi
-
-  if test "x$have_avahi_gobject" = "xyes" ; then
-    AC_DEFINE([HAVE_AVAHI_BROWSING], [1], [Define to 1 if avahi-gobject available])
-    have_avahi_browsing=yes
-  else
-    AC_MSG_ERROR([
-*** avahi-gobject not found. avahi-gobject is required to build GTK+ with support
-*** for avahi browsed printers when using CUPS 1.6.
-])
-  fi
-else
-  if test "x$enable_avahi_browsing" = "xyes"; then
-    AC_MSG_ERROR([
-*** Avahi browsing support requested but CUPS 1.6 not found.
-])
-  fi
-fi
-
 # Checks to see if we should compile with PAPI backend for GTK+
 #
 
@@ -1867,7 +1831,6 @@ echo "        Dynamic modules:      $build_dynamic_modules"
 echo "        Included immodules:   $included_immodules"
 echo "        PackageKit support:   $build_packagekit"
 echo "        colord support:       $have_colord"
-echo "        Avahi browsing:       $have_avahi_browsing"
 echo "        Introspection:        $found_introspection"
 echo "        Debugging:            $enable_debug"
 echo "        Documentation:        $enable_gtk_doc"