Merge tag 'upstream/3.19.1'

Upstream version 3.19.1

1 files changed, 130 insertions, 19 deletions

diff --git a/configure b/configure
index 4df72b8..76ea976 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for simple-scan 3.18.0.
+# Generated by GNU Autoconf 2.69 for simple-scan 3.19.1.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -637,8 +637,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='simple-scan'
 PACKAGE_TARNAME='simple-scan'
-PACKAGE_VERSION='3.18.0'
-PACKAGE_STRING='simple-scan 3.18.0'
+PACKAGE_VERSION='3.19.1'
+PACKAGE_STRING='simple-scan 3.19.1'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -728,6 +728,10 @@ LN_S
 EGREP
 GREP
 CPP
+HAVE_PACKAGEKIT_FALSE
+HAVE_PACKAGEKIT_TRUE
+PACKAGEKIT_LIBS
+PACKAGEKIT_CFLAGS
 HAVE_COLORD_FALSE
 HAVE_COLORD_TRUE
 COLORD_LIBS
@@ -853,6 +857,8 @@ SIMPLE_SCAN_CFLAGS
 SIMPLE_SCAN_LIBS
 COLORD_CFLAGS
 COLORD_LIBS
+PACKAGEKIT_CFLAGS
+PACKAGEKIT_LIBS
 CPP
 ITSTOOL
 XMLLINT'
@@ -1396,7 +1402,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures simple-scan 3.18.0 to adapt to many kinds of systems.
+\`configure' configures simple-scan 3.19.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1462,7 +1468,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of simple-scan 3.18.0:";;
+     short | recursive ) echo "Configuration of simple-scan 3.19.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1508,6 +1514,10 @@ Some influential environment variables:
   COLORD_CFLAGS
               C compiler flags for COLORD, overriding pkg-config
   COLORD_LIBS linker flags for COLORD, overriding pkg-config
+  PACKAGEKIT_CFLAGS
+              C compiler flags for PACKAGEKIT, overriding pkg-config
+  PACKAGEKIT_LIBS
+              linker flags for PACKAGEKIT, overriding pkg-config
   CPP         C preprocessor
   ITSTOOL     Path to the `itstool` command
   XMLLINT     Path to the `xmllint` command
@@ -1578,7 +1588,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-simple-scan configure 3.18.0
+simple-scan configure 3.19.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1830,7 +1840,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by simple-scan $as_me 3.18.0, which was
+It was created by simple-scan $as_me 3.19.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2693,7 +2703,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='simple-scan'
- VERSION='3.18.0'
+ VERSION='3.19.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4252,7 +4262,6 @@ if test -n "$SIMPLE_SCAN_CFLAGS"; then
     cairo
     gdk-pixbuf-2.0
     gusb
-    packagekit-glib2
 \""; } >&5
   ($PKG_CONFIG --exists --print-errors "
     glib-2.0 >= 2.32
@@ -4263,7 +4272,6 @@ if test -n "$SIMPLE_SCAN_CFLAGS"; then
     cairo
     gdk-pixbuf-2.0
     gusb
-    packagekit-glib2
 ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -4277,7 +4285,6 @@ if test -n "$SIMPLE_SCAN_CFLAGS"; then
     cairo
     gdk-pixbuf-2.0
     gusb
-    packagekit-glib2
 " 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
@@ -4299,7 +4306,6 @@ if test -n "$SIMPLE_SCAN_LIBS"; then
     cairo
     gdk-pixbuf-2.0
     gusb
-    packagekit-glib2
 \""; } >&5
   ($PKG_CONFIG --exists --print-errors "
     glib-2.0 >= 2.32
@@ -4310,7 +4316,6 @@ if test -n "$SIMPLE_SCAN_LIBS"; then
     cairo
     gdk-pixbuf-2.0
     gusb
-    packagekit-glib2
 ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -4324,7 +4329,6 @@ if test -n "$SIMPLE_SCAN_LIBS"; then
     cairo
     gdk-pixbuf-2.0
     gusb
-    packagekit-glib2
 " 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
@@ -4355,7 +4359,6 @@ fi
     cairo
     gdk-pixbuf-2.0
     gusb
-    packagekit-glib2
 " 2>&1`
         else
 	        SIMPLE_SCAN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
@@ -4367,7 +4370,6 @@ fi
     cairo
     gdk-pixbuf-2.0
     gusb
-    packagekit-glib2
 " 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
@@ -4382,7 +4384,6 @@ fi
     cairo
     gdk-pixbuf-2.0
     gusb
-    packagekit-glib2
 ) were not met:
 
 $SIMPLE_SCAN_PKG_ERRORS
@@ -4513,6 +4514,102 @@ fi
 
 
 
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PACKAGEKIT" >&5
+$as_echo_n "checking for PACKAGEKIT... " >&6; }
+
+if test -n "$PACKAGEKIT_CFLAGS"; then
+    pkg_cv_PACKAGEKIT_CFLAGS="$PACKAGEKIT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
+    packagekit-glib2
+\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "
+    packagekit-glib2
+") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_PACKAGEKIT_CFLAGS=`$PKG_CONFIG --cflags "
+    packagekit-glib2
+" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$PACKAGEKIT_LIBS"; then
+    pkg_cv_PACKAGEKIT_LIBS="$PACKAGEKIT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
+    packagekit-glib2
+\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "
+    packagekit-glib2
+") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_PACKAGEKIT_LIBS=`$PKG_CONFIG --libs "
+    packagekit-glib2
+" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        PACKAGEKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "
+    packagekit-glib2
+" 2>&1`
+        else
+	        PACKAGEKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
+    packagekit-glib2
+" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$PACKAGEKIT_PKG_ERRORS" >&5
+
+	have_packagekit=no
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	have_packagekit=no
+else
+	PACKAGEKIT_CFLAGS=$pkg_cv_PACKAGEKIT_CFLAGS
+	PACKAGEKIT_LIBS=$pkg_cv_PACKAGEKIT_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	have_packagekit=yes
+fi
+ if test $have_packagekit = yes; then
+  HAVE_PACKAGEKIT_TRUE=
+  HAVE_PACKAGEKIT_FALSE='#'
+else
+  HAVE_PACKAGEKIT_TRUE='#'
+  HAVE_PACKAGEKIT_FALSE=
+fi
+
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5965,6 +6062,10 @@ if test -z "${HAVE_COLORD_TRUE}" && test -z "${HAVE_COLORD_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_COLORD\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_PACKAGEKIT_TRUE}" && test -z "${HAVE_PACKAGEKIT_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_PACKAGEKIT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
   ac_config_commands="$ac_config_commands po/stamp-it"
 
@@ -6366,7 +6467,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by simple-scan $as_me 3.18.0, which was
+This file was extended by simple-scan $as_me 3.19.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6423,7 +6524,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-simple-scan config.status 3.18.0
+simple-scan config.status 3.19.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -7130,3 +7231,13 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
+
+
+echo "
+                    Simple Scan $VERSION
+                    ====================
+
+        prefix:                   $prefix
+        PackageKit support:       $have_packagekit
+        Color management:         $have_colord
+"