diff options
author | Didier Raboud <odyx@debian.org> | 2016-09-20 11:56:08 +0200 |
---|---|---|
committer | Didier Raboud <odyx@debian.org> | 2016-09-20 11:56:08 +0200 |
commit | 7f5731038556e5b03d2a886163ca2c873c77333d (patch) | |
tree | 8f4194af3949a73accf44b2b0bd8ebfa990ac577 /configure | |
parent | a313257bdec71bc92a56598e74d9097c16cb6e48 (diff) |
New upstream version 5.2.12~pre2
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 624 |
1 files changed, 204 insertions, 420 deletions
@@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac Revision: 1.269 . +# From configure.ac Revision. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for gutenprint 5.2.11. +# Generated by GNU Autoconf 2.69 for gutenprint 5.2.12-pre2. # # Report bugs to <gimp-print-devel@lists.sourceforge.net>. # @@ -608,8 +608,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='gutenprint' PACKAGE_TARNAME='gutenprint' -PACKAGE_VERSION='5.2.11' -PACKAGE_STRING='gutenprint 5.2.11' +PACKAGE_VERSION='5.2.12-pre2' +PACKAGE_STRING='gutenprint 5.2.12-pre2' PACKAGE_BUGREPORT='gimp-print-devel@lists.sourceforge.net' PACKAGE_URL='' @@ -656,6 +656,7 @@ am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +LIBUSB_BACKEND_LIBDEPS GUTENPRINT_RELEASE_VERSION GUTENPRINT_BASE_VERSION BUILD_CUPS_PPDS @@ -679,8 +680,6 @@ GUTENPRINT_LIBS GUTENPRINT_CFLAGS gimp2_plug_indir RM -IJS_LIBS -IJS_CFLAGS GENPPD_LIBS CUPS_PPD_PS_LEVEL CUPS_LIBS @@ -733,14 +732,7 @@ BUILD_CUPS_1_2_FALSE BUILD_CUPS_1_2_TRUE BUILD_CUPS_FALSE BUILD_CUPS_TRUE -BUILD_GHOSTSCRIPT_FALSE -BUILD_GHOSTSCRIPT_TRUE -BUILD_FOOMATIC_3_FALSE -BUILD_FOOMATIC_3_TRUE -BUILD_FOOMATIC_FALSE -BUILD_FOOMATIC_TRUE GNUCFLAGS -FOOMATIC_KITLOAD DIALOG DOXYGEN DB2HTML @@ -770,9 +762,6 @@ LIBUSB_CFLAGS PKG_CONFIG_LIBDIR PKG_CONFIG_PATH PKG_CONFIG -IJS_CONFIG -FOOMATIC_PPDFILE -FOOMATIC_CONFIGURE ENABLE_SHARED ENABLE_STATIC USE_NLS_FALSE @@ -947,9 +936,6 @@ enable_simplified_cups_ppds enable_cups_ppds_at_top_level enable_cups_level3_ppds enable_static_genppd -with_foomatic -with_foomatic3 -with_ghostscript with_modules enable_debug enable_profile @@ -1526,7 +1512,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 gutenprint 5.2.11 to adapt to many kinds of systems. +\`configure' configures gutenprint 5.2.12-pre2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1596,7 +1582,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gutenprint 5.2.11:";; + short | recursive ) echo "Configuration of gutenprint 5.2.12-pre2:";; esac cat <<\_ACEOF @@ -1665,9 +1651,6 @@ Optional Packages: --without-libiconv-prefix don't search for libiconv in includedir and libdir --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib --without-libintl-prefix don't search for libintl in includedir and libdir - --with-foomatic build foomatic data files [(automatic)] - --with-foomatic3 make use of foomatic 3 extra features [(automatic)] - --with-ghostscript build Ghostscript driver [(automatic)] --with-modules enable loadable modules (options: ltdl, dlopen, static) [(automatic)] --with-readline use readline (default tries -lncurses, -lcurses, @@ -1777,7 +1760,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gutenprint configure 5.2.11 +gutenprint configure 5.2.12-pre2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2217,7 +2200,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 gutenprint $as_me 5.2.11, which was +It was created by gutenprint $as_me 5.2.12-pre2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2604,12 +2587,12 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. GUTENPRINT_MAJOR_VERSION=5 GUTENPRINT_MINOR_VERSION=2 -GUTENPRINT_MICRO_VERSION=11 -GUTENPRINT_EXTRA_VERSION= +GUTENPRINT_MICRO_VERSION=12 +GUTENPRINT_EXTRA_VERSION=-pre2 GUTENPRINT_CURRENT_INTERFACE=6 GUTENPRINT_INTERFACE_AGE=0 GUTENPRINT_BINARY_AGE=4 -GUTENPRINT_VERSION=5.2.11 +GUTENPRINT_VERSION=5.2.12-pre2 GUTENPRINTUI2_CURRENT_INTERFACE=1 GUTENPRINTUI2_INTERFACE_AGE=0 GUTENPRINTUI2_BINARY_AGE=0 @@ -2811,8 +2794,8 @@ test "$program_suffix" != NONE && ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then case $am_aux_dir in @@ -3125,7 +3108,7 @@ fi # Define the identity of the package. PACKAGE='gutenprint' - VERSION='5.2.11' + VERSION='5.2.12-pre2' cat >>confdefs.h <<_ACEOF @@ -11978,8 +11961,9 @@ _ACEOF -# Extract the first word of "cups-config", so it can be a program name with args. -set dummy cups-config; ac_word=$2 +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cups-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}cups-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_CUPS_CONFIG+:} false; then : @@ -12018,6 +12002,63 @@ $as_echo "no" >&6; } fi +fi +if test -z "$ac_cv_path_CUPS_CONFIG"; then + ac_pt_CUPS_CONFIG=$CUPS_CONFIG + # Extract the first word of "cups-config", so it can be a program name with args. +set dummy cups-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_CUPS_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_CUPS_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_CUPS_CONFIG="$ac_pt_CUPS_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_CUPS_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_CUPS_CONFIG=$ac_cv_path_ac_pt_CUPS_CONFIG +if test -n "$ac_pt_CUPS_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CUPS_CONFIG" >&5 +$as_echo "$ac_pt_CUPS_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_CUPS_CONFIG" = x; then + CUPS_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CUPS_CONFIG=$ac_pt_CUPS_CONFIG + fi +else + CUPS_CONFIG="$ac_cv_path_CUPS_CONFIG" +fi + if test -z "${CUPS_CONFIG}" ; then BUILD_CUPS="no" else @@ -14099,237 +14140,6 @@ _ACEOF -# Extract the first word of "foomatic-configure", so it can be a program name with args. -set dummy foomatic-configure; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_FOOMATIC_CONFIGURE+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $FOOMATIC_CONFIGURE in - [\\/]* | ?:[\\/]*) - ac_cv_path_FOOMATIC_CONFIGURE="$FOOMATIC_CONFIGURE" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_FOOMATIC_CONFIGURE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -FOOMATIC_CONFIGURE=$ac_cv_path_FOOMATIC_CONFIGURE -if test -n "$FOOMATIC_CONFIGURE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FOOMATIC_CONFIGURE" >&5 -$as_echo "$FOOMATIC_CONFIGURE" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -if test -z "${FOOMATIC_CONFIGURE}" ; then - BUILD_FOOMATIC="no" -else - BUILD_FOOMATIC="yes" -fi -# create custom command-line --with option -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build foomatic data files" >&5 -$as_echo_n "checking whether to build foomatic data files... " >&6; } - -# Check whether --with-foomatic was given. -if test "${with_foomatic+set}" = set; then : - withval=$with_foomatic; case "${withval}" in - - yes) BUILD_FOOMATIC="yes" ; { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${BUILD_FOOMATIC}" >&5 -$as_echo "${BUILD_FOOMATIC}" >&6; } ;; - no) BUILD_FOOMATIC="no" ; { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${BUILD_FOOMATIC}" >&5 -$as_echo "${BUILD_FOOMATIC}" >&6; } ;; - *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5 -$as_echo "unknown" >&6; } - as_fn_error $? "bad value ${withval} for --with-foomatic" "$LINENO" 5 ;; - - esac -else - if test -z "${BUILD_FOOMATIC}" ; then - BUILD_FOOMATIC="(automatic)" - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${BUILD_FOOMATIC}" >&5 -$as_echo "${BUILD_FOOMATIC}" >&6; } ; -fi - -if test -z "${BUILD_FOOMATIC}" ; then - BUILD_FOOMATIC="(automatic)" -fi - - - -# Extract the first word of "foomatic-ppdfile", so it can be a program name with args. -set dummy foomatic-ppdfile; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_FOOMATIC_PPDFILE+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $FOOMATIC_PPDFILE in - [\\/]* | ?:[\\/]*) - ac_cv_path_FOOMATIC_PPDFILE="$FOOMATIC_PPDFILE" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_FOOMATIC_PPDFILE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -FOOMATIC_PPDFILE=$ac_cv_path_FOOMATIC_PPDFILE -if test -n "$FOOMATIC_PPDFILE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FOOMATIC_PPDFILE" >&5 -$as_echo "$FOOMATIC_PPDFILE" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -if test -z "${FOOMATIC_PPDFILE}" ; then - BUILD_FOOMATIC_3="no" -else - BUILD_FOOMATIC_3="yes" -fi -# create custom command-line --with option -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to make use of foomatic 3 extra features" >&5 -$as_echo_n "checking whether to make use of foomatic 3 extra features... " >&6; } - -# Check whether --with-foomatic3 was given. -if test "${with_foomatic3+set}" = set; then : - withval=$with_foomatic3; case "${withval}" in - - yes) BUILD_FOOMATIC_3="yes" ; { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${BUILD_FOOMATIC_3}" >&5 -$as_echo "${BUILD_FOOMATIC_3}" >&6; } ;; - no) BUILD_FOOMATIC_3="no" ; { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${BUILD_FOOMATIC_3}" >&5 -$as_echo "${BUILD_FOOMATIC_3}" >&6; } ;; - *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5 -$as_echo "unknown" >&6; } - as_fn_error $? "bad value ${withval} for --with-foomatic3" "$LINENO" 5 ;; - - esac -else - if test -z "${BUILD_FOOMATIC_3}" ; then - BUILD_FOOMATIC_3="(automatic)" - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${BUILD_FOOMATIC_3}" >&5 -$as_echo "${BUILD_FOOMATIC_3}" >&6; } ; -fi - -if test -z "${BUILD_FOOMATIC_3}" ; then - BUILD_FOOMATIC_3="(automatic)" -fi - - -if test "$BUILD_FOOMATIC_3" = "yes" ; then - BUILD_FOOMATIC=yes -fi - -# Extract the first word of "ijs-config", so it can be a program name with args. -set dummy ijs-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_IJS_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $IJS_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_IJS_CONFIG="$IJS_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_IJS_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -IJS_CONFIG=$ac_cv_path_IJS_CONFIG -if test -n "$IJS_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IJS_CONFIG" >&5 -$as_echo "$IJS_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - -if test -z "${IJS_CONFIG}" ; then - BUILD_GHOSTSCRIPT="no" -else - BUILD_GHOSTSCRIPT="yes" -fi -# create custom command-line --with option -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Ghostscript driver" >&5 -$as_echo_n "checking whether to build Ghostscript driver... " >&6; } - -# Check whether --with-ghostscript was given. -if test "${with_ghostscript+set}" = set; then : - withval=$with_ghostscript; case "${withval}" in - - yes) BUILD_GHOSTSCRIPT="yes" ; { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${BUILD_GHOSTSCRIPT}" >&5 -$as_echo "${BUILD_GHOSTSCRIPT}" >&6; } ;; - no) BUILD_GHOSTSCRIPT="no" ; { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${BUILD_GHOSTSCRIPT}" >&5 -$as_echo "${BUILD_GHOSTSCRIPT}" >&6; } ;; - *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5 -$as_echo "unknown" >&6; } - as_fn_error $? "bad value ${withval} for --with-ghostscript" "$LINENO" 5 ;; - - esac -else - if test -z "${BUILD_GHOSTSCRIPT}" ; then - BUILD_GHOSTSCRIPT="(automatic)" - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${BUILD_GHOSTSCRIPT}" >&5 -$as_echo "${BUILD_GHOSTSCRIPT}" >&6; } ; -fi - -if test -z "${BUILD_GHOSTSCRIPT}" ; then - BUILD_GHOSTSCRIPT="(automatic)" -fi - - # create custom command-line --with option { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable loadable modules" >&5 $as_echo_n "checking whether to enable loadable modules... " >&6; } @@ -14474,7 +14284,8 @@ if test -z "${USE_READLINE}" ; then fi -# libusb-1.0 (For CUPS backends) +# libusb-1.0 (For CUPS backends, but only bother if CUPS is enabled) +if test "x$BUILD_CUPS" = "xyes" ; then @@ -14655,25 +14466,25 @@ fi echo "$LIBUSB_PKG_ERRORS" >&5 HAVE_LIBUSB=no - BUILD_LIBUSB_BACKENDS=no + BUILD_LIBUSB_BACKENDS=no elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } HAVE_LIBUSB=no - BUILD_LIBUSB_BACKENDS=no + BUILD_LIBUSB_BACKENDS=no else LIBUSB_CFLAGS=$pkg_cv_LIBUSB_CFLAGS LIBUSB_LIBS=$pkg_cv_LIBUSB_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } HAVE_LIBUSB=yes - BUILD_LIBUSB_BACKENDS=yes + BUILD_LIBUSB_BACKENDS=yes +fi fi -for ac_prog in gimptool-2.0 gimptool -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gimptool-2.0 gimptool", so it can be a program name with args. +set dummy ${ac_tool_prefix}gimptool-2.0 gimptool; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_GIMPTOOL2_CHECK+:} false; then : @@ -14712,8 +14523,62 @@ $as_echo "no" >&6; } fi - test -n "$GIMPTOOL2_CHECK" && break +fi +if test -z "$ac_cv_path_GIMPTOOL2_CHECK"; then + ac_pt_GIMPTOOL2_CHECK=$GIMPTOOL2_CHECK + # Extract the first word of "gimptool-2.0 gimptool", so it can be a program name with args. +set dummy gimptool-2.0 gimptool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_GIMPTOOL2_CHECK+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_GIMPTOOL2_CHECK in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_GIMPTOOL2_CHECK="$ac_pt_GIMPTOOL2_CHECK" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_GIMPTOOL2_CHECK="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_GIMPTOOL2_CHECK=$ac_cv_path_ac_pt_GIMPTOOL2_CHECK +if test -n "$ac_pt_GIMPTOOL2_CHECK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_GIMPTOOL2_CHECK" >&5 +$as_echo "$ac_pt_GIMPTOOL2_CHECK" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_GIMPTOOL2_CHECK" = x; then + GIMPTOOL2_CHECK="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + GIMPTOOL2_CHECK=$ac_pt_GIMPTOOL2_CHECK + fi +else + GIMPTOOL2_CHECK="$ac_cv_path_GIMPTOOL2_CHECK" +fi if test -z "${GIMPTOOL2_CHECK}" ; then BUILD_GIMP2="no" @@ -15264,14 +15129,12 @@ $as_echo "$LIBICONV" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strerror in -lcposix" >&5 -$as_echo_n "checking for strerror in -lcposix... " >&6; } -if ${ac_cv_lib_cposix_strerror+:} false; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5 +$as_echo_n "checking for library containing strerror... " >&6; } +if ${ac_cv_search_strerror+:} false; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lcposix $LIBS" + ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -15290,22 +15153,37 @@ return strerror (); return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_cposix_strerror=yes -else - ac_cv_lib_cposix_strerror=no +for ac_lib in '' cposix; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_strerror=$ac_res fi rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cposix_strerror" >&5 -$as_echo "$ac_cv_lib_cposix_strerror" >&6; } -if test "x$ac_cv_lib_cposix_strerror" = xyes; then : - LIBS="$LIBS -lcposix" + conftest$ac_exeext + if ${ac_cv_search_strerror+:} false; then : + break fi +done +if ${ac_cv_search_strerror+:} false; then : +else + ac_cv_search_strerror=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5 +$as_echo "$ac_cv_search_strerror" >&6; } +ac_res=$ac_cv_search_strerror +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +fi for ac_prog in gawk mawk nawk awk do @@ -17646,62 +17524,6 @@ fi fi -if test x${BUILD_FOOMATIC} = xyes ; then - PATH_SBIN=$PATH:/usr/sbin:/usr/local/sbin - # Extract the first word of "foomatic-kitload", so it can be a program name with args. -set dummy foomatic-kitload; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_FOOMATIC_KITLOAD+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $FOOMATIC_KITLOAD in - [\\/]* | ?:[\\/]*) - ac_cv_path_FOOMATIC_KITLOAD="$FOOMATIC_KITLOAD" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH_SBIN -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_FOOMATIC_KITLOAD="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -FOOMATIC_KITLOAD=$ac_cv_path_FOOMATIC_KITLOAD -if test -n "$FOOMATIC_KITLOAD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FOOMATIC_KITLOAD" >&5 -$as_echo "$FOOMATIC_KITLOAD" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - if test -z "$FOOMATIC_KITLOAD" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find foomatic-kitload; attempt to install foomatic will fail" >&5 -$as_echo "$as_me: WARNING: Cannot find foomatic-kitload; attempt to install foomatic will fail" >&2;} - fi -fi - -if test x${BUILD_GHOSTSCRIPT} = xyes ; then - if test -z "$IJS_CONFIG" ; then - as_fn_error $? "Cannot find ijs-config; please ensure Ghostscript 6.53 or above is installed" "$LINENO" 5; - fi - IJS_CFLAGS=`$IJS_CONFIG --cflags` - IJS_LIBS=`$IJS_CONFIG --libs` -fi - GUTENPRINT_RELEASE_VERSION=${GUTENPRINT_MAJOR_VERSION}.${GUTENPRINT_MINOR_VERSION} cat >>confdefs.h <<_ACEOF @@ -19343,33 +19165,6 @@ if test "$ac_res" != no; then : fi - if test x${BUILD_FOOMATIC} = xyes; then - BUILD_FOOMATIC_TRUE= - BUILD_FOOMATIC_FALSE='#' -else - BUILD_FOOMATIC_TRUE='#' - BUILD_FOOMATIC_FALSE= -fi - - - if test x${BUILD_FOOMATIC_3} = xyes; then - BUILD_FOOMATIC_3_TRUE= - BUILD_FOOMATIC_3_FALSE='#' -else - BUILD_FOOMATIC_3_TRUE='#' - BUILD_FOOMATIC_3_FALSE= -fi - - - if test x${BUILD_GHOSTSCRIPT} = xyes; then - BUILD_GHOSTSCRIPT_TRUE= - BUILD_GHOSTSCRIPT_FALSE='#' -else - BUILD_GHOSTSCRIPT_TRUE='#' - BUILD_GHOSTSCRIPT_FALSE= -fi - - if test x${BUILD_CUPS} = xyes; then BUILD_CUPS_TRUE= BUILD_CUPS_FALSE='#' @@ -19603,6 +19398,7 @@ if test -n "$HAVE_DLFCN_H"; then DLOPEN_POSSIBLE="true" fi fi + # define what the user chose to build, if possible. # Prefer dlopen over ltdl. if test x$WITH_MODULES = xyes; then @@ -19620,31 +19416,51 @@ elif test x$WITH_MODULES = xdlopen; then USE_DLOPEN="true" fi fi + +# The current backends can use dlopen or libltdl +if test x$BUILD_LIBUSB_BACKENDS = xyes; then + if test x$DLOPEN_POSSIBLE = xtrue; then + USE_DLOPEN="true" + elif test x$LDTL_POSSIBLE = xtrue; then + USE_LTDL="true" + fi +fi + # define what module system is to be used { $as_echo "$as_me:${as_lineno-$LINENO}: checking which module system will be used" >&5 $as_echo_n "checking which module system will be used... " >&6; } if test x$USE_LTDL = xtrue; then - MODULE="true" + if test -n "$WITH_MODULES" ; then + MODULE="false" + else + MODULE="true" $as_echo "#define MODULE \"1\"" >>confdefs.h + GUTENPRINT_LIBDEPS="${GUTENPRINT_LIBDEPS} ${LTDL_LIBS}" + gutenprint_libdeps="${gutenprint_libdeps} ${LTDL_LIBS}" + fi + LIBUSB_BACKEND_LIBDEPS="${LIBUSB_BACKEND_LIBDEPS} ${LTDL_LIBS}" $as_echo "#define USE_LTDL \"1\"" >>confdefs.h - GUTENPRINT_LIBDEPS="${GUTENPRINT_LIBDEPS} ${LTDL_LIBS}" - gutenprint_libdeps="${gutenprint_libdeps} ${LTDL_LIBS}" { $as_echo "$as_me:${as_lineno-$LINENO}: result: ltdl" >&5 $as_echo "ltdl" >&6; } elif test x$USE_DLOPEN = xtrue; then - MODULE="true" + if test -n "$WITH_MODULES" ; then + MODULE="false" + else + MODULE="true" $as_echo "#define MODULE \"1\"" >>confdefs.h + GUTENPRINT_LIBDEPS="${GUTENPRINT_LIBDEPS} ${DLOPEN_LIBS}" + gutenprint_libdeps="${gutenprint_libdeps} ${DLOPEN_LIBS}" + fi + LIBUSB_BACKEND_LIBDEPS="${LIBUSB_BACKEND_LIBDEPS} ${DLOPEN_LIBS}" $as_echo "#define USE_DLOPEN \"1\"" >>confdefs.h - GUTENPRINT_LIBDEPS="${GUTENPRINT_LIBDEPS} ${DLOPEN_LIBS}" - gutenprint_libdeps="${gutenprint_libdeps} ${DLOPEN_LIBS}" { $as_echo "$as_me:${as_lineno-$LINENO}: result: dlopen" >&5 $as_echo "dlopen" >&6; } else @@ -19712,7 +19528,7 @@ cat >>confdefs.h <<_ACEOF #define CUPS_PPD_PS_LEVEL ${CUPS_PPD_PS_LEVEL} _ACEOF -RELEASE_DATE="15 Jan 2016" +RELEASE_DATE="19 Sep 2016" cat >>confdefs.h <<_ACEOF #define RELEASE_DATE "${RELEASE_DATE}" @@ -19748,9 +19564,6 @@ RM='rm' - - - gutenprint_libs="${GUTENPRINT_LIBS} ${gutenprint_libdeps}" @@ -19768,6 +19581,7 @@ gutenprintui2_libs="${GUTENPRINTUI2_LIBS} ${gutenprintui2_libdeps}" + # Check whether --with-archflags was given. if test "${with_archflags+set}" = set; then : withval=$with_archflags; CFLAGS="$CFLAGS $withval" @@ -19804,8 +19618,6 @@ ac_config_files="$ac_config_files man/cups-genppdupdate.8" ac_config_files="$ac_config_files man/escputil.1" -ac_config_files="$ac_config_files man/ijsgutenprint.1" - ac_config_files="$ac_config_files po/Makefile.in" ac_config_files="$ac_config_files samples/Makefile" @@ -19820,20 +19632,12 @@ ac_config_files="$ac_config_files src/cups/cups-genppdupdate" ac_config_files="$ac_config_files src/escputil/Makefile" -ac_config_files="$ac_config_files src/foomatic/Makefile" - -ac_config_files="$ac_config_files src/foomatic/foomatic-generator" - -ac_config_files="$ac_config_files src/foomatic/mk_printerlist" - ac_config_files="$ac_config_files src/testpattern/run-testpattern-2" ac_config_files="$ac_config_files src/testpattern/compare-checksums" ac_config_files="$ac_config_files src/cups/test-rastertogutenprint" -ac_config_files="$ac_config_files src/ghost/Makefile" - ac_config_files="$ac_config_files src/testpattern/Makefile" ac_config_files="$ac_config_files src/gimp2/Makefile" @@ -19868,6 +19672,8 @@ ac_config_files="$ac_config_files test/Makefile" ac_config_files="$ac_config_files scripts/Makefile" +ac_config_files="$ac_config_files scripts/mkgitlog" + ac_config_commands="$ac_config_commands default" @@ -20019,18 +19825,6 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${BUILD_FOOMATIC_TRUE}" && test -z "${BUILD_FOOMATIC_FALSE}"; then - as_fn_error $? "conditional \"BUILD_FOOMATIC\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${BUILD_FOOMATIC_3_TRUE}" && test -z "${BUILD_FOOMATIC_3_FALSE}"; then - as_fn_error $? "conditional \"BUILD_FOOMATIC_3\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${BUILD_GHOSTSCRIPT_TRUE}" && test -z "${BUILD_GHOSTSCRIPT_FALSE}"; then - as_fn_error $? "conditional \"BUILD_GHOSTSCRIPT\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${BUILD_CUPS_TRUE}" && test -z "${BUILD_CUPS_FALSE}"; then as_fn_error $? "conditional \"BUILD_CUPS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -20512,7 +20306,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 gutenprint $as_me 5.2.11, which was +This file was extended by gutenprint $as_me 5.2.12-pre2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20578,7 +20372,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="\\ -gutenprint config.status 5.2.11 +gutenprint config.status 5.2.12-pre2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -21012,7 +20806,6 @@ do "man/cups-genppd.8") CONFIG_FILES="$CONFIG_FILES man/cups-genppd.8" ;; "man/cups-genppdupdate.8") CONFIG_FILES="$CONFIG_FILES man/cups-genppdupdate.8" ;; "man/escputil.1") CONFIG_FILES="$CONFIG_FILES man/escputil.1" ;; - "man/ijsgutenprint.1") CONFIG_FILES="$CONFIG_FILES man/ijsgutenprint.1" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "samples/Makefile") CONFIG_FILES="$CONFIG_FILES samples/Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; @@ -21020,13 +20813,9 @@ do "src/cups/Info.plist") CONFIG_FILES="$CONFIG_FILES src/cups/Info.plist" ;; "src/cups/cups-genppdupdate") CONFIG_FILES="$CONFIG_FILES src/cups/cups-genppdupdate" ;; "src/escputil/Makefile") CONFIG_FILES="$CONFIG_FILES src/escputil/Makefile" ;; - "src/foomatic/Makefile") CONFIG_FILES="$CONFIG_FILES src/foomatic/Makefile" ;; - "src/foomatic/foomatic-generator") CONFIG_FILES="$CONFIG_FILES src/foomatic/foomatic-generator" ;; - "src/foomatic/mk_printerlist") CONFIG_FILES="$CONFIG_FILES src/foomatic/mk_printerlist" ;; "src/testpattern/run-testpattern-2") CONFIG_FILES="$CONFIG_FILES src/testpattern/run-testpattern-2" ;; "src/testpattern/compare-checksums") CONFIG_FILES="$CONFIG_FILES src/testpattern/compare-checksums" ;; "src/cups/test-rastertogutenprint") CONFIG_FILES="$CONFIG_FILES src/cups/test-rastertogutenprint" ;; - "src/ghost/Makefile") CONFIG_FILES="$CONFIG_FILES src/ghost/Makefile" ;; "src/testpattern/Makefile") CONFIG_FILES="$CONFIG_FILES src/testpattern/Makefile" ;; "src/gimp2/Makefile") CONFIG_FILES="$CONFIG_FILES src/gimp2/Makefile" ;; "src/main/Makefile") CONFIG_FILES="$CONFIG_FILES src/main/Makefile" ;; @@ -21044,6 +20833,7 @@ do "src/gutenprintui2/gutenprintui2.pc") CONFIG_FILES="$CONFIG_FILES src/gutenprintui2/gutenprintui2.pc" ;; "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;; + "scripts/mkgitlog") CONFIG_FILES="$CONFIG_FILES scripts/mkgitlog" ;; "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; @@ -22477,11 +22267,10 @@ fi esac done ;; "src/cups/cups-genppdupdate":F) chmod +x src/cups/cups-genppdupdate ;; - "src/foomatic/foomatic-generator":F) chmod +x src/foomatic/foomatic-generator ;; - "src/foomatic/mk_printerlist":F) chmod +x src/foomatic/mk_printerlist ;; "src/testpattern/run-testpattern-2":F) chmod +x src/testpattern/run-testpattern-2 ;; "src/testpattern/compare-checksums":F) chmod +x src/testpattern/compare-checksums ;; "src/cups/test-rastertogutenprint":F) chmod +x src/cups/test-rastertogutenprint ;; + "scripts/mkgitlog":F) chmod +x scripts/mkgitlog ;; "default":C) echo ;; @@ -22575,11 +22364,6 @@ if test "$BUILD_GIMP2" != "no" ; then else echo " Build enhanced Print plugin for GIMP: no" fi -echo " Build Ghostscript IJS driver: $BUILD_GHOSTSCRIPT" -echo " Build Foomatic data: $BUILD_FOOMATIC" -if test "$BUILD_FOOMATIC" != "no" ; then - echo " Build Foomatic 3.x data: $BUILD_FOOMATIC_3" -fi echo " Build test programs: $BUILD_TEST" echo " Build testpattern generator: $BUILD_TESTPATTERN" echo |