docs: Disable GtkPlug/GtkSocket docs on Wayland

[~andy/gtk] / configure.ac

diff --git a/configure.ac b/configure.ac
index f7b3ab8d3ddddc0f375d84a04037ea23c7beffa3..91e7da02d8335d288a6769590293ac5bc099fdf5 100644 (file)
--- 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], [5])
+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)])
@@ -44,9 +44,9 @@ m4_define([gtk_binary_version], [3.0.0])
 # required versions of other packages
 m4_define([glib_required_version], [2.35.3])
 m4_define([pango_required_version], [1.32.4])
-m4_define([atk_required_version], [2.5.3])
+m4_define([atk_required_version], [2.7.5])
 m4_define([cairo_required_version], [1.10.0])
-m4_define([gdk_pixbuf_required_version], [2.26.0])
+m4_define([gdk_pixbuf_required_version], [2.27.1])
 m4_define([introspection_required_version], [1.32.0])
 GLIB_REQUIRED_VERSION=glib_required_version
 PANGO_REQUIRED_VERSION=pango_required_version
@@ -322,12 +322,6 @@ AC_ARG_ENABLE(quartz-relocation,
                               [enable bundle-based relocation functions])],
                               [quartz_relocation=yes])
 
-AC_ARG_ENABLE(wayland-cairo-gl,
-              AS_HELP_STRING([--enable-wayland-cairo-gl],
-                             [enable the use of Cairo GL in the Wayland backend]),
-              [enable_wayland_cairo_gl=yes])
-
-
 cairo_backends=
 backend_immodules=
 have_gio_unix=no
@@ -396,27 +390,21 @@ else
   AM_CONDITIONAL(USE_BROADWAY, false)
 fi
 
+DISABLE_ON_WAYLAND=''
 if test "x$enable_wayland_backend" = "xyes"; then
-  if test "x$enable_wayland_cairo_gl" = "xyes"; then
-    # Wayland can use cairo-gl
-    cairo_backends="$cairo_backends cairo-gl"
-    AC_DEFINE(GDK_WAYLAND_USE_EGL, [1], [Whether to use EGL in Wayland backend])
-  else
-    # For the cairo image backend
-    cairo_backends="$cairo_backends cairo"
-  fi
+  # For the cairo image backend
+  cairo_backends="$cairo_backends cairo"
   GDK_BACKENDS="$GDK_BACKENDS wayland"
   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"
-  if test "x$enable_wayland_cairo_gl" = "xyes"; then
-    WAYLAND_PACKAGES="$WAYLAND_PACKAGES wayland-egl egl"
-  fi
   AM_CONDITIONAL(USE_WAYLAND, true)
 else
   AM_CONDITIONAL(USE_WAYLAND, false)
 fi
+AC_SUBST(DISABLE_ON_WAYLAND)
 
 # strip leading space
 GDK_BACKENDS=${GDK_BACKENDS#* }
@@ -575,7 +563,7 @@ if test "x$enable_rebuilds" = "xyes" && \
 fi
 AC_SUBST(REBUILD)
 
-AC_CHECK_FUNCS(lstat mkstemp flockfile getc_unlocked)
+AC_CHECK_FUNCS(lstat mkstemp)
 AC_CHECK_FUNCS(localtime_r)
 
 # _NL_TIME_FIRST_WEEKDAY is an enum and not a define
@@ -1254,6 +1242,7 @@ if test "$have_gio_unix" = "yes"; then
 else
   GDK_GIO_PACKAGE=gio-2.0
 fi
+AM_CONDITIONAL(HAVE_GIO_UNIX, test "$have_gio_unix" = "yes")
 
 # Check for Pango flags
 
@@ -1435,7 +1424,7 @@ else
            $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 6; then
       AC_DEFINE(HAVE_CUPS_API_1_6, 1,
                 [Define to 1 if CUPS 1.6 API is available])
-
+      have_cups_api_1_6=yes
     fi
 
     AC_SUBST(CUPS_API_MAJOR)
@@ -1466,6 +1455,45 @@ 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+
 #
 
@@ -1842,6 +1870,7 @@ 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"