Add optional colord support to the CUPS print module

[~andy/gtk] / configure.ac

diff --git a/configure.ac b/configure.ac
index b7a7e3bb0a81234a5e78111d9d46b66d58d9181b..77a6cee5c7df0eaf628ee0eff142645ce11a8586 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@
 
 m4_define([gtk_major_version], [3])
 m4_define([gtk_minor_version], [1])
-m4_define([gtk_micro_version], [3])
+m4_define([gtk_micro_version], [5])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
@@ -298,11 +298,11 @@ AC_ARG_ENABLE(quartz-backend,
                               [enable the quartz gdk backend])],
                              [backend_set=yes])
 AC_ARG_ENABLE(broadway-backend,
-              [AC_HELP_STRING([--enable-broadway-backend],
+              [AS_HELP_STRING([--enable-broadway-backend],
                               [enable the broadway (HTML5) gdk backend])],
                              [backend_set=yes])
 AC_ARG_ENABLE(wayland-backend,
-              [AC_HELP_STRING([--enable-wayland-backend],
+              [AS_HELP_STRING([--enable-wayland-backend],
                               [enable the wayland gdk backend])],
                              [backend_set=yes])
 
@@ -1096,6 +1096,10 @@ if test "x$enable_x11_backend" = xyes; then
     fi
   fi
 
+  # Check for XGetEventData for GenericEvents
+  AC_CHECK_FUNC(XGetEventData,
+                AC_DEFINE(HAVE_XGENERICEVENTS, 1, [Have XGenericEvent]))
+
   # set up things for XInput
   if test "x$enable_xinput" != "xno" && $PKG_CONFIG --exists "xi" ; then
     have_xinput=yes
@@ -1528,6 +1532,27 @@ fi
 
 AM_CONDITIONAL(ENABLE_PACKAGEKIT, test "x$build_packagekit" = "xyes")
 
+##################################################
+# colord module
+#################################################
+
+AC_ARG_ENABLE(colord,
+              [AS_HELP_STRING([--disable-colord],
+                              [build colord support code])])
+
+have_colord=no
+if test "x$enable_colord" != "xno"; then
+        if test "os_win32" != "yes"; then
+                PKG_CHECK_MODULES(COLORD, colord >= 0.1.9)
+                have_colord=yes
+                AC_DEFINE(HAVE_COLORD, 1, [define if we have colord])
+        else
+                AC_MSG_ERROR([colord support is not available on win32])
+        fi
+fi
+
+AM_CONDITIONAL(HAVE_COLORD, test "x$have_colord" = "xyes")
+
 ##################################################
 # Checks for gtk-doc and docbook-tools
 ##################################################
@@ -1648,8 +1673,11 @@ po-properties/Makefile.in
 demos/Makefile
 demos/gtk-demo/Makefile
 demos/gtk-demo/geninclude.pl
+demos/pixbuf-demo/Makefile
 examples/Makefile
 tests/Makefile
+tests/css/Makefile
+tests/css/parser/Makefile
 tests/reftests/Makefile
 docs/Makefile
 docs/reference/Makefile
@@ -1716,6 +1744,7 @@ echo "        Print backends:       $PRINT_BACKENDS"
 echo "        Dynamic modules:      $build_dynamic_modules"
 echo "        Included immodules:   $included_immodules"
 echo "        PackageKit support:   $build_packagekit"
+echo "        colord support:       $have_colord"
 echo "        Introspection:        $found_introspection"
 echo "        Debugging:            $enable_debug"
 echo "        Documentation:        $enable_gtk_doc"