]> git.ipfire.org Git - thirdparty/cups.git/blobdiff - configure
Clean up some build issues on certain platforms.
[thirdparty/cups.git] / configure
index c8b573f2eed5ab9f194608cc7eb2be72269e53e1..e5e5a882d65457bfbcfe9ce195861331d9f59ed5 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.69 for CUPS 2.2.6.
+# Generated by GNU Autoconf 2.69 for CUPS 2.3b7.
 #
 # Report bugs to <https://github.com/apple/cups/issues>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='CUPS'
 PACKAGE_TARNAME='cups'
-PACKAGE_VERSION='2.2.6'
-PACKAGE_STRING='CUPS 2.2.6'
+PACKAGE_VERSION='2.3b7'
+PACKAGE_STRING='CUPS 2.3b7'
 PACKAGE_BUGREPORT='https://github.com/apple/cups/issues'
 PACKAGE_URL='https://www.cups.org/'
 
@@ -626,11 +626,6 @@ ac_subst_vars='LTLIBOBJS
 LIBOBJS
 UNINSTALL_LANGUAGES
 INSTALL_LANGUAGES
-PYTHON
-PHP
-PHPCGI
-PERL
-JAVA
 CUPS_WEBIF
 DEFAULT_IPP_PORT
 CUPS_SNMP_COMMUNITY
@@ -655,6 +650,7 @@ CUPS_LOG_FILE_PERM
 CUPS_CUPSD_FILE_PERM
 CUPS_CONFIG_FILE_PERM
 CUPS_EXE_FILE_PERM
+CUPS_RESOURCEDIR
 CUPS_BUNDLEDIR
 LANGUAGES
 XINETD
@@ -690,6 +686,7 @@ KRB5CONFIG
 LIBGSSAPI
 CUPS_LISTEN_DOMAINSOCKET
 CUPS_DEFAULT_DOMAINSOCKET
+WARNING_OPTIONS
 RELROFLAGS
 PIEFLAGS
 CXXLIBS
@@ -712,10 +709,7 @@ LINKCUPS
 EXTLINKCUPSIMAGE
 EXTLINKCUPS
 LIBCUPSSTATIC
-LIBCUPSPPDC
-LIBCUPSMIME
 LIBCUPSIMAGE
-LIBCUPSCGI
 LIBCUPSBASE
 LIBCUPS
 DSOFLAGS
@@ -743,6 +737,9 @@ CUPS_DATADIR
 CUPS_CACHEDIR
 PRIVATEINCLUDE
 privateinclude
+LIBHEADERSPRIV
+LIBHEADERS
+LIBCUPSOBJS
 BUILDDIRS
 INSTALLXPC
 CUPS_SYSTEM_AUTHKEY
@@ -758,7 +755,6 @@ INSTALL_GZIP
 LIBWRAP
 USBQUIRKS
 LIBUSB
-LIBMXML
 EGREP
 GREP
 LIBPAPER
@@ -794,6 +790,7 @@ AWK
 CUPS_BUILD
 CUPS_REVISION
 CUPS_VERSION
+CODE_SIGN
 LOCALTARGET
 host_os
 host_vendor
@@ -876,6 +873,7 @@ enable_unit_tests
 with_archflags
 with_ldarchflags
 enable_relro
+enable_sanitizer
 with_domainsocket
 enable_gssapi
 with_gssservicename
@@ -902,6 +900,7 @@ with_rcstop
 with_xinetd
 with_languages
 with_bundledir
+with_bundlelang
 with_exe_file_perm
 with_config_file_perm
 with_cupsd_file_perm
@@ -925,10 +924,6 @@ with_snmp_address
 with_snmp_community
 with_ipp_port
 enable_webif
-with_java
-with_perl
-with_php
-with_python
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1482,7 +1477,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.6 to adapt to many kinds of systems.
+\`configure' configures CUPS 2.3b7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1547,7 +1542,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of CUPS 2.2.6:";;
+     short | recursive ) echo "Configuration of CUPS 2.3b7:";;
    esac
   cat <<\_ACEOF
 
@@ -1570,6 +1565,7 @@ Optional Features:
   --enable-debug-printfs  build with CUPS_DEBUG_LOG support
   --enable-unit-tests     build and run unit tests
   --enable-relro          build with the GCC relro option
+  --enable-sanitizer      build with AddressSanitizer
   --disable-gssapi        disable GSSAPI support
   --disable-threads       disable multi-threading support
   --disable-ssl           disable SSL/TLS support
@@ -1599,6 +1595,8 @@ Optional Packages:
   --with-components       set components to build:
                            - "all" (default) builds everything
                            - "core" builds libcups and ipptool
+                           - "libcups" builds just libcups
+                           - "libcupslite" builds just libcups without driver support
   --with-privateinclude   set path for private include files, default=none
   --with-lpdconfig        set URI for LPD config file
   --with-smbconfig        set URI for Samba config file
@@ -1625,7 +1623,8 @@ Optional Packages:
   --with-rcstop           set stop number for rc scripts
   --with-xinetd           set path for xinetd config files
   --with-languages        set installed languages, default=all
-  --with-bundledir        set macOS localization bundle directory
+  --with-bundledir        set localization bundle directory
+  --with-bundlelang       set localization bundle base language (English or en)
   --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
@@ -1644,10 +1643,6 @@ Optional Packages:
   --with-snmp-address     set SNMP query address, default=auto
   --with-snmp-community   set SNMP community, default=public
   --with-ipp-port         set port number for IPP, default=631
-  --with-java             set Java interpreter for web interfaces
-  --with-perl             set Perl interpreter for web interfaces
-  --with-php              set PHP interpreter for web interfaces
-  --with-python           set Python interpreter for web interfaces
 
 Some influential environment variables:
   CC          C compiler command
@@ -1728,7 +1723,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-CUPS configure 2.2.6
+CUPS configure 2.3b7
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2192,7 +2187,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.6, which was
+It was created by CUPS $as_me 2.3b7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2650,10 +2645,6 @@ 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"
@@ -2663,11 +2654,57 @@ else
 fi
 
 
+for ac_prog in codesign true
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; 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_CODE_SIGN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $CODE_SIGN in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_CODE_SIGN="$CODE_SIGN" # 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_CODE_SIGN="$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
+CODE_SIGN=$ac_cv_path_CODE_SIGN
+if test -n "$CODE_SIGN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CODE_SIGN" >&5
+$as_echo "$CODE_SIGN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$CODE_SIGN" && break
+done
+
+
 
 ac_config_headers="$ac_config_headers config.h"
 
 
-CUPS_VERSION="2.2.6"
+CUPS_VERSION="2.3b7"
 CUPS_REVISION=""
 CUPS_BUILD="cups-$CUPS_VERSION"
 
@@ -5220,74 +5257,6 @@ fi
 
 
 
-LIBMXML=""
-ac_fn_c_check_header_mongrel "$LINENO" "mxml.h" "ac_cv_header_mxml_h" "$ac_includes_default"
-if test "x$ac_cv_header_mxml_h" = xyes; then :
-  SAVELIBS="$LIBS"
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing mmxlNewElement" >&5
-$as_echo_n "checking for library containing mmxlNewElement... " >&6; }
-if ${ac_cv_search_mmxlNewElement+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char mmxlNewElement ();
-int
-main ()
-{
-return mmxlNewElement ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' mxml; 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_mmxlNewElement=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_mmxlNewElement+:} false; then :
-  break
-fi
-done
-if ${ac_cv_search_mmxlNewElement+:} false; then :
-
-else
-  ac_cv_search_mmxlNewElement=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_mmxlNewElement" >&5
-$as_echo "$ac_cv_search_mmxlNewElement" >&6; }
-ac_res=$ac_cv_search_mmxlNewElement
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-  $as_echo "#define HAVE_MXML_H 1" >>confdefs.h
-
-               LIBMXML="-lmxml"
-fi
-
-       LIBS="$SAVELIBS"
-fi
-
-
-
-
 ac_fn_c_check_header_mongrel "$LINENO" "sys/mount.h" "ac_cv_header_sys_mount_h" "$ac_includes_default"
 if test "x$ac_cv_header_sys_mount_h" = xyes; then :
   $as_echo "#define HAVE_SYS_MOUNT_H 1" >>confdefs.h
@@ -5880,7 +5849,7 @@ 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"
+                LIBS="-framework CoreFoundation -framework Security $LIBS"
 
                                ac_fn_c_check_header_mongrel "$LINENO" "ApplicationServices/ApplicationServices.h" "ac_cv_header_ApplicationServices_ApplicationServices_h" "$ac_includes_default"
 if test "x$ac_cv_header_ApplicationServices_ApplicationServices_h" = xyes; then :
@@ -5896,22 +5865,10 @@ if test "x$ac_cv_header_CoreFoundation_CoreFoundation_h" = xyes; then :
 fi
 
 
-               ac_fn_c_check_header_mongrel "$LINENO" "CoreFoundation/CFPriv.h" "ac_cv_header_CoreFoundation_CFPriv_h" "$ac_includes_default"
-if test "x$ac_cv_header_CoreFoundation_CFPriv_h" = xyes; then :
-  $as_echo "#define HAVE_CFPRIV_H 1" >>confdefs.h
-
-fi
-
-
-               ac_fn_c_check_header_mongrel "$LINENO" "CoreFoundation/CFBundlePriv.h" "ac_cv_header_CoreFoundation_CFBundlePriv_h" "$ac_includes_default"
-if test "x$ac_cv_header_CoreFoundation_CFBundlePriv_h" = xyes; then :
-  $as_echo "#define HAVE_CFBUNDLEPRIV_H 1" >>confdefs.h
-
-fi
-
-
 
-                               for ac_func in SCDynamicStoreCopyComputerName
+                               SAVELIBS="$LIBS"
+               LIBS="-framework SystemConfiguration $LIBS"
+               for ac_func in SCDynamicStoreCopyComputerName
 do :
   ac_fn_c_check_func "$LINENO" "SCDynamicStoreCopyComputerName" "ac_cv_func_SCDynamicStoreCopyComputerName"
 if test "x$ac_cv_func_SCDynamicStoreCopyComputerName" = xyes; then :
@@ -5919,6 +5876,11 @@ if test "x$ac_cv_func_SCDynamicStoreCopyComputerName" = xyes; then :
 #define HAVE_SCDYNAMICSTORECOPYCOMPUTERNAME 1
 _ACEOF
 
+                   $as_echo "#define HAVE_SCDYNAMICSTORECOPYCOMPUTERNAME 1" >>confdefs.h
+
+else
+
+                   LIBS="$SAVELIBS"
 fi
 done
 
@@ -5930,13 +5892,6 @@ if test "x$ac_cv_header_membership_h" = xyes; then :
 fi
 
 
-               ac_fn_c_check_header_mongrel "$LINENO" "membershipPriv.h" "ac_cv_header_membershipPriv_h" "$ac_includes_default"
-if test "x$ac_cv_header_membershipPriv_h" = xyes; then :
-  $as_echo "#define HAVE_MEMBERSHIPPRIV_H 1" >>confdefs.h
-
-fi
-
-
                for ac_func in mbr_uid_to_uuid
 do :
   ac_fn_c_check_func "$LINENO" "mbr_uid_to_uuid" "ac_cv_func_mbr_uid_to_uuid"
@@ -6015,13 +5970,6 @@ if test "x$ac_cv_header_Security_Authorization_h" = xyes; then :
 fi
 
 
-               ac_fn_c_check_header_mongrel "$LINENO" "Security/SecBasePriv.h" "ac_cv_header_Security_SecBasePriv_h" "$ac_includes_default"
-if test "x$ac_cv_header_Security_SecBasePriv_h" = xyes; then :
-  $as_echo "#define HAVE_SECBASEPRIV_H 1" >>confdefs.h
-
-fi
-
-
 
                                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"
@@ -6054,13 +6002,6 @@ if test "x$ac_cv_header_xpc_xpc_h" = xyes; then :
 fi
 
 
-               ac_fn_c_check_header_mongrel "$LINENO" "xpc/private.h" "ac_cv_header_xpc_private_h" "$ac_includes_default"
-if test "x$ac_cv_header_xpc_private_h" = xyes; then :
-  $as_echo "#define HAVE_XPC_PRIVATE_H 1" >>confdefs.h
-
-fi
-
-
                 ;;
 esac
 
@@ -6085,13 +6026,31 @@ if test "${with_components+set}" = set; then :
 fi
 
 
+cupsimagebase="cupsimage"
+LIBCUPSOBJS="\$(COREOBJS) \$(DRIVEROBJS)"
+LIBHEADERS="\$(COREHEADERS) \$(DRIVERHEADERS)"
+LIBHEADERSPRIV="\$(COREHEADERSPRIV) \$(DRIVERHEADERSPRIV)"
+
 case "$COMPONENTS" in
        all)
-               BUILDDIRS="filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates"
+               BUILDDIRS="test filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates"
                ;;
 
        core)
-               BUILDDIRS="data locale"
+               BUILDDIRS="test locale"
+               ;;
+
+       libcups)
+               BUILDDIRS="locale"
+               cupsimagebase=""
+               ;;
+
+       libcupslite)
+               BUILDDIRS="locale"
+               cupsimagebase=""
+               LIBCUPSOBJS="\$(COREOBJS)"
+               LIBHEADERS="\$(COREHEADERS)"
+               LIBHEADERSPRIV="\$(COREHEADERSPRIV)"
                ;;
 
        *)
@@ -6104,6 +6063,9 @@ esac
 
 
 
+
+
+
 if test "$prefix" = "NONE"; then
        prefix="/"
 fi
@@ -6573,60 +6535,56 @@ fi
 
 cupsbase="cups"
 LIBCUPSBASE="lib$cupsbase"
+LIBCUPSIMAGE=""
 LIBCUPSSTATIC="lib$cupsbase.a"
 
 if test x$enable_shared != xno; then
        case "$host_os_name" in
                sunos*)
                        LIBCUPS="lib$cupsbase.so.2"
-                       LIBCUPSCGI="libcupscgi.so.1"
-                       LIBCUPSIMAGE="libcupsimage.so.2"
-                       LIBCUPSMIME="libcupsmime.so.1"
-                       LIBCUPSPPDC="libcupsppdc.so.1"
+                       if test "x$cupsimagebase" != x; then
+                               LIBCUPSIMAGE="lib$cupsimagebase.so.2"
+                       fi
                        DSO="\$(CC)"
                        DSOXX="\$(CXX)"
-                       DSOFLAGS="$DSOFLAGS -Wl,-h\`basename \$@\` -G \$(OPTIM)"
+                       DSOFLAGS="$DSOFLAGS -Wl,-h\`basename \$@\` -G"
                        ;;
                linux* | gnu* | *bsd*)
                        LIBCUPS="lib$cupsbase.so.2"
-                       LIBCUPSCGI="libcupscgi.so.1"
-                       LIBCUPSIMAGE="libcupsimage.so.2"
-                       LIBCUPSMIME="libcupsmime.so.1"
-                       LIBCUPSPPDC="libcupsppdc.so.1"
+                       if test "x$cupsimagebase" != x; then
+                               LIBCUPSIMAGE="lib$cupsimagebase.so.2"
+                       fi
                        DSO="\$(CC)"
                        DSOXX="\$(CXX)"
-                       DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` -shared \$(OPTIM)"
+                       DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` -shared"
                        ;;
                darwin*)
                        LIBCUPS="lib$cupsbase.2.dylib"
-                       LIBCUPSCGI="libcupscgi.1.dylib"
-                       LIBCUPSIMAGE="libcupsimage.2.dylib"
-                       LIBCUPSMIME="libcupsmime.1.dylib"
-                       LIBCUPSPPDC="libcupsppdc.1.dylib"
+                       if test "x$cupsimagebase" != x; then
+                               LIBCUPSIMAGE="lib$cupsimagebase.2.dylib"
+                       fi
                        DSO="\$(CC)"
                        DSOXX="\$(CXX)"
-                       DSOFLAGS="$DSOFLAGS -dynamiclib -single_module -lc"
+                       DSOFLAGS="$DSOFLAGS -Wl,-no_warn_inits -dynamiclib -single_module -lc"
                        ;;
                *)
                        echo "Warning: shared libraries may not be supported.  Trying -shared"
                        echo "         option with compiler."
                        LIBCUPS="lib$cupsbase.so.2"
-                       LIBCUPSCGI="libcupscgi.so.1"
-                       LIBCUPSIMAGE="libcupsimage.so.2"
-                       LIBCUPSMIME="libcupsmime.so.1"
-                       LIBCUPSPPDC="libcupsppdc.so.1"
+                       if test "x$cupsimagebase" != x; then
+                               LIBCUPSIMAGE="lib$cupsimagebase.so.2"
+                       fi
                        DSO="\$(CC)"
                        DSOXX="\$(CXX)"
-                       DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` -shared \$(OPTIM)"
+                       DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` -shared"
                        ;;
        esac
 else
        PICFLAG=0
        LIBCUPS="lib$cupsbase.a"
-       LIBCUPSCGI="libcupscgi.a"
-       LIBCUPSIMAGE="libcupsimage.a"
-       LIBCUPSMIME="libcupsmime.a"
-       LIBCUPSPPDC="libcupsppdc.a"
+       if test "x$cupsimagebase" != x; then
+               LIBCUPSIMAGE="lib$cupsimagebase.a"
+       fi
        DSO=":"
        DSOXX=":"
 fi
@@ -6639,21 +6597,28 @@ fi
 
 
 
-
-
-
 if test x$enable_shared = xno; then
        LINKCUPS="../cups/lib$cupsbase.a"
-       LINKCUPSIMAGE="../filter/libcupsimage.a"
-
        EXTLINKCUPS="-lcups"
-       EXTLINKCUPSIMAGE="-lcupsimage"
+
+       if test "x$cupsimagebase" != x; then
+               LINKCUPSIMAGE="../cups/lib$cupsimagebase.a"
+               EXTLINKCUPSIMAGE="-l$cupsimagebase"
+       else
+               LINKCUPSIMAGE=""
+               EXTLINKCUPSIMAGE=""
+       fi
 else
        LINKCUPS="-l${cupsbase}"
-       LINKCUPSIMAGE="-lcupsimage"
-
        EXTLINKCUPS="-lcups"
-       EXTLINKCUPSIMAGE="-lcupsimage"
+
+       if test "x$cupsimagebase" != x; then
+               LINKCUPSIMAGE="-l$cupsimagebase"
+               EXTLINKCUPSIMAGE="-l$cupsimagebase"
+       else
+               LINKCUPSIMAGE=""
+               EXTLINKCUPSIMAGE=""
+       fi
 fi
 
 
@@ -6745,7 +6710,7 @@ if test x$LIBTOOL != x; then
        LIBTOOL_INSTALL="\$(LIBTOOL) --mode=install"
 
        LINKCUPS="../cups/\$(LIBCUPS)"
-       LINKCUPSIMAGE="../filter/\$(LIBCUPSIMAGE)"
+       LINKCUPSIMAGE="../cups/\$(LIBCUPSIMAGE)"
 
 else
        LD_CC="\$(CC)"
@@ -6766,16 +6731,18 @@ fi
 
 
 INSTALL_STRIP=""
-OPTIM=""
-
 
 
 
 # Check whether --with-optim was given.
 if test "${with_optim+set}" = set; then :
-  withval=$with_optim;
+  withval=$with_optim; OPTIM="$withval"
+else
+  OPTIM=""
 fi
 
+
+
 # Check whether --enable-debug was given.
 if test "${enable_debug+set}" = set; then :
   enableval=$enable_debug;
@@ -6797,7 +6764,7 @@ if test "${enable_unit_tests+set}" = set; then :
 fi
 
 
-if test x$enable_debug = xyes; then
+if test x$enable_debug = xyes -a "x$OPTIM" = x; then
        OPTIM="-g"
 else
        INSTALL_STRIP="-s"
@@ -6863,6 +6830,12 @@ if test "${enable_relro+set}" = set; then :
 fi
 
 
+# Check whether --enable-sanitizer was given.
+if test "${enable_sanitizer+set}" = set; then :
+  enableval=$enable_sanitizer;
+fi
+
+
 CXXLIBS="${CXXLIBS:=}"
 
 
@@ -6872,15 +6845,28 @@ PIEFLAGS=""
 RELROFLAGS=""
 
 
+WARNING_OPTIONS=""
+
+
 if test -n "$GCC"; then
        # Add GCC-specific compiler options...
+
+        # Address sanitizer is a useful tool to use when developing/debugging
+        # code but adds about 2x overhead...
+       if test x$enable_sanitizer = xyes; then
+               # Use -fsanitize=address with debugging...
+               OPTIM="$OPTIM -g -fsanitize=address"
+       else
+               # Otherwise use the Fortify enhancements to catch any unbounded
+               # string operations...
+               CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
+               CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2"
+       fi
+
+       # Default optimization options...
        if test -z "$OPTIM"; then
-               if test "x$with_optim" = x; then
-                       # Default to optimize-for-size and debug
-                               OPTIM="-Os -g"
-               else
-                       OPTIM="$with_optim $OPTIM"
-               fi
+               # Default to optimize-for-size and debug
+               OPTIM="-Os -g"
        fi
 
        # Generate position-independent code as needed...
@@ -6986,149 +6972,29 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
                CFLAGS="$OLDCFLAGS"
        fi
 
-       if test "x$with_optim" = x; then
-               # Add useful warning options for tracking down problems...
-               OPTIM="-Wall -Wno-format-y2k -Wunused $OPTIM"
-
-               { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler supports -Wno-unused-result" >&5
-$as_echo_n "checking whether compiler supports -Wno-unused-result... " >&6; }
-               OLDCFLAGS="$CFLAGS"
-               CFLAGS="$CFLAGS -Werror -Wno-unused-result"
-               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-unused-result"
-                       { $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"
-
-               { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler supports -Wsign-conversion" >&5
-$as_echo_n "checking whether compiler supports -Wsign-conversion... " >&6; }
-               OLDCFLAGS="$CFLAGS"
-               CFLAGS="$CFLAGS -Werror -Wsign-conversion"
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
+       # Add useful warning options for tracking down problems...
+       WARNING_OPTIONS="-Wall -Wno-format-y2k -Wunused -Wno-unused-result -Wsign-conversion"
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  OPTIM="$OPTIM -Wsign-conversion"
-                       { $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"
-
-               { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler supports -Wno-tautological-compare" >&5
-$as_echo_n "checking whether compiler supports -Wno-tautological-compare... " >&6; }
-               OLDCFLAGS="$CFLAGS"
-               CFLAGS="$CFLAGS -Werror -Wno-tautological-compare"
-               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-tautological-compare"
-                       { $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"
-
-               { $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 "$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
-                       # CUPS since we already use buffer-limited calls, but
-                       # this will catch any additions that are broken.
-                       CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
-                       ;;
-
-               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
-                               RELROFLAGS="-Wl,-z,relro,-z,now"
-                       fi
+       # Test GCC version for certain warning flags since -Werror
+       # doesn't trigger...
+       gccversion=`$CC --version | head -1 | awk '{print $NF}'`
+       case "$gccversion" in
+               7.* | 8.*)
+                       WARNING_OPTIONS="$WARNING_OPTIONS -Wno-format-truncation -Wno-tautological-compare"
                        ;;
        esac
+
+       # Additional warning options for development testing...
+       if test -d .git; then
+               WARNING_OPTIONS="-Werror -Wno-error=deprecated-declarations $WARNING_OPTIONS"
+       fi
 else
        # Add vendor-specific compiler options...
        case $host_os_name in
                sunos*)
                        # Solaris
                        if test -z "$OPTIM"; then
-                               if test "x$with_optim" = x; then
-                                       OPTIM="-xO2"
-                               else
-                                       OPTIM="$with_optim $OPTIM"
-                               fi
+                               OPTIM="-xO2"
                        fi
 
                        if test $PICFLAG = 1; then
@@ -7136,13 +7002,13 @@ else
                        fi
                        ;;
                *)
-                       # Running some other operating system; inform the user they
-                       # should contribute the necessary options to
-                       # cups-support@cups.org...
-                       echo "Building CUPS with default compiler optimizations; contact"
-                       echo "cups-devel@cups.org with uname and compiler options needed"
-                       echo "for your platform, or set the CFLAGS and LDFLAGS environment"
-                       echo "variables before running configure."
+                       # Running some other operating system; inform the user
+                       # they should contribute the necessary options via
+                       # Github...
+                       echo "Building CUPS with default compiler optimizations; contact the CUPS developers on Github"
+                       echo "(https://github.com/apple/cups/issues) with the uname and compiler options needed for"
+                       echo "your platform, or set the CFLAGS and LDFLAGS environment variables before running"
+                       echo "configure."
                        ;;
        esac
 fi
@@ -7153,6 +7019,12 @@ case $host_os_name in
                # glibc 2.8 and higher breaks peer credentials unless you
                # define _GNU_SOURCE...
                OPTIM="$OPTIM -D_GNU_SOURCE"
+
+               # The -z relro option is provided by the Linux linker command to
+               # make relocatable data read-only.
+               if test x$enable_relro = xyes; then
+                       RELROFLAGS="-Wl,-z,relro,-z,now"
+               fi
                ;;
 esac
 
@@ -8353,14 +8225,7 @@ if test "x$ac_cv_header_Security_SecureTransport_h" = xyes; then :
 
                CUPS_SERVERKEYCHAIN="/Library/Keychains/System.keychain"
 
-                               ac_fn_c_check_header_mongrel "$LINENO" "Security/SecureTransportPriv.h" "ac_cv_header_Security_SecureTransportPriv_h" "$ac_includes_default"
-if test "x$ac_cv_header_Security_SecureTransportPriv_h" = xyes; then :
-  $as_echo "#define HAVE_SECURETRANSPORTPRIV_H 1" >>confdefs.h
-
-fi
-
-
-               ac_fn_c_check_header_mongrel "$LINENO" "Security/SecCertificate.h" "ac_cv_header_Security_SecCertificate_h" "$ac_includes_default"
+                               ac_fn_c_check_header_mongrel "$LINENO" "Security/SecCertificate.h" "ac_cv_header_Security_SecCertificate_h" "$ac_includes_default"
 if test "x$ac_cv_header_Security_SecCertificate_h" = xyes; then :
   $as_echo "#define HAVE_SECCERTIFICATE_H 1" >>confdefs.h
 
@@ -8374,14 +8239,6 @@ if test "x$ac_cv_header_Security_SecItem_h" = xyes; then :
 fi
 
 
-               ac_fn_c_check_header_compile "$LINENO" "Security/SecItemPriv.h" "ac_cv_header_Security_SecItemPriv_h" "#include <Security/SecItem.h>
-"
-if test "x$ac_cv_header_Security_SecItemPriv_h" = xyes; then :
-  $as_echo "#define HAVE_SECITEMPRIV_H 1" >>confdefs.h
-
-fi
-
-
                ac_fn_c_check_header_mongrel "$LINENO" "Security/SecPolicy.h" "ac_cv_header_Security_SecPolicy_h" "$ac_includes_default"
 if test "x$ac_cv_header_Security_SecPolicy_h" = xyes; then :
   $as_echo "#define HAVE_SECPOLICY_H 1" >>confdefs.h
@@ -8389,40 +8246,9 @@ if test "x$ac_cv_header_Security_SecPolicy_h" = xyes; then :
 fi
 
 
-               ac_fn_c_check_header_mongrel "$LINENO" "Security/SecPolicyPriv.h" "ac_cv_header_Security_SecPolicyPriv_h" "$ac_includes_default"
-if test "x$ac_cv_header_Security_SecPolicyPriv_h" = xyes; then :
-  $as_echo "#define HAVE_SECPOLICYPRIV_H 1" >>confdefs.h
-
-fi
-
-
-               ac_fn_c_check_header_mongrel "$LINENO" "Security/SecBasePriv.h" "ac_cv_header_Security_SecBasePriv_h" "$ac_includes_default"
-if test "x$ac_cv_header_Security_SecBasePriv_h" = xyes; then :
-  $as_echo "#define HAVE_SECBASEPRIV_H 1" >>confdefs.h
-
-fi
-
-
-               ac_fn_c_check_header_mongrel "$LINENO" "Security/SecIdentitySearchPriv.h" "ac_cv_header_Security_SecIdentitySearchPriv_h" "$ac_includes_default"
-if test "x$ac_cv_header_Security_SecIdentitySearchPriv_h" = xyes; then :
-  $as_echo "#define HAVE_SECIDENTITYSEARCHPRIV_H 1" >>confdefs.h
-
-fi
-
-
-
-               $as_echo "#define HAVE_CSSMERRORSTRING 1" >>confdefs.h
-
-               $as_echo "#define HAVE_SECKEYCHAINOPEN 1" >>confdefs.h
-
 fi
 
 
-
-               if test $host_os_version -ge 150; then
-                       $as_echo "#define HAVE_SSLSETENABLEDCIPHERS 1" >>confdefs.h
-
-               fi
        fi
     fi
 
@@ -8830,10 +8656,22 @@ fi
                        # as Linux distributors move things around...
                        if test "x$with_pam_module" != x; then
                                PAMMOD="pam_${with_pam_module}.so"
-                       elif test -f /lib/security/pam_unix2.so; then
-                               PAMMOD="pam_unix2.so"
-                       elif test -f /lib/security/pam_unix.so; then
-                               PAMMOD="pam_unix.so"
+                       elif test -f /etc/pam.d/common-auth; then
+                               PAMFILE="pam.common"
+                       else
+                               moddir=""
+                               for dir in /lib/security /lib64/security /lib/x86_64-linux-gnu/security /var/lib/pam; do
+                                       if test -d $dir; then
+                                               moddir=$dir
+                                               break;
+                                       fi
+                               done
+
+                               if test -f $moddir/pam_unix2.so; then
+                                       PAMMOD="pam_unix2.so"
+                               elif test -f $moddir/pam_unix.so; then
+                                       PAMMOD="pam_unix.so"
+                               fi
                        fi
 
                        if test "x$PAMMOD" = xpam_unix.so; then
@@ -9168,7 +9006,6 @@ if test "x$ac_cv_header_dns_sd_h" = xyes; then :
                                # Darwin and macOS...
                                $as_echo "#define HAVE_DNSSD 1" >>confdefs.h
 
-                               DNSSDLIBS="-framework CoreFoundation -framework SystemConfiguration"
                                DNSSD_BACKEND="dnssd"
                                IPPFIND_BIN="ippfind"
                                IPPFIND_MAN="ippfind.\$(MAN1EXT)"
@@ -9497,7 +9334,8 @@ fi
 if test "${with_bundledir+set}" = set; then :
   withval=$with_bundledir; CUPS_BUNDLEDIR="$withval"
 else
-  if test "x$host_os_name" = xdarwin -a $host_os_version -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
@@ -9515,6 +9353,27 @@ _ACEOF
 fi
 
 
+# Check whether --with-bundlelang was given.
+if test "${with_bundlelang+set}" = set; then :
+  withval=$with_bundlelang; cups_bundlelang="$withval"
+else
+
+       if test $host_os_version -ge 190; then
+               cups_bundlelang="en"
+       else
+               cups_bundlelang="English"
+       fi
+fi
+
+
+if test "x$cups_bundlelang" != x -a "x$CUPS_BUNDLEDIR" != x; then
+       CUPS_RESOURCEDIR="$CUPS_BUNDLEDIR/Resources/$cups_bundlelang.lproj"
+else
+       CUPS_RESOURCEDIR=""
+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"
@@ -10063,313 +9922,6 @@ _ACEOF
 
 
 
-
-# Check whether --with-java was given.
-if test "${with_java+set}" = set; then :
-  withval=$with_java; CUPS_JAVA="$withval"
-else
-  CUPS_JAVA="auto"
-fi
-
-
-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
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_JAVA+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $JAVA in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_JAVA="$JAVA" # 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_JAVA="$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
-JAVA=$ac_cv_path_JAVA
-if test -n "$JAVA"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVA" >&5
-$as_echo "$JAVA" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-       CUPS_JAVA="$JAVA"
-elif test "x$CUPS_JAVA" = xno; then
-        CUPS_JAVA=""
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define CUPS_JAVA "$CUPS_JAVA"
-_ACEOF
-
-
-if test "x$CUPS_JAVA" != x; then
-       $as_echo "#define HAVE_JAVA 1" >>confdefs.h
-
-fi
-
-
-# Check whether --with-perl was given.
-if test "${with_perl+set}" = set; then :
-  withval=$with_perl; CUPS_PERL="$withval"
-else
-  CUPS_PERL="auto"
-fi
-
-
-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
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PERL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PERL in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PERL="$PERL" # 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_PERL="$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
-PERL=$ac_cv_path_PERL
-if test -n "$PERL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
-$as_echo "$PERL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-       CUPS_PERL="$PERL"
-elif test "x$CUPS_PERL" = xno; then
-        CUPS_PERL=""
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define CUPS_PERL "$CUPS_PERL"
-_ACEOF
-
-
-if test "x$CUPS_PERL" != x; then
-       $as_echo "#define HAVE_PERL 1" >>confdefs.h
-
-fi
-
-
-# Check whether --with-php was given.
-if test "${with_php+set}" = set; then :
-  withval=$with_php; CUPS_PHP="$withval"
-else
-  CUPS_PHP="auto"
-fi
-
-
-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
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PHPCGI+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PHPCGI in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PHPCGI="$PHPCGI" # 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_PHPCGI="$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
-PHPCGI=$ac_cv_path_PHPCGI
-if test -n "$PHPCGI"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHPCGI" >&5
-$as_echo "$PHPCGI" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-       if test "x$PHPCGI" = x; then
-               # Extract the first word of "php", so it can be a program name with args.
-set dummy php; 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_PHP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PHP in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PHP="$PHP" # 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_PHP="$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
-PHP=$ac_cv_path_PHP
-if test -n "$PHP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP" >&5
-$as_echo "$PHP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-               CUPS_PHP="$PHP"
-       else
-               CUPS_PHP="$PHPCGI"
-       fi
-elif test "x$CUPS_PHP" = xno; then
-        CUPS_PHP=""
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define CUPS_PHP "$CUPS_PHP"
-_ACEOF
-
-
-if test "x$CUPS_PHP" = x; then
-       CUPS_PHP="no"
-else
-       $as_echo "#define HAVE_PHP 1" >>confdefs.h
-
-fi
-
-
-# Check whether --with-python was given.
-if test "${with_python+set}" = set; then :
-  withval=$with_python; CUPS_PYTHON="$withval"
-else
-  CUPS_PYTHON="auto"
-fi
-
-
-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
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PYTHON+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PYTHON in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PYTHON="$PYTHON" # 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_PYTHON="$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
-PYTHON=$ac_cv_path_PYTHON
-if test -n "$PYTHON"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
-$as_echo "$PYTHON" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-       CUPS_PYTHON="$PYTHON"
-elif test "x$CUPS_PYTHON" = xno; then
-        CUPS_PYTHON=""
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define CUPS_PYTHON "$CUPS_PYTHON"
-_ACEOF
-
-
-if test "x$CUPS_PYTHON" != x; then
-       $as_echo "#define HAVE_PYTHON 1" >>confdefs.h
-
-fi
-
-
 INSTALL_LANGUAGES=""
 UNINSTALL_LANGUAGES=""
 LANGFILES=""
@@ -10393,7 +9945,7 @@ fi
 
 
 
-ac_config_files="$ac_config_files Makedefs conf/cups-files.conf conf/cupsd.conf conf/mime.convs conf/pam.std conf/snmp.conf cups-config desktop/cups.desktop doc/index.html man/client.conf.man man/cups-files.conf.man man/cups-lpd.man man/cups-snmp.man man/cupsaddsmb.man man/cupsd.conf.man man/cupsd.man man/lpoptions.man scheduler/cups-lpd.xinetd scheduler/cups.sh scheduler/cups.xml scheduler/org.cups.cups-lpd.plist scheduler/org.cups.cups-lpdAT.service scheduler/org.cups.cupsd.path scheduler/org.cups.cupsd.service scheduler/org.cups.cupsd.socket templates/header.tmpl packaging/cups.list $LANGFILES"
+ac_config_files="$ac_config_files Makedefs conf/cups-files.conf conf/cupsd.conf conf/mime.convs conf/pam.std conf/snmp.conf cups-config desktop/cups.desktop doc/index.html man/client.conf.man man/cups-files.conf.man man/cups-lpd.man man/cups-snmp.man man/cupsd.conf.man man/cupsd.man man/lpoptions.man scheduler/cups-lpd.xinetd scheduler/cups.sh scheduler/cups.xml scheduler/org.cups.cups-lpd.plist scheduler/org.cups.cups-lpdAT.service scheduler/org.cups.cupsd.path scheduler/org.cups.cupsd.service scheduler/org.cups.cupsd.socket templates/header.tmpl packaging/cups.list $LANGFILES"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -10901,7 +10453,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.6, which was
+This file was extended by CUPS $as_me 2.3b7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -10964,7 +10516,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.6
+CUPS config.status 2.3b7
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -11100,7 +10652,6 @@ do
     "man/cups-files.conf.man") CONFIG_FILES="$CONFIG_FILES man/cups-files.conf.man" ;;
     "man/cups-lpd.man") CONFIG_FILES="$CONFIG_FILES man/cups-lpd.man" ;;
     "man/cups-snmp.man") CONFIG_FILES="$CONFIG_FILES man/cups-snmp.man" ;;
-    "man/cupsaddsmb.man") CONFIG_FILES="$CONFIG_FILES man/cupsaddsmb.man" ;;
     "man/cupsd.conf.man") CONFIG_FILES="$CONFIG_FILES man/cupsd.conf.man" ;;
     "man/cupsd.man") CONFIG_FILES="$CONFIG_FILES man/cupsd.man" ;;
     "man/lpoptions.man") CONFIG_FILES="$CONFIG_FILES man/lpoptions.man" ;;