Imported Upstream version 3.19.2upstream/3.19.2

1 files changed, 33 insertions, 7 deletions

diff --git a/configure.ac b/configure.ac
index 80dd44a..b299882 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(simple-scan, 3.19.1)
+AC_INIT(simple-scan, 3.19.2)
 AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
 AM_SILENT_RULES([yes])
 AM_MAINTAINER_MODE
@@ -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])])