From: Michael R Sweet Date: Thu, 4 Mar 2021 14:37:28 +0000 (-0500) Subject: Work on modernizing autoconf source files and the build system: X-Git-Tag: v2.4b1~245 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e6ace2894e77ca2a15dd03f8c5d63cca0da43b05;p=thirdparty%2Fcups.git Work on modernizing autoconf source files and the build system: - Adopt non-deprecated autoconf macros, wrap shell "if" and "case" statements with AS_IF and AS_CASE macros. - Remove strings.h and bstring.h checks since they are not needed for modern OS's. - Rename cups-ssl.m4 to cups-tls.m4 (TLS support, not SSL support) --- diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 index a460a73a4f..154cf7cb8f 100644 --- a/config-scripts/cups-common.m4 +++ b/config-scripts/cups-common.m4 @@ -1,6 +1,7 @@ dnl dnl Common configuration stuff for CUPS. dnl +dnl Copyright © 2021 by OpenPrinting. dnl Copyright © 2007-2019 by Apple Inc. dnl Copyright © 1997-2007 by Easy Software Products, all rights reserved. dnl @@ -9,21 +10,22 @@ dnl information. dnl dnl Set the name of the config header file... -AC_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS([config.h]) dnl Version number information... CUPS_VERSION="AC_PACKAGE_VERSION" CUPS_REVISION="" CUPS_BUILD="cups-$CUPS_VERSION" -AC_ARG_WITH(cups_build, [ --with-cups-build set "cups-config --build" string ], - CUPS_BUILD="$withval") +AC_ARG_WITH([cups_build], AS_HELP_STRING([--with-cups-build], [set "pkg-config --variable=build" string]), [ + CUPS_BUILD="$withval" +]) -AC_SUBST(CUPS_VERSION) -AC_SUBST(CUPS_REVISION) -AC_SUBST(CUPS_BUILD) -AC_DEFINE_UNQUOTED(CUPS_SVERSION, "AC_PACKAGE_NAME v$CUPS_VERSION$CUPS_REVISION") -AC_DEFINE_UNQUOTED(CUPS_MINIMAL, "AC_PACKAGE_NAME/$CUPS_VERSION$CUPS_REVISION") +AC_SUBST([CUPS_VERSION]) +AC_SUBST([CUPS_REVISION]) +AC_SUBST([CUPS_BUILD]) +AC_DEFINE_UNQUOTED([CUPS_SVERSION], ["AC_PACKAGE_NAME v$CUPS_VERSION$CUPS_REVISION"], [Version number]) +AC_DEFINE_UNQUOTED([CUPS_MINIMAL], ["AC_PACKAGE_NAME/$CUPS_VERSION$CUPS_REVISION"], [Version for HTTP headers]) dnl Default compiler flags... CFLAGS="${CFLAGS:=}" @@ -33,263 +35,273 @@ LDFLAGS="${LDFLAGS:=}" dnl Checks for programs... AC_PROG_AWK -AC_PROG_CC(clang cc gcc) +AC_PROG_CC AC_PROG_CPP -AC_PROG_CXX(clang++ c++ g++) +AC_PROG_CXX AC_PROG_RANLIB -AC_PATH_PROG(AR,ar) -AC_PATH_PROG(CHMOD,chmod) -AC_PATH_PROG(GZIPPROG,gzip) -AC_MSG_CHECKING(for install-sh script) +AC_PATH_PROG([AR], [ar]) +AC_PATH_PROG([CHMOD], [chmod]) +AC_PATH_PROG([GZIPPROG], [gzip]) +AC_MSG_CHECKING([for install-sh script]) INSTALL="`pwd`/install-sh" -AC_SUBST(INSTALL) -AC_MSG_RESULT(using $INSTALL) -AC_PATH_PROG(LD,ld) -AC_PATH_PROG(LN,ln) -AC_PATH_PROG(MKDIR,mkdir) -AC_PATH_PROG(MV,mv) -AC_PATH_PROG(RM,rm) -AC_PATH_PROG(RMDIR,rmdir) -AC_PATH_PROG(SED,sed) -AC_PATH_PROG(XDGOPEN,xdg-open) - -if test "x$XDGOPEN" = x; then - CUPS_HTMLVIEW="htmlview" -else - CUPS_HTMLVIEW="$XDGOPEN" -fi -AC_SUBST(CUPS_HTMLVIEW) - -if test "x$AR" = x; then - AC_MSG_ERROR([Unable to find required library archive command.]) -fi -if test "x$CC" = x; then - AC_MSG_ERROR([Unable to find required C compiler command.]) -fi +AC_SUBST([INSTALL]) +AC_MSG_RESULT([using $INSTALL]) +AC_PATH_PROG([LD], [ld]) +AC_PATH_PROG([LN], [ln]) +AC_PATH_PROG([MKDIR], [mkdir]) +AC_PATH_PROG([MV], [mv]) +AC_PATH_PROG([RM], [rm]) +AC_PATH_PROG([RMDIR], [rmdir]) +AC_PATH_PROG([SED], [sed]) +AC_PATH_PROG([XDGOPEN], [xdg-open]) + +AS_IF([test "x$XDGOPEN" = x], [ + CUPS_HTMLVIEW="htmlview" +], [ + CUPS_HTMLVIEW="$XDGOPEN" +]) +AC_SUBST([CUPS_HTMLVIEW]) + +AS_IF([test "x$AR" = x], [ + AC_MSG_ERROR([Unable to find required library archive command.]) +]) +AS_IF([test "x$CC" = x], [ + AC_MSG_ERROR([Unable to find required C compiler command.]) +]) dnl Static library option... INSTALLSTATIC="" -AC_ARG_ENABLE(static, [ --enable-static install static libraries]) +AC_ARG_ENABLE([static], AS_HELP_STRING([--enable-static], [install static libraries])) -if test x$enable_static = xyes; then - echo Installing static libraries... - INSTALLSTATIC="installstatic" -fi +AS_IF([test x$enable_static = xyes], [ + AC_MSG_NOTICE([Installing static libraries...]) + INSTALLSTATIC="installstatic" +]) -AC_SUBST(INSTALLSTATIC) +AC_SUBST([INSTALLSTATIC]) dnl Check for pkg-config, which is used for some other tests later on... -AC_PATH_TOOL(PKGCONFIG, pkg-config) +AC_PATH_TOOL([PKGCONFIG], [pkg-config]) dnl Check for libraries... -AC_SEARCH_LIBS(abs, m, AC_DEFINE(HAVE_ABS)) -AC_SEARCH_LIBS(crypt, crypt) -AC_SEARCH_LIBS(fmod, m) -AC_SEARCH_LIBS(getspent, sec gen) +AC_SEARCH_LIBS([abs], [m], [AC_DEFINE(HAVE_ABS)]) +AC_SEARCH_LIBS([crypt], [crypt]) +AC_SEARCH_LIBS([fmod], [m]) +AC_SEARCH_LIBS([getspent], [sec gen]) LIBMALLOC="" -AC_ARG_ENABLE(mallinfo, [ --enable-mallinfo build with malloc debug logging]) +AC_ARG_ENABLE([mallinfo], AS_HELP_STRING([--enable-mallinfo], [build with malloc debug logging])) -if test x$enable_mallinfo = xyes; then - SAVELIBS="$LIBS" - LIBS="" - AC_SEARCH_LIBS(mallinfo, malloc, AC_DEFINE(HAVE_MALLINFO)) - LIBMALLOC="$LIBS" - LIBS="$SAVELIBS" -fi +AS_IF([test x$enable_mallinfo = xyes], [ + SAVELIBS="$LIBS" + LIBS="" + AC_SEARCH_LIBS([mallinfo], [malloc], [AC_DEFINE(HAVE_MALLINFO)]) + LIBMALLOC="$LIBS" + LIBS="$SAVELIBS" +]) -AC_SUBST(LIBMALLOC) +AC_SUBST([LIBMALLOC]) dnl Check for libpaper support... -AC_ARG_ENABLE(libpaper, [ --enable-libpaper build with libpaper support]) - -if test x$enable_libpaper = xyes; then - AC_CHECK_LIB(paper,systempapername, - AC_DEFINE(HAVE_LIBPAPER) - LIBPAPER="-lpaper", - LIBPAPER="") -else +AC_ARG_ENABLE([libpaper], AS_HELP_STRING([--enable-libpaper], [build with libpaper support])) + +AS_IF([test x$enable_libpaper = xyes], [ + AC_CHECK_LIB([paper], [systempapername], [ + AC_DEFINE([HAVE_LIBPAPER], [1], [Have paper library?]) + LIBPAPER="-lpaper" + ], [ LIBPAPER="" -fi -AC_SUBST(LIBPAPER) + ]) +], [ + LIBPAPER="" +]) +AC_SUBST([LIBPAPER]) dnl Checks for header files. -AC_HEADER_STDC -AC_CHECK_HEADER(stdlib.h,AC_DEFINE(HAVE_STDLIB_H)) -AC_CHECK_HEADER(crypt.h,AC_DEFINE(HAVE_CRYPT_H)) -AC_CHECK_HEADER(langinfo.h,AC_DEFINE(HAVE_LANGINFO_H)) -AC_CHECK_HEADER(malloc.h,AC_DEFINE(HAVE_MALLOC_H)) -AC_CHECK_HEADER(shadow.h,AC_DEFINE(HAVE_SHADOW_H)) -AC_CHECK_HEADER(stdint.h,AC_DEFINE(HAVE_STDINT_H)) -AC_CHECK_HEADER(string.h,AC_DEFINE(HAVE_STRING_H)) -AC_CHECK_HEADER(strings.h,AC_DEFINE(HAVE_STRINGS_H)) -AC_CHECK_HEADER(bstring.h,AC_DEFINE(HAVE_BSTRING_H)) -AC_CHECK_HEADER(sys/ioctl.h,AC_DEFINE(HAVE_SYS_IOCTL_H)) -AC_CHECK_HEADER(sys/param.h,AC_DEFINE(HAVE_SYS_PARAM_H)) -AC_CHECK_HEADER(sys/ucred.h,AC_DEFINE(HAVE_SYS_UCRED_H)) +AC_CHECK_HEADER([crypt.h], AC_DEFINE([HAVE_CRYPT_H], [1], [Have header?])) +AC_CHECK_HEADER([langinfo.h], AC_DEFINE([HAVE_LANGINFO_H], [1], [Have header?])) +AC_CHECK_HEADER([malloc.h], AC_DEFINE([HAVE_MALLOC_H], [1], [Have header?])) +AC_CHECK_HEADER([shadow.h], AC_DEFINE([HAVE_SHADOW_H], [1], [Have header?])) +AC_CHECK_HEADER([stdint.h], AC_DEFINE([HAVE_STDINT_H], [1], [Have header?])) +AC_CHECK_HEADER([sys/ioctl.h], AC_DEFINE([HAVE_SYS_IOCTL_H], [1], [Have header?])) +AC_CHECK_HEADER([sys/param.h], AC_DEFINE([HAVE_SYS_PARAM_H], [1], [Have header?])) +AC_CHECK_HEADER([sys/ucred.h], AC_DEFINE([HAVE_SYS_UCRED_H], [1], [Have header?])) dnl Checks for iconv.h and iconv_open -AC_CHECK_HEADER(iconv.h, - SAVELIBS="$LIBS" - LIBS="" - AC_SEARCH_LIBS(iconv_open,iconv, - AC_DEFINE(HAVE_ICONV_H) - SAVELIBS="$SAVELIBS $LIBS") - AC_SEARCH_LIBS(libiconv_open,iconv, - AC_DEFINE(HAVE_ICONV_H) - SAVELIBS="$SAVELIBS $LIBS") - LIBS="$SAVELIBS") +AC_CHECK_HEADER([iconv.h], [ + SAVELIBS="$LIBS" + LIBS="" + AC_SEARCH_LIBS([iconv_open], [iconv], [ + AC_DEFINE([HAVE_ICONV_H], [1], [Have header?]) + SAVELIBS="$SAVELIBS $LIBS" + ]) + AC_SEARCH_LIBS([libiconv_open], [iconv], [ + AC_DEFINE([HAVE_ICONV_H], [1], [Have header?]) + SAVELIBS="$SAVELIBS $LIBS" + ]) + LIBS="$SAVELIBS" +]) dnl Checks for statfs and its many headers... -AC_CHECK_HEADER(sys/mount.h,AC_DEFINE(HAVE_SYS_MOUNT_H)) -AC_CHECK_HEADER(sys/statfs.h,AC_DEFINE(HAVE_SYS_STATFS_H)) -AC_CHECK_HEADER(sys/statvfs.h,AC_DEFINE(HAVE_SYS_STATVFS_H)) -AC_CHECK_HEADER(sys/vfs.h,AC_DEFINE(HAVE_SYS_VFS_H)) -AC_CHECK_FUNCS(statfs statvfs) +AC_CHECK_HEADER([sys/mount.h], AC_DEFINE([HAVE_SYS_MOUNT_H], [1], [Have header?])) +AC_CHECK_HEADER([sys/statfs.h], AC_DEFINE([HAVE_SYS_STATFS_H], [1], [Have header?])) +AC_CHECK_HEADER([sys/statvfs.h], AC_DEFINE([HAVE_SYS_STATVFS_H], [1], [Have header?])) +AC_CHECK_HEADER([sys/vfs.h], AC_DEFINE([HAVE_SYS_VFS_H], [1], [Have header?])) +AC_CHECK_FUNCS([statfs statvfs]) dnl Checks for string functions. -AC_CHECK_FUNCS(strdup strlcat strlcpy) -if test "$host_os_name" = "hp-ux" -a "$host_os_version" = "1020"; then - echo Forcing snprintf emulation for HP-UX. -else - AC_CHECK_FUNCS(snprintf vsnprintf) -fi +dnl TODO: Remove strdup, snprintf, and vsnprintf checks since they are C99? +AC_CHECK_FUNCS([strdup snprintf vsnprintf]) +AC_CHECK_FUNCS([strlcat strlcpy]) dnl Check for random number functions... -AC_CHECK_FUNCS(random lrand48 arc4random) +AC_CHECK_FUNCS([random lrand48 arc4random]) dnl Check for geteuid function. -AC_CHECK_FUNCS(geteuid) +AC_CHECK_FUNCS([geteuid]) dnl Check for setpgid function. -AC_CHECK_FUNCS(setpgid) +AC_CHECK_FUNCS([setpgid]) dnl Check for vsyslog function. -AC_CHECK_FUNCS(vsyslog) +AC_CHECK_FUNCS([vsyslog]) dnl Checks for signal functions. -case "$host_os_name" in - linux* | gnu*) - # Do not use sigset on Linux or GNU HURD - ;; - *) - # Use sigset on other platforms, if available - AC_CHECK_FUNCS(sigset) - ;; -esac - -AC_CHECK_FUNCS(sigaction) +AS_CASE(["$host_os_name"], [linux* | gnu*], [ + # Do not use sigset on Linux or GNU HURD +], [*], [ + # Use sigset on other platforms, if available + AC_CHECK_FUNCS([sigset]) +]) + +AC_CHECK_FUNCS([sigaction]) dnl Checks for wait functions. -AC_CHECK_FUNCS(waitpid wait3) +AC_CHECK_FUNCS([waitpid wait3]) dnl Check for posix_spawn -AC_CHECK_FUNCS(posix_spawn) +AC_CHECK_FUNCS([posix_spawn]) dnl Check for getgrouplist -AC_CHECK_FUNCS(getgrouplist) +AC_CHECK_FUNCS([getgrouplist]) dnl See if the tm structure has the tm_gmtoff member... -AC_MSG_CHECKING(for tm_gmtoff member in tm structure) -AC_TRY_COMPILE([#include ],[struct tm t; - int o = t.tm_gmtoff;], - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_TM_GMTOFF), - AC_MSG_RESULT(no)) +AC_MSG_CHECKING([for tm_gmtoff member in tm structure]) +AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([[#include ]], [[ + struct tm t; + int o = t.tm_gmtoff; + ]]) +], [ + AC_MSG_RESULT([yes]) + AC_DEFINE([HAVE_TM_GMTOFF], [1], [Have tm_gmtoff member in struct tm?]) +], [ + AC_MSG_RESULT([no]) +]) dnl See if the stat structure has the st_gen member... -AC_MSG_CHECKING(for st_gen member in stat structure) -AC_TRY_COMPILE([#include ],[struct stat t; - int o = t.st_gen;], - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_ST_GEN), - AC_MSG_RESULT(no)) +AC_MSG_CHECKING([for st_gen member in stat structure]) +AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([[#include ]], [[ + struct stat t; + int o = t.st_gen; + ]]) +], [ + AC_MSG_RESULT([yes]) + AC_DEFINE([HAVE_ST_GEN], [1], [Have st_gen member in struct stat?]) +], [ + AC_MSG_RESULT([no]) +]) dnl See if we have the removefile(3) function for securely removing files -AC_CHECK_FUNCS(removefile) +AC_CHECK_FUNCS([removefile]) dnl See if we have libusb... -AC_ARG_ENABLE(libusb, [ --enable-libusb use libusb for USB printing]) +AC_ARG_ENABLE([libusb], AS_HELP_STRING([--enable-libusb], [use libusb for USB printing])) LIBUSB="" USBQUIRKS="" -AC_SUBST(LIBUSB) -AC_SUBST(USBQUIRKS) - -if test "x$PKGCONFIG" != x; then - if test x$enable_libusb != xno -a $host_os_name != darwin; then - AC_MSG_CHECKING(for libusb-1.0) - if $PKGCONFIG --exists libusb-1.0; then - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_LIBUSB) - CFLAGS="$CFLAGS `$PKGCONFIG --cflags libusb-1.0`" - LIBUSB="`$PKGCONFIG --libs libusb-1.0`" - USBQUIRKS="\$(DATADIR)/usb" - else - AC_MSG_RESULT(no) - if test x$enable_libusb = xyes; then - AC_MSG_ERROR(libusb required for --enable-libusb.) - fi - fi - fi -elif test x$enable_libusb = xyes; then - AC_MSG_ERROR(Need pkg-config to enable libusb support.) -fi +AC_SUBST([LIBUSB]) +AC_SUBST([USBQUIRKS]) + +AS_IF([test "x$PKGCONFIG" != x], [ + AS_IF([test x$enable_libusb != xno -a $host_os_name != darwin], [ + AC_MSG_CHECKING([for libusb-1.0]) + AS_IF([$PKGCONFIG --exists libusb-1.0], [ + AC_MSG_RESULT([yes]) + AC_DEFINE([HAVE_LIBUSB], [1], [Have usb library?]) + CFLAGS="$CFLAGS $($PKGCONFIG --cflags libusb-1.0)" + LIBUSB="$($PKGCONFIG --libs libusb-1.0)" + USBQUIRKS="\$(DATADIR)/usb" + ], [ + AC_MSG_RESULT([no]) + AS_IF([test x$enable_libusb = xyes], [ + AC_MSG_ERROR([libusb required for --enable-libusb.]) + ]) + ]) + ]) +], [test x$enable_libusb = xyes], [ + AC_MSG_ERROR([Need pkg-config to enable libusb support.]) +]) dnl See if we have libwrap for TCP wrappers support... -AC_ARG_ENABLE(tcp_wrappers, [ --enable-tcp-wrappers use libwrap for TCP wrappers support]) +AC_ARG_ENABLE([tcp_wrappers], AS_HELP_STRING([--enable-tcp-wrappers], [use libwrap for TCP wrappers support])) LIBWRAP="" -AC_SUBST(LIBWRAP) +AC_SUBST([LIBWRAP]) -if test x$enable_tcp_wrappers = xyes; then - AC_CHECK_LIB(wrap, hosts_access,[ - AC_CHECK_HEADER(tcpd.h, - AC_DEFINE(HAVE_TCPD_H) - LIBWRAP="-lwrap")]) -fi +AS_IF([test x$enable_tcp_wrappers = xyes], [ + AC_CHECK_LIB([wrap], [hosts_access], [ + AC_CHECK_HEADER([tcpd.h], [ + AC_DEFINE([HAVE_TCPD_H], [1], [Have header?]) + LIBWRAP="-lwrap" + ]) + ]) +]) dnl ZLIB INSTALL_GZIP="" LIBZ="" -AC_CHECK_HEADER(zlib.h, - AC_CHECK_LIB(z, gzgets,[ - AC_DEFINE(HAVE_LIBZ) +AC_CHECK_HEADER([zlib.h], [ + AC_CHECK_LIB([z], [gzgets], [ + AC_DEFINE([HAVE_LIBZ], [1], [Have zlib library?]) LIBZ="-lz" LIBS="$LIBS -lz" - AC_CHECK_LIB(z, inflateCopy, AC_DEFINE(HAVE_INFLATECOPY)) - if test "x$GZIPPROG" != x; then - INSTALL_GZIP="-z" - fi])) -AC_SUBST(INSTALL_GZIP) -AC_SUBST(LIBZ) + AC_CHECK_LIB([z], [inflateCopy], [ + AC_DEFINE([HAVE_INFLATECOPY], [1], [Have inflateCopy function?]) + ]) + AS_IF([test "x$GZIPPROG" != x], [ + INSTALL_GZIP="-z" + ]) + ]) +]) +AC_SUBST([INSTALL_GZIP]) +AC_SUBST([LIBZ]) dnl Flags for "ar" command... -case $host_os_name in - darwin* | *bsd*) - ARFLAGS="-rcv" - ;; - *) - ARFLAGS="crvs" - ;; -esac - -AC_SUBST(ARFLAGS) +AS_CASE([host_os_name], [darwin* | *bsd*], [ + ARFLAGS="-rcv" +], [*], [ + ARFLAGS="crvs" +]) +AC_SUBST([ARFLAGS]) dnl Prep libraries specifically for cupsd and backends... BACKLIBS="" SERVERLIBS="" -AC_SUBST(BACKLIBS) -AC_SUBST(SERVERLIBS) +AC_SUBST([BACKLIBS]) +AC_SUBST([SERVERLIBS]) dnl See if we have POSIX ACL support... SAVELIBS="$LIBS" LIBS="" -AC_ARG_ENABLE(acl, [ --enable-acl build with POSIX ACL support]) -if test "x$enable_acl" != xno; then - AC_SEARCH_LIBS(acl_init, acl, AC_DEFINE(HAVE_ACL_INIT)) - SERVERLIBS="$SERVERLIBS $LIBS" -fi +AC_ARG_ENABLE([acl], AS_HELP_STRING([--enable-acl], [build with POSIX ACL support])) +AS_IF([test "x$enable_acl" != xno], [ + AC_SEARCH_LIBS([acl_init], [acl], [ + AC_DEFINE([HAVE_ACL_INIT], [1], [Have acl_init function?]) + ]) + SERVERLIBS="$SERVERLIBS $LIBS" +]) LIBS="$SAVELIBS" dnl Check for DBUS support @@ -297,37 +309,40 @@ DBUSDIR="" DBUS_NOTIFIER="" DBUS_NOTIFIERLIBS="" -AC_ARG_ENABLE(dbus, [ --disable-dbus build without DBUS support]) -AC_ARG_WITH(dbusdir, [ --with-dbusdir set DBUS configuration directory ], - DBUSDIR="$withval") - -if test "x$enable_dbus" != xno -a "x$PKGCONFIG" != x -a "x$host_os_name" != xdarwin; then - AC_MSG_CHECKING(for DBUS) - if $PKGCONFIG --exists dbus-1; then - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_DBUS) - CFLAGS="$CFLAGS `$PKGCONFIG --cflags dbus-1` -DDBUS_API_SUBJECT_TO_CHANGE" - SERVERLIBS="$SERVERLIBS `$PKGCONFIG --libs dbus-1`" - DBUS_NOTIFIER="dbus" - DBUS_NOTIFIERLIBS="`$PKGCONFIG --libs dbus-1`" - SAVELIBS="$LIBS" - LIBS="$LIBS $DBUS_NOTIFIERLIBS" - AC_CHECK_FUNC(dbus_message_iter_init_append, - AC_DEFINE(HAVE_DBUS_MESSAGE_ITER_INIT_APPEND)) - AC_CHECK_FUNC(dbus_threads_init, - AC_DEFINE(HAVE_DBUS_THREADS_INIT)) - LIBS="$SAVELIBS" - if test -d /etc/dbus-1 -a "x$DBUSDIR" = x; then - DBUSDIR="/etc/dbus-1" - fi - else - AC_MSG_RESULT(no) - fi -fi - -AC_SUBST(DBUSDIR) -AC_SUBST(DBUS_NOTIFIER) -AC_SUBST(DBUS_NOTIFIERLIBS) +AC_ARG_ENABLE([dbus], AS_HELP_STRING([--disable-dbus], [build without DBUS support])) +AC_ARG_WITH([dbusdir], AS_HELP_STRING([--with-dbusdir], [set DBUS configuration directory]), [ + DBUSDIR="$withval" +]) + +AS_IF([test "x$enable_dbus" != xno -a "x$PKGCONFIG" != x -a "x$host_os_name" != xdarwin], [ + AC_MSG_CHECKING([for DBUS]) + AS_IF([$PKGCONFIG --exists dbus-1], [ + AC_MSG_RESULT([yes]) + AC_DEFINE([HAVE_DBUS], [1], [Have dbus library?]) + CFLAGS="$CFLAGS $($PKGCONFIG --cflags dbus-1) -DDBUS_API_SUBJECT_TO_CHANGE" + SERVERLIBS="$SERVERLIBS $($PKGCONFIG --libs dbus-1)" + DBUS_NOTIFIER="dbus" + DBUS_NOTIFIERLIBS="$($PKGCONFIG --libs dbus-1)" + SAVELIBS="$LIBS" + LIBS="$LIBS $DBUS_NOTIFIERLIBS" + AC_CHECK_FUNC([dbus_message_iter_init_append], [ + AC_DEFINE([HAVE_DBUS_MESSAGE_ITER_INIT_APPEND], [1], [Have dbus_message_iter_init_append function?]) + ]) + AC_CHECK_FUNC([dbus_threads_init], [ + AC_DEFINE([HAVE_DBUS_THREADS_INIT], [1], [Have dbus_threads_init function?]) + ]) + LIBS="$SAVELIBS" + AS_IF([test -d /etc/dbus-1 -a "x$DBUSDIR" = x], [ + DBUSDIR="/etc/dbus-1" + ]) + ], [ + AC_MSG_RESULT([no]) + ]) +]) + +AC_SUBST([DBUSDIR]) +AC_SUBST([DBUS_NOTIFIER]) +AC_SUBST([DBUS_NOTIFIERLIBS]) dnl Extra platform-specific libraries... CUPS_DEFAULT_PRINTOPERATOR_AUTH="@SYSTEM" @@ -335,96 +350,99 @@ CUPS_DEFAULT_SYSTEM_AUTHKEY="" CUPS_SYSTEM_AUTHKEY="" INSTALLXPC="" -case $host_os_name in - darwin*) - BACKLIBS="$BACKLIBS -framework IOKit" - SERVERLIBS="$SERVERLIBS -framework IOKit -weak_framework ApplicationServices" - LIBS="-framework CoreFoundation -framework Security $LIBS" - - dnl Check for framework headers... - AC_CHECK_HEADER(ApplicationServices/ApplicationServices.h,AC_DEFINE(HAVE_APPLICATIONSERVICES_H)) - AC_CHECK_HEADER(CoreFoundation/CoreFoundation.h,AC_DEFINE(HAVE_COREFOUNDATION_H)) - - dnl Check for dynamic store function... - SAVELIBS="$LIBS" - LIBS="-framework SystemConfiguration $LIBS" - AC_CHECK_FUNCS(SCDynamicStoreCopyComputerName,[ - AC_DEFINE(HAVE_SCDYNAMICSTORECOPYCOMPUTERNAME)],[ - LIBS="$SAVELIBS"]) - - dnl Check for the new membership functions in MacOSX 10.4... - AC_CHECK_HEADER(membership.h,AC_DEFINE(HAVE_MEMBERSHIP_H)) - AC_CHECK_FUNCS(mbr_uid_to_uuid) - - dnl Need header... - AC_CHECK_HEADER(dlfcn.h,AC_DEFINE(HAVE_DLFCN_H)) - - dnl Check for notify_post support - AC_CHECK_HEADER(notify.h,AC_DEFINE(HAVE_NOTIFY_H)) - AC_CHECK_FUNCS(notify_post) - - dnl Check for Authorization Services support - AC_ARG_WITH(adminkey, [ --with-adminkey set the default SystemAuthKey value], - default_adminkey="$withval", - default_adminkey="default") - AC_ARG_WITH(operkey, [ --with-operkey set the default operator @AUTHKEY value], - default_operkey="$withval", - default_operkey="default") - - AC_CHECK_HEADER(Security/Authorization.h, [ - AC_DEFINE(HAVE_AUTHORIZATION_H) - - if test "x$default_adminkey" != xdefault; then - CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey $default_adminkey" - CUPS_DEFAULT_SYSTEM_AUTHKEY="$default_adminkey" - else - CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.print.admin" - CUPS_DEFAULT_SYSTEM_AUTHKEY="system.print.admin" - fi - - if test "x$default_operkey" != xdefault; then - CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY($default_operkey) @admin @lpadmin" - else - CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY(system.print.operator) @admin @lpadmin" - fi]) - - dnl Check for sandbox/Seatbelt support - if test $host_os_version -ge 100; then - AC_CHECK_HEADER(sandbox.h,AC_DEFINE(HAVE_SANDBOX_H)) - fi - if test $host_os_version -ge 110 -a $host_os_version -lt 120; then - # Broken public headers in 10.7.x... - AC_MSG_CHECKING(for sandbox/private.h presence) - if test -f /usr/local/include/sandbox/private.h; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - AC_MSG_ERROR(Run 'sudo mkdir -p /usr/local/include/sandbox' and 'sudo touch /usr/local/include/sandbox/private.h' to build CUPS.) - fi - fi - - dnl Check for XPC support - AC_CHECK_HEADER(xpc/xpc.h, - AC_DEFINE(HAVE_XPC) - INSTALLXPC="install-xpc") - ;; -esac - -AC_SUBST(CUPS_DEFAULT_PRINTOPERATOR_AUTH) -AC_DEFINE_UNQUOTED(CUPS_DEFAULT_PRINTOPERATOR_AUTH, "$CUPS_DEFAULT_PRINTOPERATOR_AUTH") -AC_DEFINE_UNQUOTED(CUPS_DEFAULT_SYSTEM_AUTHKEY, "$CUPS_DEFAULT_SYSTEM_AUTHKEY") -AC_SUBST(CUPS_SYSTEM_AUTHKEY) -AC_SUBST(INSTALLXPC) +AS_CASE([host_os_name], [darwin*], [ + BACKLIBS="$BACKLIBS -framework IOKit" + SERVERLIBS="$SERVERLIBS -framework IOKit -weak_framework ApplicationServices" + LIBS="-framework CoreFoundation -framework Security $LIBS" + + dnl Check for framework headers... + AC_CHECK_HEADER([ApplicationServices/ApplicationServices.h], [ + AC_DEFINE([HAVE_APPLICATIONSERVICES_H], [1], [Have ?]) + ]) + AC_CHECK_HEADER([CoreFoundation/CoreFoundation.h], [ + AC_DEFINE([HAVE_COREFOUNDATION_H], [1], [Have ?]) + ]) + + dnl Check for dynamic store function... + SAVELIBS="$LIBS" + LIBS="-framework SystemConfiguration $LIBS" + AC_CHECK_FUNCS([SCDynamicStoreCopyComputerName], [ + AC_DEFINE([HAVE_SCDYNAMICSTORECOPYCOMPUTERNAME], [1], [Have SCDynamicStoreCopyComputerName function?]) + ],[ + LIBS="$SAVELIBS" + ]) + + dnl Check for the new membership functions in MacOSX 10.4... + AC_CHECK_HEADER([membership.h], [ + AC_DEFINE([HAVE_MEMBERSHIP_H], [1], [Have ?]) + ]) + AC_CHECK_FUNCS([mbr_uid_to_uuid]) + + dnl Need header... + AC_CHECK_HEADER([dlfcn.h], [ + AC_DEFINE([HAVE_DLFCN_H], [1], [Have ?]) + ]) + + dnl Check for notify_post support + AC_CHECK_HEADER([notify.h], [ + AC_DEFINE([HAVE_NOTIFY_H], [1], [Have ?]) + ]) + AC_CHECK_FUNCS(notify_post) + + dnl Check for Authorization Services support + AC_ARG_WITH([adminkey], AS_HELP_STRING([--with-adminkey], [set the default SystemAuthKey value]), [ + default_adminkey="$withval" + ], [ + default_adminkey="default" + ]) + AC_ARG_WITH([operkey], AS_HELP_STRING([--with-operkey], [set the default operator @AUTHKEY value]), [ + default_operkey="$withval" + ], [ + default_operkey="default" + ]) + + AC_CHECK_HEADER([Security/Authorization.h], [ + AC_DEFINE([HAVE_AUTHORIZATION_H], [1], [Have ?]) + + AS_IF([test "x$default_adminkey" != xdefault], [ + CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey $default_adminkey" + CUPS_DEFAULT_SYSTEM_AUTHKEY="$default_adminkey" + ], [ + CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.print.admin" + CUPS_DEFAULT_SYSTEM_AUTHKEY="system.print.admin" + ]) + + AS_IF([test "x$default_operkey" != xdefault], [ + CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY($default_operkey) @admin @lpadmin" + ], [ + CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY(system.print.operator) @admin @lpadmin" + ]) + ]) + + dnl Check for sandbox/Seatbelt support + AC_CHECK_HEADER([sandbox.h], [ + AC_DEFINE([HAVE_SANDBOX_H], [1], [Have ?]) + ]) + + dnl Check for XPC support + AC_CHECK_HEADER([xpc/xpc.h], [ + AC_DEFINE([HAVE_XPC], [1], [Have ?]) + INSTALLXPC="install-xpc" + ]) +]) + +AC_SUBST([CUPS_DEFAULT_PRINTOPERATOR_AUTH]) +AC_DEFINE_UNQUOTED([CUPS_DEFAULT_PRINTOPERATOR_AUTH], ["$CUPS_DEFAULT_PRINTOPERATOR_AUTH"], [Default authorization for print operators?]) +AC_DEFINE_UNQUOTED([CUPS_DEFAULT_SYSTEM_AUTHKEY], ["$CUPS_DEFAULT_SYSTEM_AUTHKEY"], [Default system authorization key for macOS?]) +AC_SUBST([CUPS_SYSTEM_AUTHKEY]) +AC_SUBST([INSTALLXPC]) dnl Check for build components COMPONENTS="all" -AC_ARG_WITH(components, [ --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], - COMPONENTS="$withval") +AC_ARG_WITH([components], AS_HELP_STRING([--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]), [ + COMPONENTS="$withval" +]) cupsimagebase="cupsimage" IPPEVECOMMANDS="ippevepcl ippeveps" @@ -432,45 +450,33 @@ LIBCUPSOBJS="\$(COREOBJS) \$(DRIVEROBJS)" LIBHEADERS="\$(COREHEADERS) \$(DRIVERHEADERS)" LIBHEADERSPRIV="\$(COREHEADERSPRIV) \$(DRIVERHEADERSPRIV)" -case "$COMPONENTS" in - all) - BUILDDIRS="tools filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates" - ;; - - core) - BUILDDIRS="tools examples locale" - ;; - - corelite) - AC_DEFINE(CUPS_LITE) - BUILDDIRS="tools examples locale" - cupsimagebase="" - LIBCUPSOBJS="\$(COREOBJS)" - LIBHEADERS="\$(COREHEADERS)" - LIBHEADERSPRIV="\$(COREHEADERSPRIV)" - ;; - - libcups) - BUILDDIRS="locale" - cupsimagebase="" - ;; - - libcupslite) - AC_DEFINE(CUPS_LITE) - BUILDDIRS="locale" - cupsimagebase="" - LIBCUPSOBJS="\$(COREOBJS)" - LIBHEADERS="\$(COREHEADERS)" - LIBHEADERSPRIV="\$(COREHEADERSPRIV)" - ;; - - *) - AC_MSG_ERROR([Bad build component "$COMPONENT" specified!]) - ;; -esac - -AC_SUBST(BUILDDIRS) -AC_SUBST(IPPEVECOMMANDS) -AC_SUBST(LIBCUPSOBJS) -AC_SUBST(LIBHEADERS) -AC_SUBST(LIBHEADERSPRIV) +AS_CASE(["$COMPONENTS"], [all], [ + BUILDDIRS="tools filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates" +], [core], [ + BUILDDIRS="tools examples locale" +], [corelite], [ + AC_DEFINE([CUPS_LITE], [1], [Building CUPS without driver support?]) + BUILDDIRS="tools examples locale" + cupsimagebase="" + LIBCUPSOBJS="\$(COREOBJS)" + LIBHEADERS="\$(COREHEADERS)" + LIBHEADERSPRIV="\$(COREHEADERSPRIV)" +], [libcups], [ + BUILDDIRS="locale" + cupsimagebase="" +], [libcupslite], [ + AC_DEFINE([CUPS_LITE], [1], [Building CUPS without driver support?]) + BUILDDIRS="locale" + cupsimagebase="" + LIBCUPSOBJS="\$(COREOBJS)" + LIBHEADERS="\$(COREHEADERS)" + LIBHEADERSPRIV="\$(COREHEADERSPRIV)" +], [*], [ + AC_MSG_ERROR([Bad build component "$COMPONENT" specified.]) +]) + +AC_SUBST([BUILDDIRS]) +AC_SUBST([IPPEVECOMMANDS]) +AC_SUBST([LIBCUPSOBJS]) +AC_SUBST([LIBHEADERS]) +AC_SUBST([LIBHEADERSPRIV]) diff --git a/config-scripts/cups-ssl.m4 b/config-scripts/cups-tls.m4 similarity index 100% rename from config-scripts/cups-ssl.m4 rename to config-scripts/cups-tls.m4 diff --git a/config.h.in b/config.h.in index 281990abb3..b9391d7fdd 100644 --- a/config.h.in +++ b/config.h.in @@ -1,7 +1,7 @@ /* * Configuration file for CUPS. * - * Copyright 2020 by OpenPrinting + * Copyright 2020-2021 by OpenPrinting * Copyright 2007-2019 by Apple Inc. * Copyright 1997-2007 by Easy Software Products. * @@ -189,15 +189,6 @@ #undef HAVE_STDINT_H -/* - * Use , , and/or ? - */ - -#undef HAVE_STRING_H -#undef HAVE_STRINGS_H -#undef HAVE_BSTRING_H - - /* * Do we have the long long type? */ diff --git a/configure b/configure index 156e5472f9..f2b2aa6308 100755 --- a/configure +++ b/configure @@ -1,11 +1,12 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.70 for CUPS 2.4.0. +# Generated by GNU Autoconf 2.71 for CUPS 2.4rc1. # # Report bugs to . # # -# Copyright (C) 1992-1996, 1998-2017, 2020 Free Software Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, +# Inc. # # # This configure script is free software; the Free Software Foundation @@ -181,8 +182,7 @@ test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && - test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 -test \$(( 1 + 1 )) = 2 || exit 1" + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1" if (eval "$as_required") 2>/dev/null then : as_have_required=yes @@ -610,8 +610,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='CUPS' PACKAGE_TARNAME='cups' -PACKAGE_VERSION='2.4.0' -PACKAGE_STRING='CUPS 2.4.0' +PACKAGE_VERSION='2.4rc1' +PACKAGE_STRING='CUPS 2.4rc1' PACKAGE_BUGREPORT='https://github.com/openprinting/cups/issues' PACKAGE_URL='https://openprinting.github.io/cups' @@ -777,8 +777,6 @@ INSTALL_GZIP LIBWRAP USBQUIRKS LIBUSB -EGREP -GREP LIBPAPER LIBMALLOC PKGCONFIG @@ -1515,7 +1513,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.4.0 to adapt to many kinds of systems. +\`configure' configures CUPS 2.4rc1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1581,7 +1579,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of CUPS 2.4.0:";; + short | recursive ) echo "Configuration of CUPS 2.4rc1:";; esac cat <<\_ACEOF @@ -1630,15 +1628,14 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-cups-build set "cups-config --build" string + --with-cups-build set "pkg-config --variable=build" string --with-dbusdir set DBUS configuration directory --with-adminkey set the default SystemAuthKey value --with-operkey set the default operator @AUTHKEY value - --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-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 @@ -1770,10 +1767,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -CUPS configure 2.4.0 -generated by GNU Autoconf 2.70 +CUPS configure 2.4rc1 +generated by GNU Autoconf 2.71 -Copyright (C) 2020 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -2125,8 +2122,8 @@ 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.4.0, which was -generated by GNU Autoconf 2.70. Invocation command line was +It was created by CUPS $as_me 2.4rc1, which was +generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3246,7 +3243,7 @@ done ac_config_headers="$ac_config_headers config.h" -CUPS_VERSION="2.4.0" +CUPS_VERSION="2.4rc1" CUPS_REVISION="" CUPS_BUILD="cups-$CUPS_VERSION" @@ -3254,15 +3251,19 @@ CUPS_BUILD="cups-$CUPS_VERSION" # Check whether --with-cups_build was given. if test ${with_cups_build+y} then : - withval=$with_cups_build; CUPS_BUILD="$withval" + withval=$with_cups_build; + CUPS_BUILD="$withval" + fi + printf "%s\n" "#define CUPS_SVERSION \"CUPS v$CUPS_VERSION$CUPS_REVISION\"" >>confdefs.h + printf "%s\n" "#define CUPS_MINIMAL \"CUPS/$CUPS_VERSION$CUPS_REVISION\"" >>confdefs.h @@ -3333,7 +3334,217 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then - for ac_prog in clang cc gcc + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + + fi +fi +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + ac_prog_rejected=no +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" + fi +fi +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl.exe do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -3382,7 +3593,7 @@ fi fi if test -z "$CC"; then ac_ct_CC=$CC - for ac_prog in clang cc gcc + for ac_prog in cl.exe do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -3442,6 +3653,112 @@ esac fi fi +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args. +set dummy ${ac_tool_prefix}clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "clang", so it can be a program name with args. +set dummy clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +fi + test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} @@ -3851,7 +4168,10 @@ else CFLAGS= fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 +ac_prog_cc_stdc=no +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 printf %s "checking for $CC option to enable C11 features... " >&6; } if test ${ac_cv_prog_cc_c11+y} then : @@ -3875,28 +4195,28 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam done rm -f conftest.$ac_ext CC=$ac_save_CC - fi -# AC_CACHE_VAL -ac_prog_cc_stdc_options= -case "x$ac_cv_prog_cc_c11" in #( - x) : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } ;; #( - xno) : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } ;; #( - *) : - ac_prog_cc_stdc_options=" $ac_cv_prog_cc_c11" - CC="$CC$ac_prog_cc_stdc_options" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 -printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c11" != xno + +if test "x$ac_cv_prog_cc_c11" = xno then : - ac_prog_cc_stdc=c11 - ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c11" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } + CC="$CC $ac_cv_prog_cc_c11" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 + ac_prog_cc_stdc=c11 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 printf %s "checking for $CC option to enable C99 features... " >&6; } if test ${ac_cv_prog_cc_c99+y} @@ -3907,9 +4227,9 @@ else $as_nop ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_c_conftest_c89_program +$ac_c_conftest_c99_program _ACEOF -for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc1x -qlanglvl=extc99 +for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= do CC="$ac_save_CC $ac_arg" if ac_fn_c_try_compile "$LINENO" @@ -3921,28 +4241,28 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam done rm -f conftest.$ac_ext CC=$ac_save_CC - fi -# AC_CACHE_VAL -ac_prog_cc_stdc_options= -case "x$ac_cv_prog_cc_c99" in #( - x) : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } ;; #( - xno) : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } ;; #( - *) : - ac_prog_cc_stdc_options=" $ac_cv_prog_cc_c99" - CC="$CC$ac_prog_cc_stdc_options" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 -printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c99" != xno + +if test "x$ac_cv_prog_cc_c99" = xno then : - ac_prog_cc_stdc=c99 - ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } else $as_nop + if test "x$ac_cv_prog_cc_c99" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } + CC="$CC $ac_cv_prog_cc_c99" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 + ac_prog_cc_stdc=c99 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 printf %s "checking for $CC option to enable C89 features... " >&6; } if test ${ac_cv_prog_cc_c89+y} @@ -3955,8 +4275,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_c_conftest_c89_program _ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" if ac_fn_c_try_compile "$LINENO" @@ -3968,34 +4287,25 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam done rm -f conftest.$ac_ext CC=$ac_save_CC - fi -# AC_CACHE_VAL -ac_prog_cc_stdc_options= -case "x$ac_cv_prog_cc_c89" in #( - x) : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } ;; #( - xno) : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } ;; #( - *) : - ac_prog_cc_stdc_options=" $ac_cv_prog_cc_c89" - CC="$CC$ac_prog_cc_stdc_options" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c89" != xno + +if test "x$ac_cv_prog_cc_c89" = xno then : - ac_prog_cc_stdc=c89 - ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } else $as_nop - ac_prog_cc_stdc=no - ac_cv_prog_cc_stdc=no + if test "x$ac_cv_prog_cc_c89" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } + CC="$CC $ac_cv_prog_cc_c89" fi - + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 + ac_prog_cc_stdc=c89 fi - fi ac_ext=c @@ -4152,7 +4462,7 @@ if test -z "$CXX"; then CXX=$CCC else if test -n "$ac_tool_prefix"; then - for ac_prog in clang++ c++ g++ + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -4201,7 +4511,7 @@ fi fi if test -z "$CXX"; then ac_ct_CXX=$CXX - for ac_prog in clang++ c++ g++ + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -4411,19 +4721,22 @@ else CXXFLAGS= fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5 +ac_prog_cxx_stdcxx=no +if test x$ac_prog_cxx_stdcxx = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5 printf %s "checking for $CXX option to enable C++11 features... " >&6; } -if test ${ac_cv_prog_cxx_cxx11+y} +if test ${ac_cv_prog_cxx_11+y} then : printf %s "(cached) " >&6 else $as_nop - ac_cv_prog_cxx_cxx11=no + ac_cv_prog_cxx_11=no ac_save_CXX=$CXX cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_cxx_conftest_cxx11_program _ACEOF -for ac_arg in '' -std=gnu++11 -std=c++11 -std=gnu++0x -std=c++0x -qlanglvl=extended0x -AA +for ac_arg in '' -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x -qlanglvl=extended0x -AA do CXX="$ac_save_CXX $ac_arg" if ac_fn_cxx_try_compile "$LINENO" @@ -4435,36 +4748,35 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam done rm -f conftest.$ac_ext CXX=$ac_save_CXX - fi -# AC_CACHE_VAL -ac_prog_cxx_stdcxx_options= -case "x$ac_cv_prog_cxx_cxx11" in #( - x) : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } ;; #( - xno) : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } ;; #( - *) : - ac_prog_cxx_stdcxx_options=" $ac_cv_prog_cxx_cxx11" - CXX=$CXX$ac_prog_cxx_stdcxx_options - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5 -printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; } ;; -esac -if test "x$ac_cv_prog_cxx_cxx11" != xno + +if test "x$ac_cv_prog_cxx_cxx11" = xno then : - ac_prog_cxx_stdcxx=cxx11 - ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11 - ac_cv_prog_cxx_cxx98=$ac_cv_prog_cxx_cxx11 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cxx_cxx11" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5 +printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; } + CXX="$CXX $ac_cv_prog_cxx_cxx11" +fi + ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11 + ac_prog_cxx_stdcxx=cxx11 +fi +fi +if test x$ac_prog_cxx_stdcxx = xno +then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5 printf %s "checking for $CXX option to enable C++98 features... " >&6; } -if test ${ac_cv_prog_cxx_cxx98+y} +if test ${ac_cv_prog_cxx_98+y} then : printf %s "(cached) " >&6 else $as_nop - ac_cv_prog_cxx_cxx98=no + ac_cv_prog_cxx_98=no ac_save_CXX=$CXX cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -4482,32 +4794,25 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam done rm -f conftest.$ac_ext CXX=$ac_save_CXX - fi -# AC_CACHE_VAL -ac_prog_cxx_stdcxx_options= -case "x$ac_cv_prog_cxx_cxx98" in #( - x) : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } ;; #( - xno) : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } ;; #( - *) : - ac_prog_cxx_stdcxx_options=" $ac_cv_prog_cxx_cxx98" - CXX=$CXX$ac_prog_cxx_stdcxx_options - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5 -printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; } ;; -esac -if test "x$ac_cv_prog_cxx_cxx98" != xno + +if test "x$ac_cv_prog_cxx_cxx98" = xno then : - ac_prog_cxx_stdcxx=cxx98 - ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cxx_cxx98" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } else $as_nop - ac_prog_cxx_stdcxx=no - ac_cv_prog_cxx_stdcxx=no + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5 +printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; } + CXX="$CXX $ac_cv_prog_cxx_cxx98" +fi + ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98 + ac_prog_cxx_stdcxx=cxx98 fi - fi ac_ext=c @@ -5120,18 +5425,29 @@ fi -if test "x$XDGOPEN" = x; then - CUPS_HTMLVIEW="htmlview" -else - CUPS_HTMLVIEW="$XDGOPEN" +if test "x$XDGOPEN" = x +then : + + CUPS_HTMLVIEW="htmlview" + +else $as_nop + + CUPS_HTMLVIEW="$XDGOPEN" + fi -if test "x$AR" = x; then - as_fn_error $? "Unable to find required library archive command." "$LINENO" 5 +if test "x$AR" = x +then : + + as_fn_error $? "Unable to find required library archive command." "$LINENO" 5 + fi -if test "x$CC" = x; then - as_fn_error $? "Unable to find required C compiler command." "$LINENO" 5 +if test "x$CC" = x +then : + + as_fn_error $? "Unable to find required C compiler command." "$LINENO" 5 + fi INSTALLSTATIC="" @@ -5142,9 +5458,13 @@ then : fi -if test x$enable_static = xyes; then - echo Installing static libraries... - INSTALLSTATIC="installstatic" +if test x$enable_static = xyes +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Installing static libraries..." >&5 +printf "%s\n" "$as_me: Installing static libraries..." >&6;} + INSTALLSTATIC="installstatic" + fi @@ -5505,10 +5825,12 @@ then : fi -if test x$enable_mallinfo = xyes; then - SAVELIBS="$LIBS" - LIBS="" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing mallinfo" >&5 +if test x$enable_mallinfo = xyes +then : + + SAVELIBS="$LIBS" + LIBS="" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing mallinfo" >&5 printf %s "checking for library containing mallinfo... " >&6; } if test ${ac_cv_search_mallinfo+y} then : @@ -5568,8 +5890,9 @@ then : fi - LIBMALLOC="$LIBS" - LIBS="$SAVELIBS" + LIBMALLOC="$LIBS" + LIBS="$SAVELIBS" + fi @@ -5581,8 +5904,10 @@ then : fi -if test x$enable_libpaper = xyes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for systempapername in -lpaper" >&5 +if test x$enable_libpaper = xyes +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for systempapername in -lpaper" >&5 printf %s "checking for systempapername in -lpaper... " >&6; } if test ${ac_cv_lib_paper_systempapername+y} then : @@ -5619,15 +5944,23 @@ fi printf "%s\n" "$ac_cv_lib_paper_systempapername" >&6; } if test "x$ac_cv_lib_paper_systempapername" = xyes then : - printf "%s\n" "#define HAVE_LIBPAPER 1" >>confdefs.h - LIBPAPER="-lpaper" + +printf "%s\n" "#define HAVE_LIBPAPER 1" >>confdefs.h + + LIBPAPER="-lpaper" + else $as_nop - LIBPAPER="" -fi -else LIBPAPER="" + +fi + + +else $as_nop + + LIBPAPER="" + fi @@ -5660,233 +5993,67 @@ then : printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -printf %s "checking for grep that handles long lines and -e... " >&6; } -if test ${ac_cv_path_GREP+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -z "$GREP"; then - ac_path_GREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_prog in grep ggrep - do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_GREP" || continue -# Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - printf %s 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - printf "%s\n" 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_GREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_GREP=$GREP -fi - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -printf "%s\n" "$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" - - -# Autoupdate added the next two lines to ensure that your configure -# script's behavior did not change. They are probably safe to remove. - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -printf %s "checking for egrep... " >&6; } -if test ${ac_cv_path_EGREP+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - if test -z "$EGREP"; then - ac_path_EGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_prog in egrep - do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_EGREP" || continue -# Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -*) - ac_count=0 - printf %s 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - printf "%s\n" 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_EGREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_EGREP"; then - as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_EGREP=$EGREP -fi - - fi -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -printf "%s\n" "$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" - - - -ac_fn_c_check_header_compile "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" -if test "x$ac_cv_header_stdlib_h" = xyes -then : - printf "%s\n" "#define HAVE_STDLIB_H 1" >>confdefs.h - -fi - ac_fn_c_check_header_compile "$LINENO" "crypt.h" "ac_cv_header_crypt_h" "$ac_includes_default" if test "x$ac_cv_header_crypt_h" = xyes then : - printf "%s\n" "#define HAVE_CRYPT_H 1" >>confdefs.h + +printf "%s\n" "#define HAVE_CRYPT_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "langinfo.h" "ac_cv_header_langinfo_h" "$ac_includes_default" if test "x$ac_cv_header_langinfo_h" = xyes then : - printf "%s\n" "#define HAVE_LANGINFO_H 1" >>confdefs.h + +printf "%s\n" "#define HAVE_LANGINFO_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "malloc.h" "ac_cv_header_malloc_h" "$ac_includes_default" if test "x$ac_cv_header_malloc_h" = xyes then : - printf "%s\n" "#define HAVE_MALLOC_H 1" >>confdefs.h + +printf "%s\n" "#define HAVE_MALLOC_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "shadow.h" "ac_cv_header_shadow_h" "$ac_includes_default" if test "x$ac_cv_header_shadow_h" = xyes then : - printf "%s\n" "#define HAVE_SHADOW_H 1" >>confdefs.h + +printf "%s\n" "#define HAVE_SHADOW_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default" if test "x$ac_cv_header_stdint_h" = xyes then : - printf "%s\n" "#define HAVE_STDINT_H 1" >>confdefs.h -fi - -ac_fn_c_check_header_compile "$LINENO" "string.h" "ac_cv_header_string_h" "$ac_includes_default" -if test "x$ac_cv_header_string_h" = xyes -then : - printf "%s\n" "#define HAVE_STRING_H 1" >>confdefs.h - -fi - -ac_fn_c_check_header_compile "$LINENO" "strings.h" "ac_cv_header_strings_h" "$ac_includes_default" -if test "x$ac_cv_header_strings_h" = xyes -then : - printf "%s\n" "#define HAVE_STRINGS_H 1" >>confdefs.h - -fi - -ac_fn_c_check_header_compile "$LINENO" "bstring.h" "ac_cv_header_bstring_h" "$ac_includes_default" -if test "x$ac_cv_header_bstring_h" = xyes -then : - printf "%s\n" "#define HAVE_BSTRING_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_STDINT_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "sys/ioctl.h" "ac_cv_header_sys_ioctl_h" "$ac_includes_default" if test "x$ac_cv_header_sys_ioctl_h" = xyes then : - printf "%s\n" "#define HAVE_SYS_IOCTL_H 1" >>confdefs.h + +printf "%s\n" "#define HAVE_SYS_IOCTL_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" "$ac_includes_default" if test "x$ac_cv_header_sys_param_h" = xyes then : - printf "%s\n" "#define HAVE_SYS_PARAM_H 1" >>confdefs.h + +printf "%s\n" "#define HAVE_SYS_PARAM_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "sys/ucred.h" "ac_cv_header_sys_ucred_h" "$ac_includes_default" if test "x$ac_cv_header_sys_ucred_h" = xyes then : - printf "%s\n" "#define HAVE_SYS_UCRED_H 1" >>confdefs.h + +printf "%s\n" "#define HAVE_SYS_UCRED_H 1" >>confdefs.h fi @@ -5894,9 +6061,10 @@ fi ac_fn_c_check_header_compile "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default" if test "x$ac_cv_header_iconv_h" = xyes then : - SAVELIBS="$LIBS" - LIBS="" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing iconv_open" >&5 + + SAVELIBS="$LIBS" + LIBS="" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing iconv_open" >&5 printf %s "checking for library containing iconv_open... " >&6; } if test ${ac_cv_search_iconv_open+y} then : @@ -5952,12 +6120,15 @@ ac_res=$ac_cv_search_iconv_open if test "$ac_res" != no then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - printf "%s\n" "#define HAVE_ICONV_H 1" >>confdefs.h - SAVELIBS="$SAVELIBS $LIBS" + +printf "%s\n" "#define HAVE_ICONV_H 1" >>confdefs.h + + SAVELIBS="$SAVELIBS $LIBS" + fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing libiconv_open" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing libiconv_open" >&5 printf %s "checking for library containing libiconv_open... " >&6; } if test ${ac_cv_search_libiconv_open+y} then : @@ -6013,40 +6184,48 @@ ac_res=$ac_cv_search_libiconv_open if test "$ac_res" != no then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - printf "%s\n" "#define HAVE_ICONV_H 1" >>confdefs.h - SAVELIBS="$SAVELIBS $LIBS" + +printf "%s\n" "#define HAVE_ICONV_H 1" >>confdefs.h + + SAVELIBS="$SAVELIBS $LIBS" + fi - LIBS="$SAVELIBS" + LIBS="$SAVELIBS" + fi ac_fn_c_check_header_compile "$LINENO" "sys/mount.h" "ac_cv_header_sys_mount_h" "$ac_includes_default" if test "x$ac_cv_header_sys_mount_h" = xyes then : - printf "%s\n" "#define HAVE_SYS_MOUNT_H 1" >>confdefs.h + +printf "%s\n" "#define HAVE_SYS_MOUNT_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "sys/statfs.h" "ac_cv_header_sys_statfs_h" "$ac_includes_default" if test "x$ac_cv_header_sys_statfs_h" = xyes then : - printf "%s\n" "#define HAVE_SYS_STATFS_H 1" >>confdefs.h + +printf "%s\n" "#define HAVE_SYS_STATFS_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "sys/statvfs.h" "ac_cv_header_sys_statvfs_h" "$ac_includes_default" if test "x$ac_cv_header_sys_statvfs_h" = xyes then : - printf "%s\n" "#define HAVE_SYS_STATVFS_H 1" >>confdefs.h + +printf "%s\n" "#define HAVE_SYS_STATVFS_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "sys/vfs.h" "ac_cv_header_sys_vfs_h" "$ac_includes_default" if test "x$ac_cv_header_sys_vfs_h" = xyes then : - printf "%s\n" "#define HAVE_SYS_VFS_H 1" >>confdefs.h + +printf "%s\n" "#define HAVE_SYS_VFS_H 1" >>confdefs.h fi @@ -6070,36 +6249,32 @@ then : printf "%s\n" "#define HAVE_STRDUP 1" >>confdefs.h fi -ac_fn_c_check_func "$LINENO" "strlcat" "ac_cv_func_strlcat" -if test "x$ac_cv_func_strlcat" = xyes +ac_fn_c_check_func "$LINENO" "snprintf" "ac_cv_func_snprintf" +if test "x$ac_cv_func_snprintf" = xyes then : - printf "%s\n" "#define HAVE_STRLCAT 1" >>confdefs.h + printf "%s\n" "#define HAVE_SNPRINTF 1" >>confdefs.h fi -ac_fn_c_check_func "$LINENO" "strlcpy" "ac_cv_func_strlcpy" -if test "x$ac_cv_func_strlcpy" = xyes +ac_fn_c_check_func "$LINENO" "vsnprintf" "ac_cv_func_vsnprintf" +if test "x$ac_cv_func_vsnprintf" = xyes then : - printf "%s\n" "#define HAVE_STRLCPY 1" >>confdefs.h + printf "%s\n" "#define HAVE_VSNPRINTF 1" >>confdefs.h fi -if test "$host_os_name" = "hp-ux" -a "$host_os_version" = "1020"; then - echo Forcing snprintf emulation for HP-UX. -else - ac_fn_c_check_func "$LINENO" "snprintf" "ac_cv_func_snprintf" -if test "x$ac_cv_func_snprintf" = xyes +ac_fn_c_check_func "$LINENO" "strlcat" "ac_cv_func_strlcat" +if test "x$ac_cv_func_strlcat" = xyes then : - printf "%s\n" "#define HAVE_SNPRINTF 1" >>confdefs.h + printf "%s\n" "#define HAVE_STRLCAT 1" >>confdefs.h fi -ac_fn_c_check_func "$LINENO" "vsnprintf" "ac_cv_func_vsnprintf" -if test "x$ac_cv_func_vsnprintf" = xyes +ac_fn_c_check_func "$LINENO" "strlcpy" "ac_cv_func_strlcpy" +if test "x$ac_cv_func_strlcpy" = xyes then : - printf "%s\n" "#define HAVE_VSNPRINTF 1" >>confdefs.h + printf "%s\n" "#define HAVE_STRLCPY 1" >>confdefs.h fi -fi ac_fn_c_check_func "$LINENO" "random" "ac_cv_func_random" if test "x$ac_cv_func_random" = xyes @@ -6145,20 +6320,24 @@ then : fi -case "$host_os_name" in - linux* | gnu*) - # Do not use sigset on Linux or GNU HURD - ;; - *) - # Use sigset on other platforms, if available - ac_fn_c_check_func "$LINENO" "sigset" "ac_cv_func_sigset" +case "$host_os_name" in #( + linux* | gnu*) : + + # Do not use sigset on Linux or GNU HURD + ;; #( + *) : + + # Use sigset on other platforms, if available + ac_fn_c_check_func "$LINENO" "sigset" "ac_cv_func_sigset" if test "x$ac_cv_func_sigset" = xyes then : printf "%s\n" "#define HAVE_SIGSET 1" >>confdefs.h fi - ;; + ;; #( + *) : + ;; esac ac_fn_c_check_func "$LINENO" "sigaction" "ac_cv_func_sigaction" @@ -6203,25 +6382,34 @@ fi printf %s "checking for tm_gmtoff member in tm structure... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + + #include int main (void) { -struct tm t; + + struct tm t; int o = t.tm_gmtoff; + ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - printf "%s\n" "#define HAVE_TM_GMTOFF 1" >>confdefs.h + +printf "%s\n" "#define HAVE_TM_GMTOFF 1" >>confdefs.h + else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } + fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -6229,25 +6417,34 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext printf %s "checking for st_gen member in stat structure... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + + #include int main (void) { -struct stat t; + + struct stat t; int o = t.st_gen; + ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - printf "%s\n" "#define HAVE_ST_GEN 1" >>confdefs.h + +printf "%s\n" "#define HAVE_ST_GEN 1" >>confdefs.h + else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } + fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -6271,28 +6468,46 @@ USBQUIRKS="" -if test "x$PKGCONFIG" != x; then - if test x$enable_libusb != xno -a $host_os_name != darwin; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libusb-1.0" >&5 +if test "x$PKGCONFIG" != x +then : + + if test x$enable_libusb != xno -a $host_os_name != darwin +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libusb-1.0" >&5 printf %s "checking for libusb-1.0... " >&6; } - if $PKGCONFIG --exists libusb-1.0; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + if $PKGCONFIG --exists libusb-1.0 +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - printf "%s\n" "#define HAVE_LIBUSB 1" >>confdefs.h - CFLAGS="$CFLAGS `$PKGCONFIG --cflags libusb-1.0`" - LIBUSB="`$PKGCONFIG --libs libusb-1.0`" - USBQUIRKS="\$(DATADIR)/usb" - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "#define HAVE_LIBUSB 1" >>confdefs.h + + CFLAGS="$CFLAGS $($PKGCONFIG --cflags libusb-1.0)" + LIBUSB="$($PKGCONFIG --libs libusb-1.0)" + USBQUIRKS="\$(DATADIR)/usb" + +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - if test x$enable_libusb = xyes; then - as_fn_error $? "libusb required for --enable-libusb." "$LINENO" 5 - fi - fi - fi -elif test x$enable_libusb = xyes; then - as_fn_error $? "Need pkg-config to enable libusb support." "$LINENO" 5 + if test x$enable_libusb = xyes +then : + + as_fn_error $? "libusb required for --enable-libusb." "$LINENO" 5 + +fi + +fi + +fi + +elif test x$enable_libusb = xyes +then : + + as_fn_error $? "Need pkg-config to enable libusb support." "$LINENO" 5 + fi # Check whether --enable-tcp_wrappers was given. @@ -6305,8 +6520,10 @@ fi LIBWRAP="" -if test x$enable_tcp_wrappers = xyes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for hosts_access in -lwrap" >&5 +if test x$enable_tcp_wrappers = xyes +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for hosts_access in -lwrap" >&5 printf %s "checking for hosts_access in -lwrap... " >&6; } if test ${ac_cv_lib_wrap_hosts_access+y} then : @@ -6344,16 +6561,21 @@ printf "%s\n" "$ac_cv_lib_wrap_hosts_access" >&6; } if test "x$ac_cv_lib_wrap_hosts_access" = xyes then : - ac_fn_c_check_header_compile "$LINENO" "tcpd.h" "ac_cv_header_tcpd_h" "$ac_includes_default" + ac_fn_c_check_header_compile "$LINENO" "tcpd.h" "ac_cv_header_tcpd_h" "$ac_includes_default" if test "x$ac_cv_header_tcpd_h" = xyes then : - printf "%s\n" "#define HAVE_TCPD_H 1" >>confdefs.h - LIBWRAP="-lwrap" + +printf "%s\n" "#define HAVE_TCPD_H 1" >>confdefs.h + + LIBWRAP="-lwrap" + fi + fi + fi INSTALL_GZIP="" @@ -6361,7 +6583,8 @@ LIBZ="" ac_fn_c_check_header_compile "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default" if test "x$ac_cv_header_zlib_h" = xyes then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gzgets in -lz" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gzgets in -lz" >&5 printf %s "checking for gzgets in -lz... " >&6; } if test ${ac_cv_lib_z_gzgets+y} then : @@ -6399,7 +6622,8 @@ printf "%s\n" "$ac_cv_lib_z_gzgets" >&6; } if test "x$ac_cv_lib_z_gzgets" = xyes then : - printf "%s\n" "#define HAVE_LIBZ 1" >>confdefs.h + +printf "%s\n" "#define HAVE_LIBZ 1" >>confdefs.h LIBZ="-lz" LIBS="$LIBS -lz" @@ -6440,30 +6664,41 @@ fi printf "%s\n" "$ac_cv_lib_z_inflateCopy" >&6; } if test "x$ac_cv_lib_z_inflateCopy" = xyes then : - printf "%s\n" "#define HAVE_INFLATECOPY 1" >>confdefs.h + + +printf "%s\n" "#define HAVE_INFLATECOPY 1" >>confdefs.h + fi - if test "x$GZIPPROG" != x; then - INSTALL_GZIP="-z" - fi + if test "x$GZIPPROG" != x +then : + + INSTALL_GZIP="-z" + fi fi +fi -case $host_os_name in - darwin* | *bsd*) - ARFLAGS="-rcv" - ;; - *) - ARFLAGS="crvs" - ;; -esac +case host_os_name in #( + darwin* | *bsd*) : + + ARFLAGS="-rcv" + ;; #( + *) : + + ARFLAGS="crvs" + ;; #( + *) : + ;; +esac + BACKLIBS="" SERVERLIBS="" @@ -6478,8 +6713,10 @@ then : enableval=$enable_acl; fi -if test "x$enable_acl" != xno; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing acl_init" >&5 +if test "x$enable_acl" != xno +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing acl_init" >&5 printf %s "checking for library containing acl_init... " >&6; } if test ${ac_cv_search_acl_init+y} then : @@ -6535,11 +6772,15 @@ ac_res=$ac_cv_search_acl_init if test "$ac_res" != no then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - printf "%s\n" "#define HAVE_ACL_INIT 1" >>confdefs.h + + +printf "%s\n" "#define HAVE_ACL_INIT 1" >>confdefs.h + fi - SERVERLIBS="$SERVERLIBS $LIBS" + SERVERLIBS="$SERVERLIBS $LIBS" + fi LIBS="$SAVELIBS" @@ -6557,46 +6798,66 @@ fi # Check whether --with-dbusdir was given. if test ${with_dbusdir+y} then : - withval=$with_dbusdir; DBUSDIR="$withval" + withval=$with_dbusdir; + DBUSDIR="$withval" + fi -if test "x$enable_dbus" != xno -a "x$PKGCONFIG" != x -a "x$host_os_name" != xdarwin; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5 +if test "x$enable_dbus" != xno -a "x$PKGCONFIG" != x -a "x$host_os_name" != xdarwin +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5 printf %s "checking for DBUS... " >&6; } - if $PKGCONFIG --exists dbus-1; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + if $PKGCONFIG --exists dbus-1 +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - printf "%s\n" "#define HAVE_DBUS 1" >>confdefs.h - CFLAGS="$CFLAGS `$PKGCONFIG --cflags dbus-1` -DDBUS_API_SUBJECT_TO_CHANGE" - SERVERLIBS="$SERVERLIBS `$PKGCONFIG --libs dbus-1`" - DBUS_NOTIFIER="dbus" - DBUS_NOTIFIERLIBS="`$PKGCONFIG --libs dbus-1`" - SAVELIBS="$LIBS" - LIBS="$LIBS $DBUS_NOTIFIERLIBS" - ac_fn_c_check_func "$LINENO" "dbus_message_iter_init_append" "ac_cv_func_dbus_message_iter_init_append" +printf "%s\n" "#define HAVE_DBUS 1" >>confdefs.h + + CFLAGS="$CFLAGS $($PKGCONFIG --cflags dbus-1) -DDBUS_API_SUBJECT_TO_CHANGE" + SERVERLIBS="$SERVERLIBS $($PKGCONFIG --libs dbus-1)" + DBUS_NOTIFIER="dbus" + DBUS_NOTIFIERLIBS="$($PKGCONFIG --libs dbus-1)" + SAVELIBS="$LIBS" + LIBS="$LIBS $DBUS_NOTIFIERLIBS" + ac_fn_c_check_func "$LINENO" "dbus_message_iter_init_append" "ac_cv_func_dbus_message_iter_init_append" if test "x$ac_cv_func_dbus_message_iter_init_append" = xyes then : - printf "%s\n" "#define HAVE_DBUS_MESSAGE_ITER_INIT_APPEND 1" >>confdefs.h + + +printf "%s\n" "#define HAVE_DBUS_MESSAGE_ITER_INIT_APPEND 1" >>confdefs.h + fi - ac_fn_c_check_func "$LINENO" "dbus_threads_init" "ac_cv_func_dbus_threads_init" + ac_fn_c_check_func "$LINENO" "dbus_threads_init" "ac_cv_func_dbus_threads_init" if test "x$ac_cv_func_dbus_threads_init" = xyes then : - printf "%s\n" "#define HAVE_DBUS_THREADS_INIT 1" >>confdefs.h + + +printf "%s\n" "#define HAVE_DBUS_THREADS_INIT 1" >>confdefs.h + fi - LIBS="$SAVELIBS" - if test -d /etc/dbus-1 -a "x$DBUSDIR" = x; then - DBUSDIR="/etc/dbus-1" - fi - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + LIBS="$SAVELIBS" + if test -d /etc/dbus-1 -a "x$DBUSDIR" = x +then : + + DBUSDIR="/etc/dbus-1" + +fi + +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - fi + +fi + fi @@ -6608,29 +6869,36 @@ CUPS_DEFAULT_SYSTEM_AUTHKEY="" CUPS_SYSTEM_AUTHKEY="" INSTALLXPC="" -case $host_os_name in - darwin*) - BACKLIBS="$BACKLIBS -framework IOKit" - SERVERLIBS="$SERVERLIBS -framework IOKit -weak_framework ApplicationServices" - LIBS="-framework CoreFoundation -framework Security $LIBS" +case host_os_name in #( + darwin*) : - ac_fn_c_check_header_compile "$LINENO" "ApplicationServices/ApplicationServices.h" "ac_cv_header_ApplicationServices_ApplicationServices_h" "$ac_includes_default" + BACKLIBS="$BACKLIBS -framework IOKit" + SERVERLIBS="$SERVERLIBS -framework IOKit -weak_framework ApplicationServices" + LIBS="-framework CoreFoundation -framework Security $LIBS" + + ac_fn_c_check_header_compile "$LINENO" "ApplicationServices/ApplicationServices.h" "ac_cv_header_ApplicationServices_ApplicationServices_h" "$ac_includes_default" if test "x$ac_cv_header_ApplicationServices_ApplicationServices_h" = xyes then : - printf "%s\n" "#define HAVE_APPLICATIONSERVICES_H 1" >>confdefs.h + + +printf "%s\n" "#define HAVE_APPLICATIONSERVICES_H 1" >>confdefs.h + fi - ac_fn_c_check_header_compile "$LINENO" "CoreFoundation/CoreFoundation.h" "ac_cv_header_CoreFoundation_CoreFoundation_h" "$ac_includes_default" + ac_fn_c_check_header_compile "$LINENO" "CoreFoundation/CoreFoundation.h" "ac_cv_header_CoreFoundation_CoreFoundation_h" "$ac_includes_default" if test "x$ac_cv_header_CoreFoundation_CoreFoundation_h" = xyes then : - printf "%s\n" "#define HAVE_COREFOUNDATION_H 1" >>confdefs.h + + +printf "%s\n" "#define HAVE_COREFOUNDATION_H 1" >>confdefs.h + fi - SAVELIBS="$LIBS" - LIBS="-framework SystemConfiguration $LIBS" + SAVELIBS="$LIBS" + LIBS="-framework SystemConfiguration $LIBS" for ac_func in SCDynamicStoreCopyComputerName do : @@ -6639,23 +6907,29 @@ if test "x$ac_cv_func_SCDynamicStoreCopyComputerName" = xyes then : printf "%s\n" "#define HAVE_SCDYNAMICSTORECOPYCOMPUTERNAME 1" >>confdefs.h - printf "%s\n" "#define HAVE_SCDYNAMICSTORECOPYCOMPUTERNAME 1" >>confdefs.h + +printf "%s\n" "#define HAVE_SCDYNAMICSTORECOPYCOMPUTERNAME 1" >>confdefs.h + else $as_nop - LIBS="$SAVELIBS" + LIBS="$SAVELIBS" + fi done - ac_fn_c_check_header_compile "$LINENO" "membership.h" "ac_cv_header_membership_h" "$ac_includes_default" + ac_fn_c_check_header_compile "$LINENO" "membership.h" "ac_cv_header_membership_h" "$ac_includes_default" if test "x$ac_cv_header_membership_h" = xyes then : - printf "%s\n" "#define HAVE_MEMBERSHIP_H 1" >>confdefs.h + + +printf "%s\n" "#define HAVE_MEMBERSHIP_H 1" >>confdefs.h + fi - ac_fn_c_check_func "$LINENO" "mbr_uid_to_uuid" "ac_cv_func_mbr_uid_to_uuid" + ac_fn_c_check_func "$LINENO" "mbr_uid_to_uuid" "ac_cv_func_mbr_uid_to_uuid" if test "x$ac_cv_func_mbr_uid_to_uuid" = xyes then : printf "%s\n" "#define HAVE_MBR_UID_TO_UUID 1" >>confdefs.h @@ -6663,22 +6937,28 @@ then : fi - ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default" + ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default" if test "x$ac_cv_header_dlfcn_h" = xyes then : - printf "%s\n" "#define HAVE_DLFCN_H 1" >>confdefs.h + + +printf "%s\n" "#define HAVE_DLFCN_H 1" >>confdefs.h + fi - ac_fn_c_check_header_compile "$LINENO" "notify.h" "ac_cv_header_notify_h" "$ac_includes_default" + ac_fn_c_check_header_compile "$LINENO" "notify.h" "ac_cv_header_notify_h" "$ac_includes_default" if test "x$ac_cv_header_notify_h" = xyes then : - printf "%s\n" "#define HAVE_NOTIFY_H 1" >>confdefs.h + + +printf "%s\n" "#define HAVE_NOTIFY_H 1" >>confdefs.h + fi - ac_fn_c_check_func "$LINENO" "notify_post" "ac_cv_func_notify_post" + ac_fn_c_check_func "$LINENO" "notify_post" "ac_cv_func_notify_post" if test "x$ac_cv_func_notify_post" = xyes then : printf "%s\n" "#define HAVE_NOTIFY_POST 1" >>confdefs.h @@ -6690,81 +6970,96 @@ fi # Check whether --with-adminkey was given. if test ${with_adminkey+y} then : - withval=$with_adminkey; default_adminkey="$withval" + withval=$with_adminkey; + default_adminkey="$withval" + else $as_nop - default_adminkey="default" + + default_adminkey="default" + fi # Check whether --with-operkey was given. if test ${with_operkey+y} then : - withval=$with_operkey; default_operkey="$withval" + withval=$with_operkey; + default_operkey="$withval" + else $as_nop - default_operkey="default" + + default_operkey="default" + fi - ac_fn_c_check_header_compile "$LINENO" "Security/Authorization.h" "ac_cv_header_Security_Authorization_h" "$ac_includes_default" + ac_fn_c_check_header_compile "$LINENO" "Security/Authorization.h" "ac_cv_header_Security_Authorization_h" "$ac_includes_default" if test "x$ac_cv_header_Security_Authorization_h" = xyes then : - printf "%s\n" "#define HAVE_AUTHORIZATION_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_AUTHORIZATION_H 1" >>confdefs.h - if test "x$default_adminkey" != xdefault; then - CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey $default_adminkey" - CUPS_DEFAULT_SYSTEM_AUTHKEY="$default_adminkey" - else - CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.print.admin" - CUPS_DEFAULT_SYSTEM_AUTHKEY="system.print.admin" - fi - if test "x$default_operkey" != xdefault; then - CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY($default_operkey) @admin @lpadmin" - else - CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY(system.print.operator) @admin @lpadmin" - fi + if test "x$default_adminkey" != xdefault +then : + + CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey $default_adminkey" + CUPS_DEFAULT_SYSTEM_AUTHKEY="$default_adminkey" + +else $as_nop + + CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.print.admin" + CUPS_DEFAULT_SYSTEM_AUTHKEY="system.print.admin" + +fi + + if test "x$default_operkey" != xdefault +then : + + CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY($default_operkey) @admin @lpadmin" + +else $as_nop + + CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY(system.print.operator) @admin @lpadmin" + +fi + fi - if test $host_os_version -ge 100; then - ac_fn_c_check_header_compile "$LINENO" "sandbox.h" "ac_cv_header_sandbox_h" "$ac_includes_default" + ac_fn_c_check_header_compile "$LINENO" "sandbox.h" "ac_cv_header_sandbox_h" "$ac_includes_default" if test "x$ac_cv_header_sandbox_h" = xyes then : - printf "%s\n" "#define HAVE_SANDBOX_H 1" >>confdefs.h + + +printf "%s\n" "#define HAVE_SANDBOX_H 1" >>confdefs.h + fi - fi - if test $host_os_version -ge 110 -a $host_os_version -lt 120; then - # Broken public headers in 10.7.x... - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sandbox/private.h presence" >&5 -printf %s "checking for sandbox/private.h presence... " >&6; } - if test -f /usr/local/include/sandbox/private.h; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - as_fn_error $? "Run 'sudo mkdir -p /usr/local/include/sandbox' and 'sudo touch /usr/local/include/sandbox/private.h' to build CUPS." "$LINENO" 5 - fi - fi - ac_fn_c_check_header_compile "$LINENO" "xpc/xpc.h" "ac_cv_header_xpc_xpc_h" "$ac_includes_default" + ac_fn_c_check_header_compile "$LINENO" "xpc/xpc.h" "ac_cv_header_xpc_xpc_h" "$ac_includes_default" if test "x$ac_cv_header_xpc_xpc_h" = xyes then : - printf "%s\n" "#define HAVE_XPC 1" >>confdefs.h - INSTALLXPC="install-xpc" + +printf "%s\n" "#define HAVE_XPC 1" >>confdefs.h + + INSTALLXPC="install-xpc" + fi - ;; + ;; #( + *) : + ;; esac + printf "%s\n" "#define CUPS_DEFAULT_PRINTOPERATOR_AUTH \"$CUPS_DEFAULT_PRINTOPERATOR_AUTH\"" >>confdefs.h + printf "%s\n" "#define CUPS_DEFAULT_SYSTEM_AUTHKEY \"$CUPS_DEFAULT_SYSTEM_AUTHKEY\"" >>confdefs.h @@ -6776,7 +7071,9 @@ COMPONENTS="all" # Check whether --with-components was given. if test ${with_components+y} then : - withval=$with_components; COMPONENTS="$withval" + withval=$with_components; + COMPONENTS="$withval" + fi @@ -6786,43 +7083,48 @@ LIBCUPSOBJS="\$(COREOBJS) \$(DRIVEROBJS)" LIBHEADERS="\$(COREHEADERS) \$(DRIVERHEADERS)" LIBHEADERSPRIV="\$(COREHEADERSPRIV) \$(DRIVERHEADERSPRIV)" -case "$COMPONENTS" in - all) - BUILDDIRS="tools filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates" - ;; +case "$COMPONENTS" in #( + all) : - core) - BUILDDIRS="tools examples locale" - ;; + BUILDDIRS="tools filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates" + ;; #( + core) : - corelite) - printf "%s\n" "#define CUPS_LITE 1" >>confdefs.h + BUILDDIRS="tools examples locale" + ;; #( + corelite) : - BUILDDIRS="tools examples locale" - cupsimagebase="" - LIBCUPSOBJS="\$(COREOBJS)" - LIBHEADERS="\$(COREHEADERS)" - LIBHEADERSPRIV="\$(COREHEADERSPRIV)" - ;; - libcups) - BUILDDIRS="locale" - cupsimagebase="" - ;; +printf "%s\n" "#define CUPS_LITE 1" >>confdefs.h - libcupslite) - printf "%s\n" "#define CUPS_LITE 1" >>confdefs.h + BUILDDIRS="tools examples locale" + cupsimagebase="" + LIBCUPSOBJS="\$(COREOBJS)" + LIBHEADERS="\$(COREHEADERS)" + LIBHEADERSPRIV="\$(COREHEADERSPRIV)" + ;; #( + libcups) : - BUILDDIRS="locale" - cupsimagebase="" - LIBCUPSOBJS="\$(COREOBJS)" - LIBHEADERS="\$(COREHEADERS)" - LIBHEADERSPRIV="\$(COREHEADERSPRIV)" - ;; + BUILDDIRS="locale" + cupsimagebase="" + ;; #( + libcupslite) : - *) - as_fn_error $? "Bad build component \"$COMPONENT\" specified!" "$LINENO" 5 - ;; + +printf "%s\n" "#define CUPS_LITE 1" >>confdefs.h + + BUILDDIRS="locale" + cupsimagebase="" + LIBCUPSOBJS="\$(COREOBJS)" + LIBHEADERS="\$(COREHEADERS)" + LIBHEADERSPRIV="\$(COREHEADERSPRIV)" + ;; #( + *) : + + as_fn_error $? "Bad build component \"$COMPONENT\" specified." "$LINENO" 5 + ;; #( + *) : + ;; esac @@ -10958,21 +11260,33 @@ printf "%s\n" "#define CUPS_DEFAULT_WEBIF $CUPS_DEFAULT_WEBIF" >>confdefs.h INSTALL_LANGUAGES="" UNINSTALL_LANGUAGES="" LANGFILES="" -if test "x$LANGUAGES" != x; then - INSTALL_LANGUAGES="install-languages" - UNINSTALL_LANGUAGES="uninstall-languages" - for lang in $LANGUAGES; do - if test -f doc/$lang/index.html.in; then - LANGFILES="$LANGFILES doc/$lang/index.html" - fi +if test "x$LANGUAGES" != x +then : + + INSTALL_LANGUAGES="install-languages" + UNINSTALL_LANGUAGES="uninstall-languages" + for lang in $LANGUAGES; do + if test -f doc/$lang/index.html.in +then : + + LANGFILES="$LANGFILES doc/$lang/index.html" + +fi + + if test -f templates/$lang/header.tmpl.in +then : + + LANGFILES="$LANGFILES templates/$lang/header.tmpl" + +fi + done + +elif test "x$CUPS_BUNDLEDIR" != x +then : + + INSTALL_LANGUAGES="install-langbundle" + UNINSTALL_LANGUAGES="uninstall-langbundle" - if test -f templates/$lang/header.tmpl.in; then - LANGFILES="$LANGFILES templates/$lang/header.tmpl" - fi - done -elif test "x$CUPS_BUNDLEDIR" != x; then - INSTALL_LANGUAGES="install-langbundle" - UNINSTALL_LANGUAGES="uninstall-langbundle" fi @@ -11479,8 +11793,8 @@ 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.4.0, which was -generated by GNU Autoconf 2.70. Invocation command line was +This file was extended by CUPS $as_me 2.4rc1, which was +generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -11544,11 +11858,11 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -CUPS config.status 2.4.0 -configured by $0, generated by GNU Autoconf 2.70, +CUPS config.status 2.4rc1 +configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" -Copyright (C) 2020 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." diff --git a/configure.ac b/configure.ac index fbd374daec..a1f9796e3a 100644 --- a/configure.ac +++ b/configure.ac @@ -10,10 +10,10 @@ dnl information. dnl dnl We need at least autoconf 2.60... -AC_PREREQ(2.60) +AC_PREREQ([2.60]) dnl Package name and version... -AC_INIT([CUPS], [2.4.0], [https://github.com/openprinting/cups/issues], [cups], [https://openprinting.github.io/cups]) +AC_INIT([CUPS], [2.4rc1], [https://github.com/openprinting/cups/issues], [cups], [https://openprinting.github.io/cups]) sinclude(config-scripts/cups-opsys.m4) sinclude(config-scripts/cups-common.m4) @@ -28,7 +28,7 @@ sinclude(config-scripts/cups-network.m4) sinclude(config-scripts/cups-poll.m4) sinclude(config-scripts/cups-gssapi.m4) sinclude(config-scripts/cups-threads.m4) -sinclude(config-scripts/cups-ssl.m4) +sinclude(config-scripts/cups-tls.m4) sinclude(config-scripts/cups-pam.m4) sinclude(config-scripts/cups-largefile.m4) sinclude(config-scripts/cups-dnssd.m4) @@ -39,45 +39,49 @@ sinclude(config-scripts/cups-defaults.m4) INSTALL_LANGUAGES="" UNINSTALL_LANGUAGES="" LANGFILES="" -if test "x$LANGUAGES" != x; then - INSTALL_LANGUAGES="install-languages" - UNINSTALL_LANGUAGES="uninstall-languages" - for lang in $LANGUAGES; do - if test -f doc/$lang/index.html.in; then - LANGFILES="$LANGFILES doc/$lang/index.html" - fi +AS_IF([test "x$LANGUAGES" != x], [ + INSTALL_LANGUAGES="install-languages" + UNINSTALL_LANGUAGES="uninstall-languages" + for lang in $LANGUAGES; do + AS_IF([test -f doc/$lang/index.html.in], [ + LANGFILES="$LANGFILES doc/$lang/index.html" + ]) - if test -f templates/$lang/header.tmpl.in; then - LANGFILES="$LANGFILES templates/$lang/header.tmpl" - fi - done -elif test "x$CUPS_BUNDLEDIR" != x; then - INSTALL_LANGUAGES="install-langbundle" - UNINSTALL_LANGUAGES="uninstall-langbundle" -fi + AS_IF([test -f templates/$lang/header.tmpl.in], [ + LANGFILES="$LANGFILES templates/$lang/header.tmpl" + ]) + done +], [test "x$CUPS_BUNDLEDIR" != x], [ + INSTALL_LANGUAGES="install-langbundle" + UNINSTALL_LANGUAGES="uninstall-langbundle" +]) -AC_SUBST(INSTALL_LANGUAGES) -AC_SUBST(UNINSTALL_LANGUAGES) +AC_SUBST([INSTALL_LANGUAGES]) +AC_SUBST([UNINSTALL_LANGUAGES]) -AC_OUTPUT(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/cups-lpdAT.service - scheduler/cups.path - scheduler/cups.service - scheduler/cups.socket - templates/header.tmpl - packaging/cups.list - $LANGFILES) +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/cups-lpdAT.service + scheduler/cups.path + scheduler/cups.service + scheduler/cups.socket + templates/header.tmpl + packaging/cups.list + $LANGFILES +]) +AC_OUTPUT +dnl Make sure cups-config script is executable chmod +x cups-config diff --git a/cups/string-private.h b/cups/string-private.h index e1ae603a51..29de96e5c2 100644 --- a/cups/string-private.h +++ b/cups/string-private.h @@ -19,6 +19,7 @@ # include # include # include +# include # include # include # include @@ -26,17 +27,6 @@ # include -# ifdef HAVE_STRING_H -# include -# endif /* HAVE_STRING_H */ - -# ifdef HAVE_STRINGS_H -# include -# endif /* HAVE_STRINGS_H */ - -# ifdef HAVE_BSTRING_H -# include -# endif /* HAVE_BSTRING_H */ # if defined(_WIN32) && !defined(__CUPS_SSIZE_T_DEFINED) # define __CUPS_SSIZE_T_DEFINED