]> git.ipfire.org Git - thirdparty/cups.git/blobdiff - configure
Add checks for missing/bad CloseUI/JCLCloseUI keywords (Issue #5381)
[thirdparty/cups.git] / configure
index df528e628ce67fa1d256e5482cb0e7f3ba6b6b3d..d8d363465dcc8e4bf51d75c0f71a371b573582fa 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for CUPS 2.2.1.
+# Generated by GNU Autoconf 2.68 for CUPS 2.2.9.
 #
 # Report bugs to <https://github.com/apple/cups/issues>.
 #
@@ -560,8 +560,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='CUPS'
 PACKAGE_TARNAME='cups'
-PACKAGE_VERSION='2.2.1'
-PACKAGE_STRING='CUPS 2.2.1'
+PACKAGE_VERSION='2.2.9'
+PACKAGE_STRING='CUPS 2.2.9'
 PACKAGE_BUGREPORT='https://github.com/apple/cups/issues'
 PACKAGE_URL='https://www.cups.org/'
 
@@ -634,6 +634,7 @@ CUPS_FATAL_ERRORS
 CUPS_LOG_FILE_PERM
 CUPS_CUPSD_FILE_PERM
 CUPS_CONFIG_FILE_PERM
+CUPS_EXE_FILE_PERM
 CUPS_BUNDLEDIR
 LANGUAGES
 XINETD
@@ -662,7 +663,6 @@ SSLLIBS
 SSLFLAGS
 IPPALIASES
 CUPS_SERVERKEYCHAIN
-LIBGCRYPTCONFIG
 LIBGNUTLSCONFIG
 PTHREAD_FLAGS
 CUPS_DEFAULT_GSSSERVICENAME
@@ -678,7 +678,12 @@ ARCHFLAGS
 UNITTESTS
 OPTIM
 INSTALL_STRIP
+LIBTOOL_INSTALL
+LIBTOOL_CXX
+LIBTOOL_CC
 LIBTOOL
+LD_CXX
+LD_CC
 EXPORT_LDFLAGS
 IMGLIBS
 DSOLIBS
@@ -747,6 +752,7 @@ SED
 RMDIR
 RM
 MV
+MKDIR
 LN
 LD
 GZIP
@@ -768,6 +774,15 @@ AWK
 CUPS_BUILD
 CUPS_REVISION
 CUPS_VERSION
+LOCALTARGET
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
 target_alias
 host_alias
 build_alias
@@ -867,6 +882,7 @@ with_rcstop
 with_xinetd
 with_languages
 with_bundledir
+with_exe_file_perm
 with_config_file_perm
 with_cupsd_file_perm
 with_log_file_perm
@@ -1448,7 +1464,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 CUPS 2.2.1 to adapt to many kinds of systems.
+\`configure' configures CUPS 2.2.9 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1504,12 +1520,16 @@ Fine tuning of the installation directories:
 _ACEOF
 
   cat <<\_ACEOF
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
 _ACEOF
 fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of CUPS 2.2.1:";;
+     short | recursive ) echo "Configuration of CUPS 2.2.9:";;
    esac
   cat <<\_ACEOF
 
@@ -1523,9 +1543,9 @@ Optional Features:
   --enable-libusb         use libusb for USB printing
   --enable-tcp-wrappers   use libwrap for TCP wrappers support
   --enable-acl            build with POSIX ACL support
-  --disable-dbus           build without DBUS support
+  --disable-dbus          build without DBUS support
   --disable-shared        do not create shared libraries
-  --enable-libtool-unsupported
+  --enable-libtool-unsupported=/path/to/libtool
                           build with libtool (UNSUPPORTED!)
   --enable-debug          build with debugging symbols
   --enable-debug-guards   build with memory allocation guards
@@ -1543,7 +1563,7 @@ Optional Features:
   --disable-dnssd         disable DNS Service Discovery support using mDNSResponder
   --disable-launchd       disable launchd support
   --disable-systemd       disable systemd support
--enable-upstart         enable upstart support
 --enable-upstart        enable upstart support
   --enable-page-logging   enable page_log by default
   --disable-browsing      disable Browsing by default
   --disable-default-shared
@@ -1576,7 +1596,7 @@ Optional Packages:
   --with-ldarchflags      set program architecture flags
   --with-domainsocket     set unix domain socket name
   --with-gssservicename   set default gss service name
-  --with-pam-module       specify the PAM module to use
+  --with-pam-module       set the PAM module to use
   --with-dnssd-libs       set directory for DNS Service Discovery library
   --with-dnssd-includes   set directory for DNS Service Discovery includes
   --with-systemd          set directory for systemd service files
@@ -1588,6 +1608,7 @@ Optional Packages:
   --with-xinetd           set path for xinetd config files
   --with-languages        set installed languages, default=all
   --with-bundledir        set macOS localization bundle directory
+  --with-exe-file-perm    set default executable permissions value, default=0555
   --with-config-file-perm set default ConfigFilePerm value, default=0640
   --with-cupsd-file-perm  set default cupsd permissions, default=0500
   --with-log-file-perm    set default LogFilePerm value, default=0644
@@ -1689,7 +1710,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-CUPS configure 2.2.1
+CUPS configure 2.2.9
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2153,7 +2174,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 CUPS $as_me 2.2.1, which was
+It was created by CUPS $as_me 2.2.9, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2503,31 +2524,132 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-uname=`uname`
-uversion=`uname -r | sed -e '1,$s/^[^0-9]*\([0-9]*\)\.\([0-9]*\).*/\1\2/'`
-uarch=`uname -m`
+ac_aux_dir=
+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+fi
 
-case "$uname" in
-       Darwin*)
-               uname="Darwin"
-               if test $uversion -lt 120; then
-                       as_fn_error $? "Sorry, this version of CUPS requires macOS 10.8 or higher." "$LINENO" 5
-               fi
-               ;;
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
-       GNU* | GNU/*)
-               uname="GNU"
-               ;;
-       Linux*)
-               uname="Linux"
-               ;;
+
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if ${ac_cv_build+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
 esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if ${ac_cv_host+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+
+host_os_name=`echo $host_os | sed -e '1,$s/[0-9.]*$//g'`
+host_os_version=`echo $host_os | sed -e '1,$s/^[^0-9.]*//g' | awk -F. '{print $1 $2}'`
+# Linux often does not yield an OS version we can use...
+if test "x$host_os_version" = x; then
+        host_os_version="0"
+fi
+
+if test "$host_os_name" = darwin -a $host_os_version -lt 120; then
+        as_fn_error $? "Sorry, this version of CUPS requires macOS 10.8 or higher." "$LINENO" 5
+fi
+
+if test "$build" = "$host"; then
+        # No, build local targets
+       LOCALTARGET="local"
+else
+        # Yes, don't build local targets
+       LOCALTARGET=""
+fi
+
 
 
 ac_config_headers="$ac_config_headers config.h"
 
 
-CUPS_VERSION="2.2.1"
+CUPS_VERSION="2.2.9"
 CUPS_REVISION=""
 CUPS_BUILD="cups-$CUPS_VERSION"
 
@@ -3881,6 +4003,46 @@ $as_echo "no" >&6; }
 fi
 
 
+# Extract the first word of "mkdir", so it can be a program name with args.
+set dummy mkdir; 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_MKDIR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MKDIR in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_MKDIR="$MKDIR" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_MKDIR="$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
+MKDIR=$ac_cv_path_MKDIR
+if test -n "$MKDIR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR" >&5
+$as_echo "$MKDIR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
 # Extract the first word of "mv", so it can be a program name with args.
 set dummy mv; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -5162,7 +5324,7 @@ _ACEOF
 fi
 done
 
-if test "$uname" = "HP-UX" -a "$uversion" = "1020"; then
+if test "$host_os_name" = "hp-ux" -a "$host_os_version" = "1020"; then
        echo Forcing snprintf emulation for HP-UX.
 else
        for ac_func in snprintf vsnprintf
@@ -5228,8 +5390,8 @@ fi
 done
 
 
-case "$uname" in
-       Linux | GNU)
+case "$host_os_name" in
+       linux* | gnu*)
                # Do not use sigset on Linux or GNU HURD
                ;;
        *)
@@ -5371,7 +5533,7 @@ USBQUIRKS=""
 
 
 if test "x$PKGCONFIG" != x; then
-       if test x$enable_libusb != xno -a $uname != Darwin; then
+       if test x$enable_libusb != xno -a $host_os_name != darwin; then
                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb-1.0" >&5
 $as_echo_n "checking for libusb-1.0... " >&6; }
                if $PKGCONFIG --exists libusb-1.0; then
@@ -5551,8 +5713,8 @@ fi
 
 
 
-case $uname in
-        Darwin* | *BSD*)
+case $host_os_name in
+        darwin* | *bsd*)
                 ARFLAGS="-rcv"
                 ;;
         *)
@@ -5652,7 +5814,7 @@ DBUSDIR=""
 DBUS_NOTIFIER=""
 DBUS_NOTIFIERLIBS=""
 
-if test "x$enable_dbus" != xno -a "x$PKGCONFIG" != x -a "x$uname" != xDarwin; then
+if test "x$enable_dbus" != xno -a "x$PKGCONFIG" != x -a "x$host_os_name" != xdarwin; then
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
 $as_echo_n "checking for DBUS... " >&6; }
        if $PKGCONFIG --exists dbus-1; then
@@ -5697,8 +5859,8 @@ CUPS_DEFAULT_SYSTEM_AUTHKEY=""
 CUPS_SYSTEM_AUTHKEY=""
 INSTALLXPC=""
 
-case $uname in
-        Darwin*)
+case $host_os_name in
+        darwin*)
                 BACKLIBS="$BACKLIBS -framework IOKit"
                 SERVERLIBS="$SERVERLIBS -framework IOKit -weak_framework ApplicationServices"
                 LIBS="-framework SystemConfiguration -framework CoreFoundation -framework Security $LIBS"
@@ -5823,20 +5985,15 @@ if test "x$ac_cv_header_Security_Authorization_h" = xyes; then :
                        if test "x$default_adminkey" != xdefault; then
                                CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey $default_adminkey"
                                CUPS_DEFAULT_SYSTEM_AUTHKEY="$default_adminkey"
-                       elif grep -q system.print.operator /etc/authorization; then
+                       else
                                CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.print.admin"
                                CUPS_DEFAULT_SYSTEM_AUTHKEY="system.print.admin"
-                       else
-                               CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.preferences"
-                               CUPS_DEFAULT_SYSTEM_AUTHKEY="system.preferences"
                        fi
 
                        if test "x$default_operkey" != xdefault; then
                                CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY($default_operkey) @admin @lpadmin"
-                       elif grep -q system.print.operator /etc/authorization; then
-                               CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY(system.print.operator) @admin @lpadmin"
                        else
-                               CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY(system.print.admin) @admin @lpadmin"
+                               CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY(system.print.operator) @admin @lpadmin"
                        fi
 fi
 
@@ -5849,7 +6006,7 @@ fi
 
 
 
-                               if test $uversion -ge 100; then
+                               if test $host_os_version -ge 100; then
                        ac_fn_c_check_header_mongrel "$LINENO" "sandbox.h" "ac_cv_header_sandbox_h" "$ac_includes_default"
 if test "x$ac_cv_header_sandbox_h" = xyes; then :
   $as_echo "#define HAVE_SANDBOX_H 1" >>confdefs.h
@@ -5858,7 +6015,7 @@ fi
 
 
                fi
-               if test $uversion -ge 110 -a $uversion -lt 120; then
+               if test $host_os_version -ge 110 -a $host_os_version -lt 120; then
                        # Broken public headers in 10.7.x...
                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sandbox/private.h presence" >&5
 $as_echo_n "checking for sandbox/private.h presence... " >&6; }
@@ -5988,7 +6145,7 @@ fi
 
 if test "$localstatedir" = "\${prefix}/var"; then
        if test "$prefix" = "/"; then
-               if test "$uname" = Darwin; then
+               if test "$host_os_name" = darwin; then
                        localstatedir="/private/var"
                else
                        localstatedir="/var"
@@ -6000,7 +6157,7 @@ fi
 
 if test "$sysconfdir" = "\${prefix}/etc"; then
        if test "$prefix" = "/"; then
-               if test "$uname" = Darwin; then
+               if test "$host_os_name" = darwin; then
                        sysconfdir="/private/etc"
                else
                        sysconfdir="/etc"
@@ -6011,8 +6168,8 @@ if test "$sysconfdir" = "\${prefix}/etc"; then
 fi
 
 if test "$libdir" = "\${exec_prefix}/lib"; then
-       case "$uname" in
-               Linux*)
+       case "$host_os_name" in
+               linux*)
                        if test -d /usr/lib64 -a ! -d /usr/lib64/fakeroot; then
                                libdir="$exec_prefix/lib64"
                        fi
@@ -6111,7 +6268,7 @@ fi
 
 
 if test x$cachedir = x; then
-       if test "x$uname" = xDarwin; then
+       if test "x$host_os_name" = xdarwin; then
                CUPS_CACHEDIR="$localstatedir/spool/cups/cache"
        else
                CUPS_CACHEDIR="$localstatedir/cache/cups"
@@ -6216,8 +6373,8 @@ _ACEOF
 
 # Locale data
 if test "$localedir" = "\${datarootdir}/locale"; then
-       case "$uname" in
-               Linux | GNU | *BSD* | Darwin*)
+       case "$host_os_name" in
+               linux* | gnu* | *bsd* | darwin*)
                        CUPS_LOCALEDIR="$datarootdir/locale"
                        ;;
 
@@ -6270,8 +6427,8 @@ _ACEOF
 
 
 # Server executables...
-case "$uname" in
-       *BSD* | Darwin*)
+case "$host_os_name" in
+       *bsd* | darwin*)
                # *BSD and Darwin (macOS)
                INSTALL_SYSV=""
                CUPS_SERVERBIN="$exec_prefix/libexec/cups"
@@ -6305,8 +6462,8 @@ if test "${with_rundir+set}" = set; then :
   withval=$with_rundir; CUPS_STATEDIR="$withval"
 else
 
-       case "$uname" in
-               Darwin*)
+       case "$host_os_name" in
+               darwin*)
                        # Darwin (macOS)
                        CUPS_STATEDIR="$CUPS_SERVERROOT"
                        ;;
@@ -6331,8 +6488,8 @@ if test "$mandir" = "\${datarootdir}/man" -a "$prefix" = "/"; then
 fi
 
 if test "$mandir" = "\${prefix}/man" -a "$prefix" = "/"; then
-       case "$uname" in
-               Darwin* | Linux | GNU | *BSD*)
+       case "$host_os_name" in
+               darwin* | linux* | gnu* | *bsd*)
                        # Darwin, macOS, Linux, GNU HURD, and *BSD
                        mandir="/usr/share/man"
                        AMANDIR="/usr/share/man"
@@ -6353,8 +6510,8 @@ fi
 
 
 
-case "$uname" in
-       SunOS*)
+case "$host_os_name" in
+       sunos*)
                # Solaris
                MAN1EXT=1
                MAN5EXT=5
@@ -6362,7 +6519,7 @@ case "$uname" in
                MAN8EXT=1m
                MAN8DIR=1m
                ;;
-       Linux* | GNU* | Darwin*)
+       linux* | gnu* | darwin*)
                # Linux, GNU Hurd, and macOS
                MAN1EXT=1.gz
                MAN5EXT=5.gz
@@ -6402,8 +6559,8 @@ LIBCUPSBASE="lib$cupsbase"
 LIBCUPSSTATIC="lib$cupsbase.a"
 
 if test x$enable_shared != xno; then
-       case "$uname" in
-               SunOS*)
+       case "$host_os_name" in
+               sunos*)
                        LIBCUPS="lib$cupsbase.so.2"
                        LIBCUPSCGI="libcupscgi.so.1"
                        LIBCUPSIMAGE="libcupsimage.so.2"
@@ -6413,7 +6570,7 @@ if test x$enable_shared != xno; then
                        DSOXX="\$(CXX)"
                        DSOFLAGS="$DSOFLAGS -Wl,-h\`basename \$@\` -G \$(OPTIM)"
                        ;;
-               Linux | GNU | *BSD*)
+               linux* | gnu* | *bsd*)
                        LIBCUPS="lib$cupsbase.so.2"
                        LIBCUPSCGI="libcupscgi.so.1"
                        LIBCUPSIMAGE="libcupsimage.so.2"
@@ -6423,7 +6580,7 @@ if test x$enable_shared != xno; then
                        DSOXX="\$(CXX)"
                        DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` -shared \$(OPTIM)"
                        ;;
-               Darwin*)
+               darwin*)
                        LIBCUPS="lib$cupsbase.2.dylib"
                        LIBCUPSCGI="libcupscgi.1.dylib"
                        LIBCUPSIMAGE="libcupsimage.2.dylib"
@@ -6500,8 +6657,8 @@ if test "$DSO" != ":"; then
        # Tell the run-time linkers where to find a DSO.  Some platforms
        # need this option, even when the library is installed in a
        # standard location...
-       case $uname in
-                SunOS*)
+       case $host_os_name in
+                sunos*)
                        # Solaris...
                        if test $exec_prefix != /usr; then
                                DSOFLAGS="-R$libdir $DSOFLAGS"
@@ -6509,7 +6666,7 @@ if test "$DSO" != ":"; then
                                EXPORT_LDFLAGS="-R$libdir"
                        fi
                        ;;
-                *BSD*)
+                *bsd*)
                         # *BSD...
                        if test $exec_prefix != /usr; then
                                DSOFLAGS="-Wl,-R$libdir $DSOFLAGS"
@@ -6517,7 +6674,7 @@ if test "$DSO" != ":"; then
                                EXPORT_LDFLAGS="-Wl,-R$libdir"
                        fi
                        ;;
-                Linux | GNU)
+                linux* | gnu*)
                         # Linux, and HURD...
                        if test $exec_prefix != /usr; then
                                DSOFLAGS="-Wl,-rpath,$libdir $DSOFLAGS"
@@ -6539,6 +6696,9 @@ fi
 # Check whether --enable-libtool_unsupported was given.
 if test "${enable_libtool_unsupported+set}" = set; then :
   enableval=$enable_libtool_unsupported; if test x$enable_libtool_unsupported != xno; then
+               if test x$enable_libtool_unsupported == xyes; then
+                       as_fn_error $? "Use --enable-libtool-unsupported=/path/to/libtool." "$LINENO" 5
+               fi
                LIBTOOL="$enable_libtool_unsupported"
                enable_shared=no
                echo "WARNING: libtool is not supported or endorsed by Apple Inc."
@@ -6549,17 +6709,45 @@ if test "${enable_libtool_unsupported+set}" = set; then :
 fi
 
 
+if test x$LIBTOOL != x; then
+       DSO="\$(LIBTOOL) --mode=link --tag=CC ${CC}"
+       DSOXX="\$(LIBTOOL) --mode=link --tag=CXX ${CXX}"
 
+       LD_CC="\$(LIBTOOL) --mode=link --tag=CC ${CC}"
+       LD_CXX="\$(LIBTOOL) --mode=link --tag=CXX ${CXX}"
 
-if test x$LIBTOOL != x; then
        LIBCUPS="libcups.la"
+       LIBCUPSSTATIC="libcups.la"
+       LIBCUPSCGI="libcupscgi.la"
        LIBCUPSIMAGE="libcupsimage.la"
+       LIBCUPSMIME="libcupsmime.la"
+       LIBCUPSPPDC="libcupsppdc.la"
+
+       LIBTOOL_CC="\$(LIBTOOL) --mode=compile --tag=CC"
+       LIBTOOL_CXX="\$(LIBTOOL) --mode=compile --tag=CXX"
+       LIBTOOL_INSTALL="\$(LIBTOOL) --mode=install"
+
        LINKCUPS="../cups/\$(LIBCUPS)"
        LINKCUPSIMAGE="../filter/\$(LIBCUPSIMAGE)"
-       DSO="\$(CC)"
+
+else
+       LD_CC="\$(CC)"
+       LD_CXX="\$(CXX)"
+
+       LIBTOOL_CC=""
+       LIBTOOL_CXX=""
+       LIBTOOL_INSTALL=""
 fi
 
 
+
+
+
+
+
+
+
+
 INSTALL_STRIP=""
 OPTIM=""
 
@@ -6609,6 +6797,10 @@ if test x$enable_debug_guards = xyes; then
 fi
 
 if test x$enable_unit_tests = xyes; then
+        if test "$build" != "$host"; then
+                as_fn_error $? "Sorry, cannot build unit tests when cross-compiling." "$LINENO" 5
+        fi
+
        UNITTESTS="unittests"
 else
        UNITTESTS=""
@@ -6635,7 +6827,7 @@ else
 fi
 
 if test -z "$with_ldarchflags"; then
-       if test "$uname" = Darwin; then
+       if test "$host_os_name" = darwin; then
                # Only create Intel programs by default
                LDARCHFLAGS="`echo $ARCHFLAGS | sed -e '1,$s/-arch ppc64//'`"
        else
@@ -6723,8 +6915,8 @@ rm -f core conftest.err conftest.$ac_objext \
                { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler supports -fPIE" >&5
 $as_echo_n "checking whether compiler supports -fPIE... " >&6; }
                OLDCFLAGS="$CFLAGS"
-               case "$uname" in
-                       Darwin*)
+               case "$host_os_name" in
+                       darwin*)
                                CFLAGS="$CFLAGS -fPIE -Wl,-pie"
                                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -6859,14 +7051,40 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
                CFLAGS="$OLDCFLAGS"
 
+               { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler supports -Wno-format-truncation" >&5
+$as_echo_n "checking whether compiler supports -Wno-format-truncation... " >&6; }
+               OLDCFLAGS="$CFLAGS"
+               CFLAGS="$CFLAGS -Werror -Wno-format-truncation"
+               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  OPTIM="$OPTIM -Wno-format-truncation"
+                       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+               CFLAGS="$OLDCFLAGS"
+
                # Additional warning options for development testing...
                if test -d .svn; then
                        OPTIM="-Werror $OPTIM"
                fi
        fi
 
-       case "$uname" in
-               Darwin*)
+       case "$host_os_name" in
+               darwin*)
                        # -D_FORTIFY_SOURCE=2 adds additional object size
                        # checking, basically wrapping all string functions
                        # with buffer-limited ones.  Not strictly needed for
@@ -6875,7 +7093,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
                        CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
                        ;;
 
-               Linux*)
+               linux*)
                        # The -z relro option is provided by the Linux linker command to
                        # make relocatable data read-only.
                        if test x$enable_relro = xyes; then
@@ -6885,8 +7103,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
        esac
 else
        # Add vendor-specific compiler options...
-       case $uname in
-               SunOS*)
+       case $host_os_name in
+               sunos*)
                        # Solaris
                        if test -z "$OPTIM"; then
                                if test "x$with_optim" = x; then
@@ -6913,8 +7131,8 @@ else
 fi
 
 # Add general compiler options per platform...
-case $uname in
-       Linux*)
+case $host_os_name in
+       linux*)
                # glibc 2.8 and higher breaks peer credentials unless you
                # define _GNU_SOURCE...
                OPTIM="$OPTIM -D_GNU_SOURCE"
@@ -7395,7 +7613,7 @@ fi
 
 # Tru64 5.1b leaks file descriptors with these functions; disable until
 # we can come up with a test for this...
-if test "$uname" != "OSF1"; then
+if test "$host_os_name" != "osf1"; then
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getaddrinfo" >&5
 $as_echo_n "checking for library containing getaddrinfo... " >&6; }
 if ${ac_cv_search_getaddrinfo+:} false; then :
@@ -7539,8 +7757,8 @@ fi
 
 if test x$enable_domainsocket != xno -a x$default_domainsocket != xno; then
        if test "x$default_domainsocket" = x; then
-               case "$uname" in
-                       Darwin*)
+               case "$host_os_name" in
+                       darwin*)
                                # Darwin and macOS do their own thing...
                                CUPS_DEFAULT_DOMAINSOCKET="$localstatedir/run/cupsd"
                                ;;
@@ -7696,8 +7914,8 @@ else
 fi
 
        if test "x$KRB5CONFIG" != x; then
-               case "$uname" in
-                       Darwin)
+               case "$host_os_name" in
+                       darwin)
                                # macOS weak-links to the Kerberos framework...
                                LIBGSSAPI="-weak_framework Kerberos"
                                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSS framework" >&5
@@ -7711,7 +7929,7 @@ $as_echo "yes" >&6; }
 $as_echo "no" >&6; }
                                fi
                                ;;
-                       SunOS*)
+                       sunos*)
                                # Solaris has a non-standard krb5-config, don't use it!
                                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gss_display_status in -lgss" >&5
 $as_echo_n "checking for gss_display_status in -lgss... " >&6; }
@@ -7771,8 +7989,8 @@ $as_echo "#define HAVE_GSSAPI 1" >>confdefs.h
 
        else
                # Check for vendor-specific implementations...
-               case "$uname" in
-                       HP-UX*)
+               case "$host_os_name" in
+                       hp-ux*)
                                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gss_display_status in -lgss" >&5
 $as_echo_n "checking for gss_display_status in -lgss... " >&6; }
 if ${ac_cv_lib_gss_gss_display_status+:} false; then :
@@ -7817,7 +8035,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confdefs.h
 fi
 
                                ;;
-                       SunOS*)
+                       sunos*)
                                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gss_display_status in -lgss" >&5
 $as_echo_n "checking for gss_display_status in -lgss... " >&6; }
 if ${ac_cv_lib_gss_gss_display_status+:} false; then :
@@ -8072,7 +8290,7 @@ $as_echo "$have_pthread" >&6; }
 
                                # Solaris requires -D_POSIX_PTHREAD_SEMANTICS to
                                # be POSIX-compliant... :(
-                               if test $uname = SunOS; then
+                               if test $host_os_name = sunos; then
                                        PTHREAD_FLAGS="$PTHREAD_FLAGS -D_POSIX_PTHREAD_SEMANTICS"
                                fi
                                break
@@ -8107,7 +8325,7 @@ CUPS_SERVERKEYCHAIN=""
 
 if test x$enable_ssl != xno; then
         if test $have_ssl = 0 -a "x$enable_cdsassl" != "xno"; then
-       if test $uname = Darwin; then
+       if test $host_os_name = darwin; then
            ac_fn_c_check_header_mongrel "$LINENO" "Security/SecureTransport.h" "ac_cv_header_Security_SecureTransport_h" "$ac_includes_default"
 if test "x$ac_cv_header_Security_SecureTransport_h" = xyes; then :
 
@@ -8184,7 +8402,7 @@ fi
 
 
 
-               if test $uversion -ge 150; then
+               if test $host_os_version -ge 150; then
                        $as_echo "#define HAVE_SSLSETENABLEDCIPHERS 1" >>confdefs.h
 
                fi
@@ -8290,104 +8508,6 @@ else
   LIBGNUTLSCONFIG="$ac_cv_path_LIBGNUTLSCONFIG"
 fi
 
-       if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}libgcrypt-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}libgcrypt-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_LIBGCRYPTCONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $LIBGCRYPTCONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_LIBGCRYPTCONFIG="$LIBGCRYPTCONFIG" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_LIBGCRYPTCONFIG="$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
-LIBGCRYPTCONFIG=$ac_cv_path_LIBGCRYPTCONFIG
-if test -n "$LIBGCRYPTCONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBGCRYPTCONFIG" >&5
-$as_echo "$LIBGCRYPTCONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_LIBGCRYPTCONFIG"; then
-  ac_pt_LIBGCRYPTCONFIG=$LIBGCRYPTCONFIG
-  # Extract the first word of "libgcrypt-config", so it can be a program name with args.
-set dummy libgcrypt-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_LIBGCRYPTCONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_pt_LIBGCRYPTCONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_pt_LIBGCRYPTCONFIG="$ac_pt_LIBGCRYPTCONFIG" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_ac_pt_LIBGCRYPTCONFIG="$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_LIBGCRYPTCONFIG=$ac_cv_path_ac_pt_LIBGCRYPTCONFIG
-if test -n "$ac_pt_LIBGCRYPTCONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_LIBGCRYPTCONFIG" >&5
-$as_echo "$ac_pt_LIBGCRYPTCONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_pt_LIBGCRYPTCONFIG" = x; then
-    LIBGCRYPTCONFIG=""
-  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
-    LIBGCRYPTCONFIG=$ac_pt_LIBGCRYPTCONFIG
-  fi
-else
-  LIBGCRYPTCONFIG="$ac_cv_path_LIBGCRYPTCONFIG"
-fi
-
        if $PKGCONFIG --exists gnutls; then
            have_ssl=1
            SSLLIBS=`$PKGCONFIG --libs gnutls`
@@ -8676,8 +8796,8 @@ fi
 
        LIBS="$SAVELIBS"
 
-       case "$uname" in
-               Darwin*)
+       case "$host_os_name" in
+               darwin*)
                        # Darwin/macOS
                        if test "x$with_pam_module" != x; then
                                PAMFILE="pam.$with_pam_module"
@@ -9001,7 +9121,7 @@ DNSSD_BACKEND=""
 IPPFIND_BIN=""
 IPPFIND_MAN=""
 
-if test "x$PKGCONFIG" != x -a x$enable_avahi != xno -a x$uname != xDarwin; then
+if test "x$PKGCONFIG" != x -a x$enable_avahi != xno -a x$host_os_name != xdarwin; then
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Avahi" >&5
 $as_echo_n "checking for Avahi... " >&6; }
        if $PKGCONFIG --exists avahi-client; then
@@ -9024,8 +9144,8 @@ if test "x$DNSSD_BACKEND" = x -a x$enable_dnssd != xno; then
        ac_fn_c_check_header_mongrel "$LINENO" "dns_sd.h" "ac_cv_header_dns_sd_h" "$ac_includes_default"
 if test "x$ac_cv_header_dns_sd_h" = xyes; then :
 
-               case "$uname" in
-                       Darwin*)
+               case "$host_os_name" in
+                       darwin*)
                                # Darwin and macOS...
                                $as_echo "#define HAVE_DNSSD 1" >>confdefs.h
 
@@ -9115,16 +9235,10 @@ fi
 
 
 
-       case "$uname" in
-               Darwin*)
-                       # Darwin, macOS
-                       LAUNCHD_DIR="/System/Library/LaunchDaemons"
-                       # liblaunch is already part of libSystem
-                       ;;
-               *)
-                       # All others; this test will need to be updated
-                       ;;
-       esac
+       if test "$host_os_name" = darwin; then
+               LAUNCHD_DIR="/System/Library/LaunchDaemons"
+               # liblaunch is already part of libSystem
+       fi
 fi
 
 # Check whether --enable-systemd was given.
@@ -9268,13 +9382,13 @@ if test x$rcdir = x; then
 fi
 
 if test "x$rcstart" = x; then
-       case "$uname" in
-               Linux | GNU | GNU/k*BSD*)
+       case "$host_os_name" in
+               linux* | gnu*)
                        # Linux
                         rcstart="81"
                        ;;
 
-               SunOS*)
+               sunos*)
                        # Solaris
                         rcstart="81"
                        ;;
@@ -9287,8 +9401,8 @@ if test "x$rcstart" = x; then
 fi
 
 if test "x$rcstop" = x; then
-       case "$uname" in
-               Linux | GNU | GNU/k*BSD*)
+       case "$host_os_name" in
+               linux* | gnu*)
                        # Linux
                         rcstop="36"
                        ;;
@@ -9364,7 +9478,7 @@ fi
 if test "${with_bundledir+set}" = set; then :
   withval=$with_bundledir; CUPS_BUNDLEDIR="$withval"
 else
-  if test "x$uname" = xDarwin -a $uversion -ge 100; then
+  if test "x$host_os_name" = xdarwin -a $host_os_version -ge 100; then
                CUPS_BUNDLEDIR="/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/PrintCore.framework/Versions/A"
                LANGUAGES=""
        else
@@ -9382,11 +9496,28 @@ _ACEOF
 fi
 
 
+# Check whether --with-exe_file_perm was given.
+if test "${with_exe_file_perm+set}" = set; then :
+  withval=$with_exe_file_perm; CUPS_EXE_FILE_PERM="$withval"
+else
+  case "$host_os_name" in
+               linux* | gnu*)
+                       CUPS_EXE_FILE_PERM="755"
+                       ;;
+               *)
+                       CUPS_EXE_FILE_PERM="555"
+                       ;;
+       esac
+fi
+
+
+
+
 # Check whether --with-config_file_perm was given.
 if test "${with_config_file_perm+set}" = set; then :
   withval=$with_config_file_perm; CUPS_CONFIG_FILE_PERM="$withval"
 else
-  if test "x$uname" = xDarwin; then
+  if test "x$host_os_name" = xdarwin; then
                CUPS_CONFIG_FILE_PERM="644"
        else
                CUPS_CONFIG_FILE_PERM="640"
@@ -9404,7 +9535,14 @@ _ACEOF
 if test "${with_cupsd_file_perm+set}" = set; then :
   withval=$with_cupsd_file_perm; CUPS_CUPSD_FILE_PERM="$withval"
 else
-  CUPS_CUPSD_FILE_PERM="500"
+  case "$host_os_name" in
+               linux* | gnu*)
+                       CUPS_CUPSD_FILE_PERM="700"
+                       ;;
+               *)
+                       CUPS_CUPSD_FILE_PERM="500"
+                       ;;
+       esac
 fi
 
 
@@ -9553,7 +9691,7 @@ if test "${with_cups_user+set}" = set; then :
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for default print user" >&5
 $as_echo_n "checking for default print user... " >&6; }
-       if test x$uname = xDarwin; then
+       if test x$host_os_name = xdarwin; then
                if test x`id -u _lp 2>/dev/null` = x; then
                        CUPS_USER="lp";
                else
@@ -9596,7 +9734,7 @@ if test "${with_cups_group+set}" = set; then :
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for default print group" >&5
 $as_echo_n "checking for default print group... " >&6; }
-       if test x$uname = xDarwin; then
+       if test x$host_os_name = xdarwin; then
                if test x`id -g _lp 2>/dev/null` = x; then
                        CUPS_GROUP="lp";
                else
@@ -9638,7 +9776,7 @@ fi
 if test "${with_system_groups+set}" = set; then :
   withval=$with_system_groups; CUPS_SYSTEM_GROUPS="$withval"
 else
-  if test x$uname = xDarwin; then
+  if test x$host_os_name = xdarwin; then
                CUPS_SYSTEM_GROUPS="admin"
        else
                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for default system groups" >&5
@@ -9710,15 +9848,15 @@ fi
 
 if test x$default_printcap != xno; then
        if test "x$default_printcap" = "xdefault"; then
-               case $uname in
-                       Darwin*)
-                               if test $uversion -ge 90; then
+               case $host_os_name in
+                       darwin*)
+                               if test $host_os_version -ge 90; then
                                        CUPS_DEFAULT_PRINTCAP="/Library/Preferences/org.cups.printers.plist"
                                else
                                        CUPS_DEFAULT_PRINTCAP="/etc/printcap"
                                fi
                                ;;
-                       SunOS*)
+                       sunos*)
                                CUPS_DEFAULT_PRINTCAP="/etc/printers.conf"
                                ;;
                        *)
@@ -9749,8 +9887,8 @@ fi
 
 if test x$default_lpdconfigfile != xno; then
        if test "x$default_lpdconfigfile" = "xdefault"; then
-               case $uname in
-                       Darwin*)
+               case $host_os_name in
+                       darwin*)
                                CUPS_DEFAULT_LPD_CONFIG_FILE="launchd:///System/Library/LaunchDaemons/org.cups.cups-lpd.plist"
                                ;;
                        *)
@@ -9839,7 +9977,7 @@ if test "${with_snmp_address+set}" = set; then :
                CUPS_SNMP_ADDRESS="Address $withval"
        fi
 else
-  if test "x$uname" = xDarwin; then
+  if test "x$host_os_name" = xdarwin; then
                CUPS_SNMP_ADDRESS=""
        else
                CUPS_SNMP_ADDRESS="Address @LOCAL"
@@ -9889,7 +10027,7 @@ case "x$enable_webif" in
                CUPS_DEFAULT_WEBIF=1
                ;;
        *)
-               if test $uname = Darwin; then
+               if test $host_os_name = darwin; then
                        CUPS_WEBIF=No
                        CUPS_DEFAULT_WEBIF=0
                else
@@ -9911,11 +10049,11 @@ _ACEOF
 if test "${with_java+set}" = set; then :
   withval=$with_java; CUPS_JAVA="$withval"
 else
-  CUPS_JAVA=""
+  CUPS_JAVA="auto"
 fi
 
 
-if test "x$CUPS_JAVA" = x; then
+if test "x$CUPS_JAVA" = xauto; then
        # Extract the first word of "java", so it can be a program name with args.
 set dummy java; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -9957,6 +10095,8 @@ fi
 
 
        CUPS_JAVA="$JAVA"
+elif test "x$CUPS_JAVA" = xno; then
+        CUPS_JAVA=""
 fi
 
 cat >>confdefs.h <<_ACEOF
 if test "${with_perl+set}" = set; then :
   withval=$with_perl; CUPS_PERL="$withval"
 else
-  CUPS_PERL=""
+  CUPS_PERL="auto"
 fi
 
 
-if test "x$CUPS_PERL" = x; then
+if test "x$CUPS_PERL" = xauto; then
        # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -10020,6 +10160,8 @@ fi
 
 
        CUPS_PERL="$PERL"
+elif test "x$CUPS_PERL" = xno; then
+        CUPS_PERL=""
 fi
 
 cat >>confdefs.h <<_ACEOF
 if test "${with_php+set}" = set; then :
   withval=$with_php; CUPS_PHP="$withval"
 else
-  CUPS_PHP=""
+  CUPS_PHP="auto"
 fi
 
 
-if test "x$CUPS_PHP" = x; then
+if test "x$CUPS_PHP" = xauto; then
        # Extract the first word of "php-cgi", so it can be a program name with args.
 set dummy php-cgi; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -10127,6 +10269,8 @@ fi
        else
                CUPS_PHP="$PHPCGI"
        fi
+elif test "x$CUPS_PHP" = xno; then
+        CUPS_PHP=""
 fi
 
 cat >>confdefs.h <<_ACEOF
 if test "${with_python+set}" = set; then :
   withval=$with_python; CUPS_PYTHON="$withval"
 else
-  CUPS_PYTHON=""
+  CUPS_PYTHON="auto"
 fi
 
 
-if test "x$CUPS_PYTHON" = x; then
+if test "x$CUPS_PYTHON" = xauto; then
        # Extract the first word of "python", so it can be a program name with args.
 set dummy python; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -10192,6 +10336,8 @@ fi
 
 
        CUPS_PYTHON="$PYTHON"
+elif test "x$CUPS_PYTHON" = xno; then
+        CUPS_PYTHON=""
 fi
 
 cat >>confdefs.h <<_ACEOF
@@ -10748,7 +10894,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 CUPS $as_me 2.2.1, which was
+This file was extended by CUPS $as_me 2.2.9, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -10811,7 +10957,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="\\
-CUPS config.status 2.2.1
+CUPS config.status 2.2.9
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"