X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fcups.git;a=blobdiff_plain;f=configure;h=004ecee995c338b96fbc5b5ee92c73777ef0ae1d;hp=e5e5a882d65457bfbcfe9ce195861331d9f59ed5;hb=e2eb28cfcf10ef163253a65f631e0cc98fe34804;hpb=3c2cb8228e5a90fe93b938f55cfbfa538e313d40 diff --git a/configure b/configure index e5e5a882d..004ecee99 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for CUPS 2.3b7. +# Generated by GNU Autoconf 2.69 for CUPS 2.3.1. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='CUPS' PACKAGE_TARNAME='cups' -PACKAGE_VERSION='2.3b7' -PACKAGE_STRING='CUPS 2.3b7' +PACKAGE_VERSION='2.3.1' +PACKAGE_STRING='CUPS 2.3.1' PACKAGE_BUGREPORT='https://github.com/apple/cups/issues' PACKAGE_URL='https://www.cups.org/' @@ -702,11 +702,7 @@ LIBTOOL LD_CXX LD_CC EXPORT_LDFLAGS -IMGLIBS -DSOLIBS -LINKCUPSIMAGE LINKCUPS -EXTLINKCUPSIMAGE EXTLINKCUPS LIBCUPSSTATIC LIBCUPSIMAGE @@ -715,13 +711,6 @@ LIBCUPS DSOFLAGS DSOXX DSO -MAN8DIR -MAN8EXT -MAN7EXT -MAN5EXT -MAN1EXT -PMANDIR -AMANDIR CUPS_STATEDIR CUPS_SERVERROOT INSTALL_SYSV @@ -740,6 +729,7 @@ privateinclude LIBHEADERSPRIV LIBHEADERS LIBCUPSOBJS +IPPEVECOMMANDS BUILDDIRS INSTALLXPC CUPS_SYSTEM_AUTHKEY @@ -761,7 +751,6 @@ LIBPAPER LIBMALLOC PKGCONFIG INSTALLSTATIC -INSTALL CUPS_HTMLVIEW XDGOPEN SED @@ -771,7 +760,8 @@ MV MKDIR LN LD -GZIP +INSTALL +GZIPPROG CHMOD AR RANLIB @@ -1477,7 +1467,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.3b7 to adapt to many kinds of systems. +\`configure' configures CUPS 2.3.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1542,7 +1532,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of CUPS 2.3b7:";; + short | recursive ) echo "Configuration of CUPS 2.3.1:";; esac cat <<\_ACEOF @@ -1723,7 +1713,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -CUPS configure 2.3b7 +CUPS configure 2.3.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2187,7 +2177,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.3b7, which was +It was created by CUPS $as_me 2.3.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2704,7 +2694,7 @@ done ac_config_headers="$ac_config_headers config.h" -CUPS_VERSION="2.3b7" +CUPS_VERSION="2.3.1" CUPS_REVISION="" CUPS_BUILD="cups-$CUPS_VERSION" @@ -3941,12 +3931,12 @@ fi set dummy gzip; 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_GZIP+:} false; then : +if ${ac_cv_path_GZIPPROG+:} false; then : $as_echo_n "(cached) " >&6 else - case $GZIP in + case $GZIPPROG in [\\/]* | ?:[\\/]*) - ac_cv_path_GZIP="$GZIP" # Let the user override the test with a path. + ac_cv_path_GZIPPROG="$GZIPPROG" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -3956,7 +3946,7 @@ do 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_GZIP="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_GZIPPROG="$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 @@ -3967,16 +3957,22 @@ IFS=$as_save_IFS ;; esac fi -GZIP=$ac_cv_path_GZIP -if test -n "$GZIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GZIP" >&5 -$as_echo "$GZIP" >&6; } +GZIPPROG=$ac_cv_path_GZIPPROG +if test -n "$GZIPPROG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GZIPPROG" >&5 +$as_echo "$GZIPPROG" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for install-sh script" >&5 +$as_echo_n "checking for install-sh script... " >&6; } +INSTALL="`pwd`/install-sh" + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using $INSTALL" >&5 +$as_echo "using $INSTALL" >&6; } # Extract the first word of "ld", so it can be a program name with args. set dummy ld; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -4297,6 +4293,7 @@ $as_echo "no" >&6; } fi + if test "x$XDGOPEN" = x; then CUPS_HTMLVIEW="htmlview" else @@ -4304,13 +4301,6 @@ else fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for install-sh script" >&5 -$as_echo_n "checking for install-sh script... " >&6; } -INSTALL="`pwd`/install-sh" - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using $INSTALL" >&5 -$as_echo "using $INSTALL" >&6; } - if test "x$AR" = x; then as_fn_error $? "Unable to find required library archive command." "$LINENO" 5 fi @@ -5643,7 +5633,8 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_gzgets" >&5 $as_echo "$ac_cv_lib_z_gzgets" >&6; } if test "x$ac_cv_lib_z_gzgets" = xyes; then : - $as_echo "#define HAVE_LIBZ 1" >>confdefs.h + + $as_echo "#define HAVE_LIBZ 1" >>confdefs.h LIBZ="-lz" LIBS="$LIBS -lz" @@ -5688,7 +5679,7 @@ if test "x$ac_cv_lib_z_inflateCopy" = xyes; then : fi - if test "x$GZIP" != z; then + if test "x$GZIPPROG" != x; then INSTALL_GZIP="-z" fi fi @@ -5784,6 +5775,10 @@ fi fi LIBS="$SAVELIBS" +DBUSDIR="" +DBUS_NOTIFIER="" +DBUS_NOTIFIERLIBS="" + # Check whether --enable-dbus was given. if test "${enable_dbus+set}" = set; then : enableval=$enable_dbus; @@ -5796,10 +5791,6 @@ if test "${with_dbusdir+set}" = set; then : fi -DBUSDIR="" -DBUS_NOTIFIER="" -DBUS_NOTIFIERLIBS="" - 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; } @@ -5827,7 +5818,7 @@ if test "x$ac_cv_func_dbus_threads_init" = xyes; then : fi LIBS="$SAVELIBS" - if test -d /etc/dbus-1; then + if test -d /etc/dbus-1 -a "x$DBUSDIR" = x; then DBUSDIR="/etc/dbus-1" fi else @@ -6027,17 +6018,28 @@ fi cupsimagebase="cupsimage" +IPPEVECOMMANDS="ippevepcl ippeveps" LIBCUPSOBJS="\$(COREOBJS) \$(DRIVEROBJS)" LIBHEADERS="\$(COREHEADERS) \$(DRIVERHEADERS)" LIBHEADERSPRIV="\$(COREHEADERSPRIV) \$(DRIVERHEADERSPRIV)" case "$COMPONENTS" in all) - BUILDDIRS="test filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates" + BUILDDIRS="tools filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates" ;; core) - BUILDDIRS="test locale" + BUILDDIRS="tools examples locale" + ;; + + corelite) + $as_echo "#define CUPS_LITE 1" >>confdefs.h + + BUILDDIRS="tools examples locale" + cupsimagebase="" + LIBCUPSOBJS="\$(COREOBJS)" + LIBHEADERS="\$(COREHEADERS)" + LIBHEADERSPRIV="\$(COREHEADERSPRIV)" ;; libcups) @@ -6046,6 +6048,8 @@ case "$COMPONENTS" in ;; libcupslite) + $as_echo "#define CUPS_LITE 1" >>confdefs.h + BUILDDIRS="locale" cupsimagebase="" LIBCUPSOBJS="\$(COREOBJS)" @@ -6066,6 +6070,7 @@ esac + if test "$prefix" = "NONE"; then prefix="/" fi @@ -6471,59 +6476,16 @@ if test "$mandir" = "\${prefix}/man" -a "$prefix" = "/"; then darwin* | linux* | gnu* | *bsd*) # Darwin, macOS, Linux, GNU HURD, and *BSD mandir="/usr/share/man" - AMANDIR="/usr/share/man" - PMANDIR="/usr/share/man" ;; *) # All others mandir="/usr/man" - AMANDIR="/usr/man" - PMANDIR="/usr/man" ;; esac -else - AMANDIR="$mandir" - PMANDIR="$mandir" fi - -case "$host_os_name" in - sunos*) - # Solaris - MAN1EXT=1 - MAN5EXT=5 - MAN7EXT=7 - MAN8EXT=1m - MAN8DIR=1m - ;; - linux* | gnu* | darwin*) - # Linux, GNU Hurd, and macOS - MAN1EXT=1.gz - MAN5EXT=5.gz - MAN7EXT=7.gz - MAN8EXT=8.gz - MAN8DIR=8 - ;; - *) - # All others - MAN1EXT=1 - MAN5EXT=5 - MAN7EXT=7 - MAN8EXT=8 - MAN8DIR=8 - ;; -esac - - - - - - - - - PICFLAG=1 DSOFLAGS="${DSOFLAGS:=}" @@ -6598,44 +6560,19 @@ fi if test x$enable_shared = xno; then - LINKCUPS="../cups/lib$cupsbase.a" - EXTLINKCUPS="-lcups" - - if test "x$cupsimagebase" != x; then - LINKCUPSIMAGE="../cups/lib$cupsimagebase.a" - EXTLINKCUPSIMAGE="-l$cupsimagebase" - else - LINKCUPSIMAGE="" - EXTLINKCUPSIMAGE="" - fi + LINKCUPS="../cups/lib$cupsbase.a \$(LIBS)" + EXTLINKCUPS="-lcups \$LIBS" else - LINKCUPS="-l${cupsbase}" + LINKCUPS="-L../cups -l${cupsbase}" EXTLINKCUPS="-lcups" - - if test "x$cupsimagebase" != x; then - LINKCUPSIMAGE="-l$cupsimagebase" - EXTLINKCUPSIMAGE="-l$cupsimagebase" - else - LINKCUPSIMAGE="" - EXTLINKCUPSIMAGE="" - fi fi - - EXPORT_LDFLAGS="" if test "$DSO" != ":"; then - # When using DSOs the image libraries are linked to libcupsimage.so - # rather than to the executables. This makes things smaller if you - # are using any static libraries, and it also allows us to distribute - # a single DSO rather than a bunch... - DSOLIBS="\$(LIBZ)" - IMGLIBS="" - # 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... @@ -6665,16 +6602,11 @@ if test "$DSO" != ":"; then fi ;; esac -else - DSOLIBS="" - IMGLIBS="\$(LIBZ)" 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 @@ -6979,8 +6911,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # 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" + 1.* | 2.* | 3.* | 4.* | 5.* | 6.* | \(clang-*) + ;; + *) + WARNING_OPTIONS="$WARNING_OPTIONS -Wno-format-truncation -Wno-format-overflow -Wno-tautological-compare" ;; esac @@ -8988,7 +8922,7 @@ $as_echo "yes" >&6; } DNSSDLIBS="`$PKGCONFIG --libs avahi-client`" DNSSD_BACKEND="dnssd" IPPFIND_BIN="ippfind" - IPPFIND_MAN="ippfind.\$(MAN1EXT)" + IPPFIND_MAN="ippfind.1" $as_echo "#define HAVE_AVAHI 1" >>confdefs.h else @@ -9008,7 +8942,7 @@ if test "x$ac_cv_header_dns_sd_h" = xyes; then : DNSSD_BACKEND="dnssd" IPPFIND_BIN="ippfind" - IPPFIND_MAN="ippfind.\$(MAN1EXT)" + IPPFIND_MAN="ippfind.1" ;; *) # All others... @@ -9040,7 +8974,7 @@ $as_echo "yes" >&6; } DNSSD_BACKEND="dnssd" else IPPFIND_BIN="ippfind" - IPPFIND_MAN="ippfind.\$(MAN1EXT)" + IPPFIND_MAN="ippfind.1" { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -9661,7 +9595,7 @@ else $as_echo_n "checking for default system groups... " >&6; } if test -f /etc/group; then CUPS_SYSTEM_GROUPS="" - GROUP_LIST="lpadmin sys system root" + GROUP_LIST="lpadmin sys system root wheel" for group in $GROUP_LIST; do if test "`grep \^${group}: /etc/group`" != ""; then if test "x$CUPS_SYSTEM_GROUPS" = x; then @@ -9945,7 +9879,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/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 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 @@ -10453,7 +10387,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.3b7, which was +This file was extended by CUPS $as_me 2.3.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -10516,7 +10450,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.3b7 +CUPS config.status 2.3.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -10648,13 +10582,6 @@ do "cups-config") CONFIG_FILES="$CONFIG_FILES cups-config" ;; "desktop/cups.desktop") CONFIG_FILES="$CONFIG_FILES desktop/cups.desktop" ;; "doc/index.html") CONFIG_FILES="$CONFIG_FILES doc/index.html" ;; - "man/client.conf.man") CONFIG_FILES="$CONFIG_FILES man/client.conf.man" ;; - "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/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" ;; "scheduler/cups-lpd.xinetd") CONFIG_FILES="$CONFIG_FILES scheduler/cups-lpd.xinetd" ;; "scheduler/cups.sh") CONFIG_FILES="$CONFIG_FILES scheduler/cups.sh" ;; "scheduler/cups.xml") CONFIG_FILES="$CONFIG_FILES scheduler/cups.xml" ;;