From 2add609936591c1eeb821a728e1aa951e1de20f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 14 Dec 2015 05:55:12 +0100 Subject: Imported Upstream version 3.19.2 --- configure | 154 +++++++++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 107 insertions(+), 47 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 76ea976..6fbd6bf 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.19.1. +# Generated by GNU Autoconf 2.69 for simple-scan 3.19.2. # # # 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.19.1' -PACKAGE_STRING='simple-scan 3.19.1' +PACKAGE_VERSION='3.19.2' +PACKAGE_STRING='simple-scan 3.19.2' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -813,6 +813,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -839,6 +840,8 @@ enable_silent_rules enable_maintainer_mode enable_dependency_tracking enable_schemas_compile +enable_colord +enable_packagekit with_help_dir enable_nls ' @@ -900,6 +903,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1152,6 +1156,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1289,7 +1302,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1402,7 +1415,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.19.1 to adapt to many kinds of systems. +\`configure' configures simple-scan 3.19.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1442,6 +1455,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1468,7 +1482,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of simple-scan 3.19.1:";; + short | recursive ) echo "Configuration of simple-scan 3.19.2:";; esac cat <<\_ACEOF @@ -1487,6 +1501,8 @@ Optional Features: speeds up one-time build --disable-schemas-compile Disable regeneration of gschemas.compiled on install + --enable-colord Enable colord support[[default=auto]] + --enable-packagekit Enable packagekit support[[default=auto]] --disable-nls do not use Native Language Support Optional Packages: @@ -1588,7 +1604,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -simple-scan configure 3.19.1 +simple-scan configure 3.19.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1840,7 +1856,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.19.1, which was +It was created by simple-scan $as_me 3.19.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2703,7 +2719,7 @@ fi # Define the identity of the package. PACKAGE='simple-scan' - VERSION='3.19.1' + VERSION='3.19.2' cat >>confdefs.h <<_ACEOF @@ -4417,6 +4433,15 @@ $as_echo "yes" >&6; } fi +# Check whether --enable-colord was given. +if test "${enable_colord+set}" = set; then : + enableval=$enable_colord; enable_colord=$enableval +else + enable_colord=auto +fi + +have_colord=no +if test x"$enable_colord" != "xno"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for COLORD" >&5 @@ -4427,17 +4452,17 @@ if test -n "$COLORD_CFLAGS"; then elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" - colord -\""; } >&5 + colord + \""; } >&5 ($PKG_CONFIG --exists --print-errors " - colord -") 2>&5 + colord + ") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_COLORD_CFLAGS=`$PKG_CONFIG --cflags " - colord -" 2>/dev/null` + colord + " 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -4450,17 +4475,17 @@ if test -n "$COLORD_LIBS"; then elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" - colord -\""; } >&5 + colord + \""; } >&5 ($PKG_CONFIG --exists --print-errors " - colord -") 2>&5 + colord + ") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_COLORD_LIBS=`$PKG_CONFIG --libs " - colord -" 2>/dev/null` + colord + " 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -4482,27 +4507,40 @@ else fi if test $_pkg_short_errors_supported = yes; then COLORD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " - colord -" 2>&1` + colord + " 2>&1` else COLORD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " - colord -" 2>&1` + colord + " 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$COLORD_PKG_ERRORS" >&5 - have_colord=no + if test x"$enable_colord" = xauto; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "--enable-colord was given, but could not be found +See \`config.log' for more details" "$LINENO" 5; } + fi + elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - have_colord=no + if test x"$enable_colord" = xauto; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "--enable-colord was given, but could not be found +See \`config.log' for more details" "$LINENO" 5; } + fi + else COLORD_CFLAGS=$pkg_cv_COLORD_CFLAGS COLORD_LIBS=$pkg_cv_COLORD_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } have_colord=yes +fi fi if test $have_colord = yes; then HAVE_COLORD_TRUE= @@ -4513,6 +4551,15 @@ else fi +# Check whether --enable-packagekit was given. +if test "${enable_packagekit+set}" = set; then : + enableval=$enable_packagekit; enable_packagekit=$enableval +else + enable_packagekit=auto +fi + +have_packagekit=no +if test x"$enable_packagekit" != "xno"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PACKAGEKIT" >&5 @@ -4523,17 +4570,17 @@ if test -n "$PACKAGEKIT_CFLAGS"; then 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 + packagekit-glib2 + \""; } >&5 ($PKG_CONFIG --exists --print-errors " - packagekit-glib2 -") 2>&5 + 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` + packagekit-glib2 + " 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -4546,17 +4593,17 @@ if test -n "$PACKAGEKIT_LIBS"; then 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 + packagekit-glib2 + \""; } >&5 ($PKG_CONFIG --exists --print-errors " - packagekit-glib2 -") 2>&5 + 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` + packagekit-glib2 + " 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -4578,27 +4625,40 @@ else fi if test $_pkg_short_errors_supported = yes; then PACKAGEKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " - packagekit-glib2 -" 2>&1` + packagekit-glib2 + " 2>&1` else PACKAGEKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " - packagekit-glib2 -" 2>&1` + packagekit-glib2 + " 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$PACKAGEKIT_PKG_ERRORS" >&5 - have_packagekit=no + if test x"$enable_packagekit" = xauto; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "--enable-packagekit was given, but could not be found +See \`config.log' for more details" "$LINENO" 5; } + fi + elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - have_packagekit=no + if test x"$enable_packagekit" = xauto; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "--enable-packagekit was given, but could not be found +See \`config.log' for more details" "$LINENO" 5; } + fi + 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 fi if test $have_packagekit = yes; then HAVE_PACKAGEKIT_TRUE= @@ -6467,7 +6527,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.19.1, which was +This file was extended by simple-scan $as_me 3.19.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6524,7 +6584,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.19.1 +simple-scan config.status 3.19.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -- cgit v1.2.3