[simple-scan/gnome-3-18: 3/6] Make colord/packagekit support able to be explicitly disabled



commit 424a99323f7214935df1f70035e9d76050ed9ed4
Author: Robert Ancell <robert ancell canonical com>
Date:   Wed Nov 18 15:40:52 2015 +1300

    Make colord/packagekit support able to be explicitly disabled

 configure.ac |   38 ++++++++++++++++++++++++++++++++------
 1 files changed, 32 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3bc8f4b..844d725 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,14 +31,40 @@ PKG_CHECK_MODULES(SIMPLE_SCAN, [
     gusb
 ])
 
-PKG_CHECK_MODULES(COLORD, [
-    colord
-], have_colord=yes, have_colord=no)
+AC_ARG_ENABLE([colord],
+    AS_HELP_STRING([--enable-colord],
+                   [Enable colord support[[default=auto]]]),
+    [enable_colord=$enableval],
+    [enable_colord=auto])
+have_colord=no
+if test x"$enable_colord" != "xno"; then
+    PKG_CHECK_MODULES(COLORD, [
+        colord
+    ],
+    [have_colord=yes],
+    [if test x"$enable_colord" = xauto; then
+        AC_MSG_FAILURE([--enable-colord was given, but could not be found])
+     fi
+    ])
+fi
 AM_CONDITIONAL(HAVE_COLORD, test $have_colord = yes)
 
-PKG_CHECK_MODULES(PACKAGEKIT, [
-    packagekit-glib2
-], have_packagekit=yes, have_packagekit=no)
+AC_ARG_ENABLE([packagekit],
+    AS_HELP_STRING([--enable-packagekit],
+                   [Enable packagekit support[[default=auto]]]),
+    [enable_packagekit=$enableval],
+    [enable_packagekit=auto])
+have_packagekit=no
+if test x"$enable_packagekit" != "xno"; then
+    PKG_CHECK_MODULES(PACKAGEKIT, [
+        packagekit-glib2
+    ],
+    [have_packagekit=yes],
+    [if test x"$enable_packagekit" = xauto; then
+        AC_MSG_FAILURE([--enable-packagekit was given, but could not be found])
+     fi
+    ])
+fi    
 AM_CONDITIONAL(HAVE_PACKAGEKIT, test $have_packagekit = yes)
 
 AC_CHECK_HEADERS([sane/sane.h],[],[AC_MSG_ERROR([SANE not found])])


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]