michaelrsweet
commented
9 years ago CUPS.org User: elfring
I hope that the attached update suggestion will also help to clarify my previous request (STR #4666).
Closed michaelrsweet closed 9 years ago
michaelrsweet
commented
9 years ago CUPS.org User: elfring
I hope that the attached update suggestion will also help to clarify my previous request (STR #4666).
michaelrsweet
commented
9 years ago CUPS.org User: mike
Deferring to later release...
michaelrsweet
commented
9 years ago CUPS.org User: mike
This level of quoting is completely unnecessary so we will not be making these changes at this time.
michaelrsweet
commented
9 years ago "0001-Completion-of-quoting-for-parameters-in-build-scripts.patch":
From 86419b5a62bd2df57df9942a853a03a985000311 Mon Sep 17 00:00:00 2001 From: Markus Elfring elfring@users.sourceforge.net Date: Wed, 5 Aug 2015 13:48:21 +0200 Subject: [PATCH] Completion of quoting for parameters in build scripts (STR
Some build scripts can be made a bit safer by the usage of strict quoting for parameters. https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.69/html_node/Autoconf-Language.html
config-scripts/cups-common.m4 | 357 ++++++++++++++++++------------------- config-scripts/cups-compiler.m4 | 76 ++++---- config-scripts/cups-defaults.m4 | 242 ++++++++++++------------- config-scripts/cups-directories.m4 | 90 +++++----- config-scripts/cups-dnssd.m4 | 46 ++--- config-scripts/cups-gssapi.m4 | 76 ++++---- config-scripts/cups-largefile.m4 | 10 +- config-scripts/cups-libtool.m4 | 4 +- config-scripts/cups-manpages.m4 | 14 +- config-scripts/cups-network.m4 | 40 ++--- config-scripts/cups-pam.m4 | 28 +-- config-scripts/cups-poll.m4 | 6 +- config-scripts/cups-scripting.m4 | 50 +++--- config-scripts/cups-sharedlibs.m4 | 36 ++-- config-scripts/cups-ssl.m4 | 78 ++++---- config-scripts/cups-startup.m4 | 64 +++---- config-scripts/cups-threads.m4 | 6 +- configure.ac | 54 +++--- 18 files changed, 634 insertions(+), 643 deletions(-)
diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 index bac0957..de5e866 100644 --- a/config-scripts/cups-common.m4 +++ b/config-scripts/cups-common.m4 @@ -14,7 +14,7 @@ dnl file is missing or damaged, see the license at "http://www.cups.org/". dnl
dnl Set the name of the config header file... -AC_CONFIG_HEADER(config.h) +AC_CONFIG_HEADER([config.h])
dnl Version number information... CUPS_VERSION="AC_PACKAGE_VERSION" @@ -35,14 +35,14 @@ esac
CUPS_BUILD="cups-$CUPS_VERSION"
-AC_ARG_WITH(cups_build, [ --with-cups-build set "cups-config --build" string ],
-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"]) +AC_DEFINE_UNQUOTED([CUPS_MINIMAL],["AC_PACKAGE_NAME/$CUPS_VERSION$CUPS_REVISION"])
dnl Default compiler flags... CFLAGS="${CFLAGS:=}" @@ -52,31 +52,31 @@ LDFLAGS="${LDFLAGS:=}"
dnl Checks for programs... AC_PROG_AWK -AC_PROG_CC(clang cc gcc) +AC_PROG_CC([clang cc gcc]) AC_PROG_CPP -AC_PROG_CXX(clang++ c++ g++) +AC_PROG_CXX([clang++ c++ g++]) AC_PROG_RANLIB -AC_PATH_PROG(AR,ar) -AC_PATH_PROG(CHMOD,chmod) -AC_PATH_PROG(GZIP,gzip) -AC_PATH_PROG(LD,ld) -AC_PATH_PROG(LN,ln) -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) +AC_PATH_PROG([AR],[ar]) +AC_PATH_PROG([CHMOD],[chmod]) +AC_PATH_PROG([GZIP],[gzip]) +AC_PATH_PROG([LD],[ld]) +AC_PATH_PROG([LN],[ln]) +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) +AC_SUBST([CUPS_HTMLVIEW])
-AC_MSG_CHECKING(for install-sh script)
+AC_MSG_CHECKING([for install-sh script])
INSTALL="pwd/install-sh"
-AC_SUBST(INSTALL)
-AC_MSG_RESULT(using $INSTALL)
+AC_SUBST([INSTALL])
+AC_MSG_RESULT([using $INSTALL])
if test "x$AR" = x; then AC_MSG_ERROR([Unable to find required library archive command.]) @@ -87,114 +87,109 @@ fi
dnl Static library option... INSTALLSTATIC="" -AC_ARG_ENABLE(static, [ --enable-static install static libraries]) +AC_ARG_ENABLE([static],[ --enable-static install static libraries])
if test x$enable_static = xyes; then echo Installing static libraries... INSTALLSTATIC="installstatic" fi
-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],[1],[abs() function is usable.])]) +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],[ --enable-mallinfo build with malloc debug logging])
if test x$enable_mallinfo = xyes; then SAVELIBS="$LIBS" LIBS=""
-AC_SUBST(LIBMALLOC) +AC_SUBST([LIBMALLOC])
dnl Check for libpaper support... -AC_ARG_ENABLE(libpaper, [ --enable-libpaper build with libpaper support]) +AC_ARG_ENABLE([libpaper],[ --enable-libpaper build with libpaper support])
if test x$enable_libpaper = xyes; then
[LIBPAPER=""])else LIBPAPER="" fi -AC_SUBST(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(asl.h,AC_DEFINE(HAVE_ASL_H)) +AC_CHECK_HEADERS([stdlib.h \ +crypt.h \ +langinfo.h \ +malloc.h \ +shadow.h \ +stdint.h \ +string.h \ +strings.h \ +bstring.h \ +asl.h]) +AC_CHECK_HEADER([sys/ioctl.h],[AC_DEFINE([HAVE_SYS_IOCTL_H],[1],[This header file is available.])]) +AC_CHECK_HEADER([sys/param.h],[AC_DEFINE([HAVE_SYS_PARAM_H],[1],[This header file is available.])]) +AC_CHECK_HEADER([sys/ucred.h],[AC_DEFINE([HAVE_SYS_UCRED_H],[1],[This header file is available.])])
dnl Checks for iconv.h and iconv_open -AC_CHECK_HEADER(iconv.h,
LIBS="$SAVELIBS"])
dnl Checks for Mini-XML (www.minixml.org)... LIBMXML="" -AC_CHECK_HEADER(mxml.h,
LIBS="$SAVELIBS"]) +AC_SUBST([LIBMXML])
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],[This header file is available.])]) +AC_CHECK_HEADER([sys/statfs.h],[AC_DEFINE([HAVE_SYS_STATFS_H],[1],[This header file is available.])]) +AC_CHECK_HEADER([sys/statvfs.h],[AC_DEFINE([HAVE_SYS_STATVFS_H],[1],[This header file is available.])]) +AC_CHECK_HEADER([sys/vfs.h],[AC_DEFINE([HAVE_SYS_VFS_H],[1],[This header file is available.])]) +AC_CHECK_FUNCS([statfs statvfs])
dnl Checks for string functions. -AC_CHECK_FUNCS(strdup strlcat strlcpy) +AC_CHECK_FUNCS([strdup strlcat strlcpy]) if test "$uname" = "HP-UX" -a "$uversion" = "1020"; then echo Forcing snprintf emulation for HP-UX. else
-dnl Check for random number functions...
-dnl Check for geteuid function.
-dnl Check for setpgid function.
-dnl Check for vsyslog function. -AC_CHECK_FUNCS(vsyslog) +AC_CHECK_FUNCS([random \ +lrand48 \ +arc4random \ +geteuid \ +setpgid \ +vsyslog])
dnl Checks for signal functions. case "$uname" in @@ -203,92 +198,89 @@ case "$uname" in ;; *)
-dnl Checks for wait functions.
-dnl Check for posix_spawn -AC_CHECK_FUNCS(posix_spawn) +AC_CHECK_FUNCS([sigaction \ +waitpid \ +wait3 \ +posix_spawn])
dnl See if the tm structure has the tm_gmtoff member...
-AC_MSG_CHECKING(for tm_gmtoff member in tm structure)
+AC_MSG_CHECKING([for tm_gmtoff member in tm structure])
AC_TRY_COMPILE([#include
[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_MSG_CHECKING([for st_gen member in stat structure]) AC_TRY_COMPILE([#include <sys/stat.h>],[struct stat t; int o = t.st_gen;],
[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],[ --enable-libusb use libusb for USB printing])
LIBUSB="" USBQUIRKS="" -AC_SUBST(LIBUSB) -AC_SUBST(USBQUIRKS) +AC_SUBST([LIBUSB]) +AC_SUBST([USBQUIRKS])
if test "x$PKGCONFIG" != x; then if test x$enable_libusb != xno -a $uname != Darwin; then
$PKGCONFIG --cflags libusb-1.0"
LIBUSB="$PKGCONFIG --libs libusb-1.0"
USBQUIRKS="\$(DATADIR)/usb"
elseAC_MSG_ERROR([Need pkg-config to enable libusb support.]) fi
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],[ --enable-tcp-wrappers use libwrap for TCP wrappers support])
LIBWRAP="" -AC_SUBST(LIBWRAP) +AC_SUBST([LIBWRAP])
if test x$enable_tcp_wrappers = xyes; then
LIBWRAP="-lwrap"])])fi
dnl ZLIB INSTALL_GZIP="" LIBZ="" -AC_CHECK_HEADER(zlib.h,
fi])]) +AC_SUBST([INSTALL_GZIP]) +AC_SUBST([LIBZ])
dnl Flags for "ar" command... case $uname in @@ -300,60 +292,60 @@ case $uname in ;; esac
-AC_SUBST(ARFLAGS) +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]) +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],[1],[The acl_init() function is available.])]) SERVERLIBS="$SERVERLIBS $LIBS" fi LIBS="$SAVELIBS"
dnl Check for DBUS support -AC_ARG_ENABLE(dbus, [ --disable-dbus build without DBUS support]) -AC_ARG_WITH(dbusdir, [ --with-dbusdir set DBUS configuration directory ],
[DBUSDIR="$withval"])
DBUSDIR="" DBUS_NOTIFIER="" DBUS_NOTIFIERLIBS=""
if test "x$enable_dbus" != xno -a "x$PKGCONFIG" != x; then
$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_SUBST(DBUSDIR) -AC_SUBST(DBUS_NOTIFIER) -AC_SUBST(DBUS_NOTIFIERLIBS) +AC_SUBST([DBUSDIR]) +AC_SUBST([DBUS_NOTIFIER]) +AC_SUBST([DBUS_NOTIFIERLIBS])
dnl Extra platform-specific libraries... CUPS_DEFAULT_PRINTOPERATOR_AUTH="@SYSTEM" @@ -368,36 +360,35 @@ case $uname in LIBS="-framework SystemConfiguration -framework CoreFoundation -framework Security $LIBS"
dnl Check for framework headers...AC_CHECK_HEADER([CoreFoundation/CFBundlePriv.h],[AC_DEFINE([HAVE_CFBUNDLEPRIV_H],[1],[This header file is available.])])
dnl Check for dynamic store function...AC_CHECK_FUNCS([SCDynamicStoreCopyComputerName])
dnl Check for the new membership functions in MacOSX 10.4...AC_CHECK_FUNCS([mbr_uid_to_uuid])
dnl Need <dlfcn.h> header...AC_CHECK_HEADER([dlfcn.h],[AC_DEFINE([HAVE_DLFCN_H],[1],[This header file is available.])])
dnl Check for notify_post supportAC_CHECK_FUNCS([notify_post])
dnl Check for Authorization Services support [default_operkey="default"])AC_CHECK_HEADER(Security/Authorization.h, [ [AC_DEFINE([HAVE_AUTHORIZATION_H],[1],[This header file is available.])
if test "x$default_adminkey" != xdefault; then
CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey $default_adminkey"@@ -417,45 +408,45 @@ case $uname in else CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY(system.print.admin) @admin @lpadmin" fi])
AC_CHECK_HEADER([Security/SecBasePriv.h],[AC_DEFINE([HAVE_SECBASEPRIV_H],[1],[This header file is available.])])
dnl Check for sandbox/Seatbelt support
if test $uversion -ge 100; then 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_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) +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])
dnl Check for build components COMPONENTS="all"
-AC_ARG_WITH(components, [ --with-components set components to build: +AC_ARG_WITH([components],[ --with-components set components to build:
"core" builds libcups and ipptool],
case "$COMPONENTS" in all) @@ -471,7 +462,7 @@ case "$COMPONENTS" in ;; esac
-AC_SUBST(BUILDDIRS) +AC_SUBST([BUILDDIRS])
dnl dnl End of "$Id$". diff --git a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4 index 3c2076a..a1e9d43 100644 --- a/config-scripts/cups-compiler.m4 +++ b/config-scripts/cups-compiler.m4 @@ -17,14 +17,14 @@ dnl Clear the debugging and non-shared library options unless the user asks dnl for them... INSTALL_STRIP="" OPTIM="" -AC_SUBST(INSTALL_STRIP) -AC_SUBST(OPTIM) +AC_SUBST([INSTALL_STRIP]) +AC_SUBST([OPTIM])
-AC_ARG_WITH(optim, [ --with-optim set optimization flags ]) -AC_ARG_ENABLE(debug, [ --enable-debug build with debugging symbols]) -AC_ARG_ENABLE(debug_guards, [ --enable-debug-guards build with memory allocation guards]) -AC_ARG_ENABLE(debug_printfs, [ --enable-debug-printfs build with CUPS_DEBUG_LOG support]) -AC_ARG_ENABLE(unit_tests, [ --enable-unit-tests build and run unit tests]) +AC_ARG_WITH([optim],[ --with-optim set optimization flags]) +AC_ARG_ENABLE([debug],[ --enable-debug build with debugging symbols]) +AC_ARG_ENABLE([debug_guards],[ --enable-debug-guards build with memory allocation guards]) +AC_ARG_ENABLE([debug_printfs],[ --enable-debug-printfs build with CUPS_DEBUG_LOG support]) +AC_ARG_ENABLE([unit_tests],[ --enable-unit-tests build and run unit tests])
dnl For debugging, keep symbols, otherwise strip them... if test x$enable_debug = xyes; then @@ -52,11 +52,11 @@ if test x$enable_unit_tests = xyes; then else UNITTESTS="" fi -AC_SUBST(UNITTESTS) +AC_SUBST([UNITTESTS])
dnl Setup general architecture flags... -AC_ARG_WITH(archflags, [ --with-archflags set default architecture flags ]) -AC_ARG_WITH(ldarchflags, [ --with-ldarchflags set program architecture flags ]) +AC_ARG_WITH([archflags],[ --with-archflags set default architecture flags]) +AC_ARG_WITH([ldarchflags],[ --with-ldarchflags set program architecture flags])
if test -z "$with_archflags"; then ARCHFLAGS="" @@ -75,21 +75,21 @@ else LDARCHFLAGS="$with_ldarchflags" fi
-AC_SUBST(ARCHFLAGS) -AC_SUBST(LDARCHFLAGS) +AC_SUBST([ARCHFLAGS]) +AC_SUBST([LDARCHFLAGS])
dnl Read-only data/program support on Linux... -AC_ARG_ENABLE(relro, [ --enable-relro build with the GCC relro option]) +AC_ARG_ENABLE([relro],[ --enable-relro build with the GCC relro option])
dnl Update compiler options... CXXLIBS="${CXXLIBS:=}" -AC_SUBST(CXXLIBS) +AC_SUBST([CXXLIBS])
PIEFLAGS="" -AC_SUBST(PIEFLAGS) +AC_SUBST([PIEFLAGS])
RELROFLAGS="" -AC_SUBST(RELROFLAGS) +AC_SUBST([RELROFLAGS])
if test -n "$GCC"; then
@@ -110,18 +110,18 @@ if test -n "$GCC"; then
# GCC and adds "stack canaries" which detect when the return address
# has been overwritten, preventing many types of exploit attacks. OPTIM="$OPTIM -fno-stack-protector"else OPTIM="$OPTIM -fstack-protector" fi
[AC_MSG_RESULT([no])])CFLAGS="$OLDCFLAGS"
if test "x$LSB_BUILD" != xy; then @@ -130,23 +130,23 @@ if test -n "$GCC"; then
#
[AC_MSG_RESULT([no])])
;;
*)
CFLAGS="$CFLAGS -fPIE -pie" [AC_MSG_RESULT([no])])
;;
esac
CFLAGS="$OLDCFLAGS"@@ -156,31 +156,31 @@ if test -n "$GCC"; then
OPTIM="-Wall -Wno-format-y2k -Wunused $OPTIM"
AC_MSG_CHECKING(whether compiler supports -Wno-unused-result) [AC_MSG_RESULT([no])])
CFLAGS="$OLDCFLAGS"AC_MSG_CHECKING(whether compiler supports -Wsign-conversion) [AC_MSG_RESULT([no])])
CFLAGS="$OLDCFLAGS"AC_MSG_CHECKING(whether compiler supports -Wno-tautological-compare) [AC_MSG_RESULT([no])])
CFLAGS="$OLDCFLAGS"
# Additional warning options for development testing...diff --git a/config-scripts/cups-defaults.m4 b/config-scripts/cups-defaults.m4
index 3e87de4..e3bea55 100644
--- a/config-scripts/cups-defaults.m4
+++ b/config-scripts/cups-defaults.m4
@@ -16,98 +16,98 @@ dnl
dnl Default languages...
LANGUAGES="ls -1 locale/cups_*.po 2>/dev/null | sed -e '1,$s/locale\/cups_//' -e '1,$s/\.po//' | tr '\n' ' '"
-AC_ARG_WITH(languages, [ --with-languages set installed languages, default=all ],[
[case "$withval" in none | no) LANGUAGES="" ;; all) ;; *) LANGUAGES="$withval" ;; esac]) -AC_SUBST(LANGUAGES) +AC_SUBST([LANGUAGES])
dnl OS X bundle-based localization support -AC_ARG_WITH(bundledir, [ --with-bundledir set OS X localization bundle directory ],
-AC_SUBST(CUPS_BUNDLEDIR) +AC_SUBST([CUPS_BUNDLEDIR]) if test "x$CUPS_BUNDLEDIR" != x; then
AC_DEFINE_UNQUOTED([CUPS_BUNDLEDIR],["$CUPS_BUNDLEDIR"]) fi
dnl Default ConfigFilePerm -AC_ARG_WITH(config_file_perm, [ --with-config-file-perm set default ConfigFilePerm value, default=0640],
fi]) +AC_SUBST([CUPS_CONFIG_FILE_PERM]) +AC_DEFINE_UNQUOTED([CUPS_DEFAULT_CONFIG_FILE_PERM],[0$CUPS_CONFIG_FILE_PERM])
dnl Default permissions for cupsd -AC_ARG_WITH(cupsd_file_perm, [ --with-cupsd-file-perm set default cupsd permissions, default=0500],
[CUPS_CUPSD_FILE_PERM="500"]) AC_SUBST(CUPS_CUPSD_FILE_PERM)
dnl Default LogFilePerm -AC_ARG_WITH(log_file_perm, [ --with-log-file-perm set default LogFilePerm value, default=0644],
[CUPS_LOG_FILE_PERM="644"]) +AC_SUBST([CUPS_LOG_FILE_PERM]) +AC_DEFINE_UNQUOTED([CUPS_DEFAULT_LOG_FILE_PERM], 0$CUPS_LOG_FILE_PERM)
dnl Default FatalErrors -AC_ARG_WITH(fatal_errors, [ --with-fatal-errors set default FatalErrors value, default=config],
[CUPS_FATAL_ERRORS="config"]) +AC_SUBST([CUPS_FATAL_ERRORS]) +AC_DEFINE_UNQUOTED([CUPS_DEFAULT_FATAL_ERRORS],["$CUPS_FATAL_ERRORS"])
dnl Default LogLevel -AC_ARG_WITH(log_level, [ --with-log-level set default LogLevel value, default=warn],
[CUPS_LOG_LEVEL="warn"]) +AC_SUBST([CUPS_LOG_LEVEL]) +AC_DEFINE_UNQUOTED([CUPS_DEFAULT_LOG_LEVEL],["$CUPS_LOG_LEVEL"])
dnl Default AccessLogLevel -AC_ARG_WITH(access_log_level, [ --with-access-log-level set default AccessLogLevel value, default=none],
[CUPS_ACCESS_LOG_LEVEL="none"]) +AC_SUBST([CUPS_ACCESS_LOG_LEVEL]) +AC_DEFINE_UNQUOTED([CUPS_DEFAULT_ACCESS_LOG_LEVEL],["$CUPS_ACCESS_LOG_LEVEL"])
dnl Default PageLogFormat -AC_ARG_WITH(page_logging, [ --enable-page-logging enable page_log by default]) +AC_ARG_WITH([page_logging],[ --enable-page-logging enable page_log by default]) if test "x$enable_page_logging" = xyes; then CUPS_PAGE_LOG_FORMAT="" else CUPS_PAGE_LOG_FORMAT="PageLogFormat" fi -AC_SUBST(CUPS_PAGE_LOG_FORMAT) +AC_SUBST([CUPS_PAGE_LOG_FORMAT])
dnl Default Browsing -AC_ARG_ENABLE(browsing, [ --disable-browsing disable Browsing by default]) +AC_ARG_ENABLE([browsing],[ --disable-browsing disable Browsing by default]) if test "x$enable_browsing" = xno; then CUPS_BROWSING="No"
AC_DEFINE_UNQUOTED([CUPS_DEFAULT_BROWSING],[1]) fi -AC_SUBST(CUPS_BROWSING) +AC_SUBST([CUPS_BROWSING])
dnl Default BrowseLocalProtocols -AC_ARG_WITH(local_protocols, [ --with-local-protocols set default BrowseLocalProtocols, default=""],
[default_local_protocols="default"])
if test x$with_local_protocols != xno; then if test "x$default_local_protocols" = "xdefault"; then @@ -123,96 +123,96 @@ else CUPS_BROWSE_LOCAL_PROTOCOLS="" fi
-AC_SUBST(CUPS_BROWSE_LOCAL_PROTOCOLS) -AC_DEFINE_UNQUOTED(CUPS_DEFAULT_BROWSE_LOCAL_PROTOCOLS,
["$CUPS_BROWSE_LOCAL_PROTOCOLS"])
dnl Default DefaultShared -AC_ARG_ENABLE(default_shared, [ --disable-default-shared +AC_ARG_ENABLE([default_shared],[ --disable-default-shared disable DefaultShared by default]) if test "x$enable_default_shared" = xno; then CUPS_DEFAULT_SHARED="No"
AC_DEFINE_UNQUOTED([CUPS_DEFAULT_DEFAULT_SHARED],[1]) fi -AC_SUBST(CUPS_DEFAULT_SHARED) +AC_SUBST([CUPS_DEFAULT_SHARED])
dnl Determine the correct username and group for this OS... -AC_ARG_WITH(cups_user, [ --with-cups-user set default user for CUPS],
id -u _lp 2>/dev/null = x; then
CUPS_USER="lp";
else
CUPS_USER="_lp";
figrep \^${user}: /etc/passwd" != ""; then
CUPS_USER="$user" AC_MSG_RESULT([$user])
break;
fi
done
if test x$CUPS_USER = x; then
CUPS_USER="nobody"fi])
if test "x$CUPS_USER" = "xroot" -o "x$CUPS_USER" = "x0"; then AC_MSG_ERROR([The default user for CUPS cannot be root!]) fi
-AC_ARG_WITH(cups_group, [ --with-cups-group set default group for CUPS],
id -g _lp 2>/dev/null = x; then
CUPS_GROUP="lp";
else
CUPS_GROUP="_lp";
figrep \^${group}: /etc/group" != ""; then
CUPS_GROUP="$group" AC_MSG_RESULT([$group])
break;
fi
done
if test x$CUPS_GROUP = x; then
CUPS_GROUP="nobody"fi])
if test "x$CUPS_GROUP" = "xroot" -o "x$CUPS_GROUP" = "xwheel" -o "x$CUPS_GROUP" = "x0"; then AC_MSG_ERROR([The default group for CUPS cannot be root!]) fi
-AC_ARG_WITH(system_groups, [ --with-system-groups set default system groups for CUPS],
AC_MSG_CHECKING([for default system groups])
if test -f /etc/group; then
CUPS_SYSTEM_GROUPS=""
GROUP_LIST="lpadmin sys system root"@@ -228,15 +228,15 @@ AC_ARG_WITH(system_groups, [ --with-system-groups set default system groups
if test "x$CUPS_SYSTEM_GROUPS" = x; then
CUPS_SYSTEM_GROUPS="$GROUP_LIST"fi])
CUPS_PRIMARY_SYSTEM_GROUP="echo $CUPS_SYSTEM_GROUPS | awk '{print $1}'"
@@ -246,19 +246,19 @@ for group in $CUPS_SYSTEM_GROUPS; do fi done
-AC_SUBST(CUPS_USER) -AC_SUBST(CUPS_GROUP) -AC_SUBST(CUPS_SYSTEM_GROUPS) -AC_SUBST(CUPS_PRIMARY_SYSTEM_GROUP) +AC_SUBST([CUPS_USER]) +AC_SUBST([CUPS_GROUP]) +AC_SUBST([CUPS_SYSTEM_GROUPS]) +AC_SUBST([CUPS_PRIMARY_SYSTEM_GROUP])
-AC_DEFINE_UNQUOTED(CUPS_DEFAULT_USER, "$CUPS_USER") -AC_DEFINE_UNQUOTED(CUPS_DEFAULT_GROUP, "$CUPS_GROUP") -AC_DEFINE_UNQUOTED(CUPS_DEFAULT_SYSTEM_GROUPS, "$CUPS_SYSTEM_GROUPS") +AC_DEFINE_UNQUOTED([CUPS_DEFAULT_USER],["$CUPS_USER"]) +AC_DEFINE_UNQUOTED([CUPS_DEFAULT_GROUP],["$CUPS_GROUP"]) +AC_DEFINE_UNQUOTED([CUPS_DEFAULT_SYSTEM_GROUPS],["$CUPS_SYSTEM_GROUPS"])
dnl Default printcap file... -AC_ARG_WITH(printcap, [ --with-printcap set default printcap file],
[default_printcap="default"])
if test x$default_printcap != xno; then if test "x$default_printcap" = "xdefault"; then @@ -284,13 +284,13 @@ else CUPS_DEFAULT_PRINTCAP="" fi
-AC_SUBST(CUPS_DEFAULT_PRINTCAP) -AC_DEFINE_UNQUOTED(CUPS_DEFAULT_PRINTCAP, "$CUPS_DEFAULT_PRINTCAP") +AC_SUBST([CUPS_DEFAULT_PRINTCAP]) +AC_DEFINE_UNQUOTED([CUPS_DEFAULT_PRINTCAP],["$CUPS_DEFAULT_PRINTCAP"])
dnl Default LPD config file... -AC_ARG_WITH(lpdconfigfile, [ --with-lpdconfigfile set default LPDConfigFile URI],
[default_lpdconfigfile="default"])
if test x$default_lpdconfigfile != xno; then if test "x$default_lpdconfigfile" = "xdefault"; then @@ -313,13 +313,13 @@ else CUPS_DEFAULT_LPD_CONFIG_FILE="" fi
-AC_DEFINE_UNQUOTED(CUPS_DEFAULT_LPD_CONFIG_FILE, "$CUPS_DEFAULT_LPD_CONFIG_FILE") -AC_SUBST(CUPS_DEFAULT_LPD_CONFIG_FILE) +AC_DEFINE_UNQUOTED([CUPS_DEFAULT_LPD_CONFIG_FILE],["$CUPS_DEFAULT_LPD_CONFIG_FILE"]) +AC_SUBST([CUPS_DEFAULT_LPD_CONFIG_FILE])
dnl Default SMB config file... -AC_ARG_WITH(smbconfigfile, [ --with-smbconfigfile set default SMBConfigFile URI],
[default_smbconfigfile="default"])
if test x$default_smbconfigfile != xno; then if test "x$default_smbconfigfile" = "xdefault"; then @@ -335,28 +335,28 @@ else CUPS_DEFAULT_SMB_CONFIG_FILE="" fi
-AC_DEFINE_UNQUOTED(CUPS_DEFAULT_SMB_CONFIG_FILE, "$CUPS_DEFAULT_SMB_CONFIG_FILE") -AC_SUBST(CUPS_DEFAULT_SMB_CONFIG_FILE) +AC_DEFINE_UNQUOTED([CUPS_DEFAULT_SMB_CONFIG_FILE],["$CUPS_DEFAULT_SMB_CONFIG_FILE"]) +AC_SUBST([CUPS_DEFAULT_SMB_CONFIG_FILE])
dnl Default MaxCopies value... -AC_ARG_WITH(max-copies, [ --with-max-copies set default max copies value, default=9999 ],
-AC_SUBST(CUPS_MAX_COPIES) -AC_DEFINE_UNQUOTED(CUPS_DEFAULT_MAX_COPIES, $CUPS_MAX_COPIES) +AC_SUBST([CUPS_MAX_COPIES]) +AC_DEFINE_UNQUOTED([CUPS_DEFAULT_MAX_COPIES],[$CUPS_MAX_COPIES])
dnl Default raw printing state -AC_ARG_ENABLE(raw_printing, [ --disable-raw-printing do not allow raw printing by default]) +AC_ARG_ENABLE([raw_printing],[ --disable-raw-printing do not allow raw printing by default]) if test "x$enable_raw_printing" != xno; then DEFAULT_RAW_PRINTING="" else DEFAULT_RAW_PRINTING="#" fi -AC_SUBST(DEFAULT_RAW_PRINTING) +AC_SUBST([DEFAULT_RAW_PRINTING])
dnl Default SNMP options... -AC_ARG_WITH(snmp-address, [ --with-snmp-address set SNMP query address, default=auto ], +AC_ARG_WITH([snmp-address],[ --with-snmp-address set SNMP query address, default=auto], if test "x$withval" = x; then CUPS_SNMP_ADDRESS="" else @@ -368,23 +368,23 @@ AC_ARG_WITH(snmp-address, [ --with-snmp-address set SNMP query address, def CUPS_SNMP_ADDRESS="Address @LOCAL" fi)
-AC_ARG_WITH(snmp-community, [ --with-snmp-community set SNMP community, default=public ],
-AC_SUBST(CUPS_SNMP_ADDRESS) -AC_SUBST(CUPS_SNMP_COMMUNITY) +AC_SUBST([CUPS_SNMP_ADDRESS]) +AC_SUBST([CUPS_SNMP_COMMUNITY])
dnl New default port definition for IPP... -AC_ARG_WITH(ipp-port, [ --with-ipp-port set port number for IPP, default=631 ],
-AC_SUBST(DEFAULT_IPP_PORT) -AC_DEFINE_UNQUOTED(CUPS_DEFAULT_IPP_PORT,$DEFAULT_IPP_PORT) +AC_SUBST([DEFAULT_IPP_PORT]) +AC_DEFINE_UNQUOTED([CUPS_DEFAULT_IPP_PORT],[$DEFAULT_IPP_PORT])
dnl Web interface... -AC_ARG_ENABLE(webif, [ --enable-webif enable the web interface by default, default=no for OS X]) +AC_ARG_ENABLE([webif],[ --enable-webif enable the web interface by default, default=no for OS X]) case "x$enable_webif" in xno) CUPS_WEBIF=No @@ -405,8 +405,8 @@ case "x$enable_webif" in ;; esac
-AC_SUBST(CUPS_WEBIF) -AC_DEFINE_UNQUOTED(CUPS_DEFAULT_WEBIF, $CUPS_DEFAULT_WEBIF) +AC_SUBST([CUPS_WEBIF]) +AC_DEFINE_UNQUOTED([CUPS_DEFAULT_WEBIF],[$CUPS_DEFAULT_WEBIF])
dnl dnl End of "$Id$". diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4 index 40a1703..d8b3f10 100644 --- a/config-scripts/cups-directories.m4 +++ b/config-scripts/cups-directories.m4 @@ -34,14 +34,14 @@ if test "$bindir" = "\${exec_prefix}/bin"; then bindir="$exec_prefix/bin" fi
-AC_DEFINE_UNQUOTED(CUPS_BINDIR, "$bindir") +AC_DEFINE_UNQUOTED([CUPS_BINDIR],["$bindir"])
dnl Fix "sbindir" variable... if test "$sbindir" = "\${exec_prefix}/sbin"; then sbindir="$exec_prefix/sbin" fi
-AC_DEFINE_UNQUOTED(CUPS_SBINDIR, "$sbindir") +AC_DEFINE_UNQUOTED([CUPS_SBINDIR],["$sbindir"])
dnl Fix "sharedstatedir" variable if it hasn't been specified... if test "$sharedstatedir" = "\${prefix}/com" -a "$prefix" = "/"; then @@ -111,19 +111,19 @@ if test "$libdir" = "\${exec_prefix}/lib"; then fi
dnl Setup private include directory... -AC_ARG_WITH(privateinclude, [ --with-privateinclude set path for private include files, default=none],privateinclude="$withval",privateinclude="") +AC_ARG_WITH([privateinclude],[ --with-privateinclude set path for private include files, default=none],[privateinclude="$withval"],[privateinclude=""]) if test "x$privateinclude" != x -a "x$privateinclude" != xnone; then PRIVATEINCLUDE="$privateinclude/cups" else privateinclude="" PRIVATEINCLUDE="" fi -AC_SUBST(privateinclude) -AC_SUBST(PRIVATEINCLUDE) +AC_SUBST([privateinclude]) +AC_SUBST([PRIVATEINCLUDE])
dnl LPD sharing support... -AC_ARG_WITH(lpdconfig, [ --with-lpdconfig set URI for LPD config file],
[LPDCONFIG="$withval"],[LPDCONFIG=""])
if test "x$LPDCONFIG" = x; then if test -f /System/Library/LaunchDaemons/org.cups.cups-lpd.plist; then @@ -134,14 +134,14 @@ if test "x$LPDCONFIG" = x; then fi
if test "x$LPDCONFIG" = xoff; then
AC_DEFINE_UNQUOTED([CUPS_DEFAULT_LPD_CONFIG],["$LPDCONFIG"]) fi
dnl SMB sharing support... -AC_ARG_WITH(smbconfig, [ --with-smbconfig set URI for Samba config file],
[SMBCONFIG="$withval"],[SMBCONFIG=""])
if test "x$SMBCONFIG" = x; then if test -f /System/Library/LaunchDaemons/smbd.plist; then @@ -157,14 +157,14 @@ if test "x$SMBCONFIG" = x; then fi
if test "x$SMBCONFIG" = xoff; then
AC_DEFINE_UNQUOTED([CUPS_DEFAULT_SMB_CONFIG],["$SMBCONFIG"]) fi
dnl Setup default locations...
-AC_ARG_WITH(cachedir, [ --with-cachedir set path for cache files],cachedir="$withval",cachedir="") +AC_ARG_WITH([cachedir],[ --with-cachedir set path for cache files],[cachedir="$withval"],[cachedir=""])
if test x$cachedir = x; then if test "x$uname" = xDarwin; then @@ -175,16 +175,16 @@ if test x$cachedir = x; then else CUPS_CACHEDIR="$cachedir" fi -AC_DEFINE_UNQUOTED(CUPS_CACHEDIR, "$CUPS_CACHEDIR") -AC_SUBST(CUPS_CACHEDIR) +AC_DEFINE_UNQUOTED([CUPS_CACHEDIR],["$CUPS_CACHEDIR"]) +AC_SUBST([CUPS_CACHEDIR])
CUPS_DATADIR="$datadir/cups" -AC_DEFINE_UNQUOTED(CUPS_DATADIR, "$datadir/cups") -AC_SUBST(CUPS_DATADIR) +AC_DEFINE_UNQUOTED([CUPS_DATADIR],["$datadir/cups"]) +AC_SUBST([CUPS_DATADIR])
-AC_ARG_WITH(icondir, [ --with-icondir set path for application icons],icondir="$withval",icondir="") +AC_ARG_WITH([icondir],[ --with-icondir set path for application icons],[icondir="$withval"],[icondir=""])
if test "x$icondir" = x -a -d /usr/share/icons; then ICONDIR="/usr/share/icons" @@ -192,10 +192,10 @@ else ICONDIR="$icondir" fi
-AC_SUBST(ICONDIR) +AC_SUBST([ICONDIR])
-AC_ARG_WITH(menudir, [ --with-menudir set path for application menus],menudir="$withval",menudir="") +AC_ARG_WITH([menudir],[ --with-menudir set path for application menus],[menudir="$withval"],[menudir=""])
if test "x$menudir" = x -a -d /usr/share/applications; then MENUDIR="/usr/share/applications" @@ -203,10 +203,10 @@ else MENUDIR="$menudir" fi
-AC_SUBST(MENUDIR) +AC_SUBST([MENUDIR])
-AC_ARG_WITH(docdir, [ --with-docdir set path for documentation],docdir="$withval",docdir="") +AC_ARG_WITH([docdir],[ --with-docdir set path for documentation],[docdir="$withval"],[docdir=""])
if test x$docdir = x; then CUPS_DOCROOT="$datadir/doc/cups" @@ -215,11 +215,11 @@ else CUPS_DOCROOT="$docdir" fi
-AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$docdir") -AC_SUBST(CUPS_DOCROOT) +AC_DEFINE_UNQUOTED([CUPS_DOCROOT],["$docdir"]) +AC_SUBST([CUPS_DOCROOT])
-AC_ARG_WITH(fontpath, [ --with-fontpath set font path for pstoraster],fontpath="$withval",fontpath="") +AC_ARG_WITH([fontpath],[ --with-fontpath set font path for pstoraster],[fontpath="$withval"],[fontpath=""])
if test "x$fontpath" = "x"; then CUPS_FONTPATH="$datadir/cups/fonts" @@ -227,8 +227,8 @@ else CUPS_FONTPATH="$fontpath" fi
-AC_SUBST(CUPS_FONTPATH) -AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$CUPS_FONTPATH") +AC_SUBST([CUPS_FONTPATH]) +AC_DEFINE_UNQUOTED([CUPS_FONTPATH],["$CUPS_FONTPATH"])
if test "$localedir" = "\${datarootdir}/locale"; then @@ -246,25 +246,25 @@ else CUPS_LOCALEDIR="$localedir" fi
-AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$CUPS_LOCALEDIR") -AC_SUBST(CUPS_LOCALEDIR) +AC_DEFINE_UNQUOTED([CUPS_LOCALEDIR],["$CUPS_LOCALEDIR"]) +AC_SUBST([CUPS_LOCALEDIR])
-AC_ARG_WITH(logdir, [ --with-logdir set path for log files],logdir="$withval",logdir="") +AC_ARG_WITH([logdir],[ --with-logdir set path for log files],[logdir="$withval"],[logdir=""])
if test x$logdir = x; then CUPS_LOGDIR="$localstatedir/log/cups"
AC_DEFINE_UNQUOTED([CUPS_LOGDIR],["$localstatedir/log/cups"]) else CUPS_LOGDIR="$logdir" fi -AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$CUPS_LOGDIR") -AC_SUBST(CUPS_LOGDIR) +AC_DEFINE_UNQUOTED([CUPS_LOGDIR],["$CUPS_LOGDIR"]) +AC_SUBST([CUPS_LOGDIR])
CUPS_REQUESTS="$localstatedir/spool/cups" -AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$localstatedir/spool/cups") -AC_SUBST(CUPS_REQUESTS) +AC_DEFINE_UNQUOTED([CUPS_REQUESTS],["$localstatedir/spool/cups"]) +AC_SUBST([CUPS_REQUESTS])
case "$uname" in @@ -280,18 +280,18 @@ case "$uname" in ;; esac
-AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$CUPS_SERVERBIN") -AC_SUBST(CUPS_SERVERBIN) -AC_SUBST(INSTALL_SYSV) +AC_DEFINE_UNQUOTED([CUPS_SERVERBIN],["$CUPS_SERVERBIN"]) +AC_SUBST([CUPS_SERVERBIN]) +AC_SUBST([INSTALL_SYSV])
CUPS_SERVERROOT="$sysconfdir/cups" -AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$sysconfdir/cups") -AC_SUBST(CUPS_SERVERROOT) +AC_DEFINE_UNQUOTED([CUPS_SERVERROOT],["$sysconfdir/cups"]) +AC_SUBST([CUPS_SERVERROOT])
-AC_ARG_WITH(rundir, [ --with-rundir set transient run-time state directory],CUPS_STATEDIR="$withval",[
[case "$uname" in Darwin*)
CUPS_STATEDIR="$CUPS_SERVERROOT"@@ -301,8 +301,8 @@ AC_ARG_WITH(rundir, [ --with-rundir set transient run-time state dire CUPS_STATEDIR="$localstatedir/run/cups" ;; esac]) -AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR") -AC_SUBST(CUPS_STATEDIR) +AC_DEFINE_UNQUOTED([CUPS_STATEDIR],["$CUPS_STATEDIR"]) +AC_SUBST([CUPS_STATEDIR])
dnl dnl End of "$Id$". diff --git a/config-scripts/cups-dnssd.m4 b/config-scripts/cups-dnssd.m4 index 9207d61..f4718d6 100644 --- a/config-scripts/cups-dnssd.m4 +++ b/config-scripts/cups-dnssd.m4 @@ -12,14 +12,14 @@ dnl which should have been included with this file. If this file is dnl file is missing or damaged, see the license at "http://www.cups.org/". dnl
-AC_ARG_ENABLE(avahi, [ --disable-avahi disable DNS Service Discovery support using Avahi]) -AC_ARG_ENABLE(dnssd, [ --disable-dnssd disable DNS Service Discovery support using mDNSResponder]) -AC_ARG_WITH(dnssd-libs, [ --with-dnssd-libs set directory for DNS Service Discovery library],
CPPFLAGS="-I$withval $CPPFLAGS"],)
DNSSDLIBS="" DNSSD_BACKEND="" @@ -27,26 +27,26 @@ IPPFIND_BIN="" IPPFIND_MAN=""
if test "x$PKGCONFIG" != x -a x$enable_avahi != xno; then
$PKGCONFIG --cflags avahi-client"
DNSSDLIBS="$PKGCONFIG --libs avahi-client"
DNSSD_BACKEND="dnssd"
IPPFIND_BIN="ippfind"
IPPFIND_MAN="ippfind.\$(MAN1EXT)"AC_MSG_RESULT([no])fi fi
if test "x$DNSSD_BACKEND" = x -a x$enable_dnssd != xno; then
-AC_SUBST(DNSSDLIBS) -AC_SUBST(DNSSD_BACKEND) -AC_SUBST(IPPFIND_BIN) -AC_SUBST(IPPFIND_MAN) +AC_SUBST([DNSSDLIBS]) +AC_SUBST([DNSSD_BACKEND]) +AC_SUBST([IPPFIND_BIN]) +AC_SUBST([IPPFIND_MAN])
dnl dnl End of "$Id$". diff --git a/config-scripts/cups-gssapi.m4 b/config-scripts/cups-gssapi.m4 index 531308d..377fa27 100644 --- a/config-scripts/cups-gssapi.m4 +++ b/config-scripts/cups-gssapi.m4 @@ -16,33 +16,33 @@ dnl which should have been included with this file. If this file is dnl file is missing or damaged, see the license at "http://www.cups.org/". dnl
-AC_ARG_ENABLE(gssapi, [ --disable-gssapi disable GSSAPI support]) +AC_ARG_ENABLE([gssapi],[ --disable-gssapi disable GSSAPI support])
LIBGSSAPI="" -AC_SUBST(LIBGSSAPI) +AC_SUBST([LIBGSSAPI])
if test x$enable_gssapi != xno; then
LIBGSSAPI="-weak_framework Kerberos"$KRB5CONFIG --cflags $CFLAGS"
CPPFLAGS="$KRB5CONFIG --cflags $CPPFLAGS"$KRB5CONFIG --libs")$KRB5CONFIG --libs"])
;;
*)
@@ -51,59 +51,59 @@ if test x$enable_gssapi != xno; then
LIBGSSAPI="$KRB5CONFIG --libs gssapi"
;;
esac
case "$uname" in HP-UX*)
LIBGSSAPI="-lgss"])
;;
esacfi
if test "x$LIBGSSAPI" != x; then
AC_CHECK_HEADER([gssapi/gssapi.h],[AC_DEFINE([HAVE_GSSAPI_GSSAPI_H],[1],[This header file is available.])])
fi
SAVELIBS="$LIBS"
LIBS="$LIBS $LIBGSSAPI"AC_CHECK_FUNC(__ApplePrivate_gss_acquire_cred_ex_f, [AC_DEFINE([HAVE_GSS_ACQUIRE_CRED_EX_F],[1],[The __ApplePrivate_gss_acquire_cred_ex_f() function is available.])])
AC_MSG_CHECKING(for GSS_C_NT_HOSTBASED_SERVICE)
if test x$ac_cv_header_gssapi_gssapi_h = xyes; then
AC_TRY_COMPILE([ #include <gssapi/gssapi.h> ],
[ gss_OID foo = GSS_C_NT_HOSTBASED_SERVICE; ], [AC_MSG_RESULT([no])])
fi
LIBS="$SAVELIBS"@@ -111,9 +111,9 @@ if test x$enable_gssapi != xno; then fi
dnl Default GSS service name... -AC_ARG_WITH(gssservicename, [ --with-gssservicename set default gss service name],
[default_gssservicename="default"])
if test x$default_gssservicename != xno; then if test "x$default_gssservicename" = "xdefault"; then @@ -125,8 +125,8 @@ else CUPS_DEFAULT_GSSSERVICENAME="" fi
-AC_SUBST(CUPS_DEFAULT_GSSSERVICENAME) -AC_DEFINE_UNQUOTED(CUPS_DEFAULT_GSSSERVICENAME, "$CUPS_DEFAULT_GSSSERVICENAME") +AC_SUBST([CUPS_DEFAULT_GSSSERVICENAME]) +AC_DEFINE_UNQUOTED([CUPS_DEFAULT_GSSSERVICENAME],["$CUPS_DEFAULT_GSSSERVICENAME"])
dnl dnl End of "$Id$". diff --git a/config-scripts/cups-largefile.m4 b/config-scripts/cups-largefile.m4 index 6ef4b81..eda4229 100644 --- a/config-scripts/cups-largefile.m4 +++ b/config-scripts/cups-largefile.m4 @@ -29,7 +29,7 @@ if test x$enable_largefile != xno; then LARGEFILE="$LARGEFILE -D_FILE_OFFSET_BITS=64" fi fi -AC_SUBST(LARGEFILE) +AC_SUBST([LARGEFILE])
dnl Check for "long long" support... AC_CACHE_CHECK(for long long int, ac_cv_c_long_long, @@ -37,15 +37,15 @@ AC_CACHE_CHECK(for long long int, ac_cv_c_long_long, ac_cv_c_long_long=yes else AC_TRY_COMPILE(,[long long int i;],
[ac_cv_c_long_long=no])fi])
if test $ac_cv_c_long_long = yes; then
-AC_CHECK_FUNC(strtoll, AC_DEFINE(HAVE_STRTOLL)) +AC_CHECK_FUNC([strtoll],[AC_DEFINE([HAVE_STRTOLL],[1],[The strtoll() function is available.])])
dnl dnl End of "$Id$". diff --git a/config-scripts/cups-libtool.m4 b/config-scripts/cups-libtool.m4 index 5fc0d6e..37534be 100644 --- a/config-scripts/cups-libtool.m4 +++ b/config-scripts/cups-libtool.m4 @@ -13,7 +13,7 @@ dnl which should have been included with this file. If this file is dnl file is missing or damaged, see the license at "http://www.cups.org/". dnl
-AC_ARG_ENABLE(libtool_unsupported, [ --enable-libtool-unsupported +AC_ARG_ENABLE([libtool_unsupported],[ --enable-libtool-unsupported build with libtool (UNSUPPORTED!)], [if test x$enable_libtool_unsupported != xno; then LIBTOOL="$enable_libtool_unsupported"
michaelrsweet
commented
9 years ago @@ -24,7 +24,7 @@ AC_ARG_ENABLE(libtool_unsupported, [ --enable-libtool-unsupported LIBTOOL="" fi])
-AC_SUBST(LIBTOOL) +AC_SUBST([LIBTOOL])
if test x$LIBTOOL != x; then LIBCUPS="libcups.la" diff --git a/config-scripts/cups-manpages.m4 b/config-scripts/cups-manpages.m4 index 08aad84..f183c5f 100644 --- a/config-scripts/cups-manpages.m4 +++ b/config-scripts/cups-manpages.m4 @@ -40,8 +40,8 @@ else PMANDIR="$mandir" fi
-AC_SUBST(AMANDIR) -AC_SUBST(PMANDIR) +AC_SUBST([AMANDIR]) +AC_SUBST([PMANDIR])
dnl Setup manpage extensions... case "$uname" in @@ -71,11 +71,11 @@ case "$uname" in ;; esac
-AC_SUBST(MAN1EXT) -AC_SUBST(MAN5EXT) -AC_SUBST(MAN7EXT) -AC_SUBST(MAN8EXT) -AC_SUBST(MAN8DIR) +AC_SUBST([MAN1EXT]) +AC_SUBST([MAN5EXT]) +AC_SUBST([MAN7EXT]) +AC_SUBST([MAN8EXT]) +AC_SUBST([MAN8DIR])
dnl dnl End of "$Id$". diff --git a/config-scripts/cups-network.m4 b/config-scripts/cups-network.m4 index 636518f..40ce85c 100644 --- a/config-scripts/cups-network.m4 +++ b/config-scripts/cups-network.m4 @@ -13,37 +13,37 @@ dnl which should have been included with this file. If this file is dnl file is missing or damaged, see the license at "http://www.cups.org/". dnl
-AC_CHECK_HEADER(resolv.h,AC_DEFINE(HAVE_RESOLV_H),,[ -#include <sys/socket.h> +AC_CHECK_HEADER([resolv.h],[AC_DEFINE([HAVE_RESOLV_H],[1],[This header file is available.])],, +[#include <sys/socket.h>
-AC_SEARCH_LIBS(socket, socket) -AC_SEARCH_LIBS(gethostbyaddr, nsl) -AC_SEARCH_LIBS(getifaddrs, nsl, AC_DEFINE(HAVE_GETIFADDRS)) -AC_SEARCH_LIBS(hstrerror, nsl socket resolv, AC_DEFINE(HAVE_HSTRERROR)) -AC_SEARCH_LIBS(rresvport_af, nsl, AC_DEFINE(HAVE_RRESVPORT_AF)) -AC_SEARCH_LIBS(__res_init, resolv bind, AC_DEFINE(HAVE_RES_INIT),
[AC_SEARCH_LIBS([res_init],[resolv bind],[AC_DEFINE([HAVE_RES_INIT],[1],[A res_init() function is available.])])])])
if test "$uname" != "OSF1"; then
-AC_CHECK_MEMBER(struct sockaddr.sa_len,,, [#include <sys/socket.h>]) -AC_CHECK_HEADER(sys/sockio.h, AC_DEFINE(HAVE_SYS_SOCKIO_H)) +AC_CHECK_MEMBER([struct sockaddr.sa_len],,,[#include <sys/socket.h>]) +AC_CHECK_HEADER([sys/sockio.h],[AC_DEFINE([HAVE_SYS_SOCKIO_H],[1],[This header file is available.])])
CUPS_DEFAULT_DOMAINSOCKET=""
dnl Domain socket support... -AC_ARG_WITH(domainsocket, [ --with-domainsocket set unix domain socket name],
[default_domainsocket=""])
if test x$enable_domainsocket != xno -a x$default_domainsocket != xno; then if test "x$default_domainsocket" = x; then @@ -63,13 +63,13 @@ if test x$enable_domainsocket != xno -a x$default_domainsocket != xno; then
CUPS_LISTEN_DOMAINSOCKET="Listen $CUPS_DEFAULT_DOMAINSOCKET"
-AC_SUBST(CUPS_DEFAULT_DOMAINSOCKET) -AC_SUBST(CUPS_LISTEN_DOMAINSOCKET) +AC_SUBST([CUPS_DEFAULT_DOMAINSOCKET]) +AC_SUBST([CUPS_LISTEN_DOMAINSOCKET])
dnl dnl End of "$Id$". diff --git a/config-scripts/cups-pam.m4 b/config-scripts/cups-pam.m4 index 0d7d9ad..a423556 100644 --- a/config-scripts/cups-pam.m4 +++ b/config-scripts/cups-pam.m4 @@ -13,8 +13,8 @@ dnl which should have been included with this file. If this file is dnl file is missing or damaged, see the license at "http://www.cups.org/". dnl
-AC_ARG_ENABLE(pam, [ --disable-pam disable PAM support]) -AC_ARG_WITH(pam_module, [ --with-pam-module specify the PAM module to use]) +AC_ARG_ENABLE([pam],[ --disable-pam disable PAM support]) +AC_ARG_WITH([pam_module],[ --with-pam-module specify the PAM module to use])
PAMDIR="" PAMFILE="pam.std" @@ -25,14 +25,14 @@ PAMMODAUTH="pam_unknown.so" if test x$enable_pam != xno; then SAVELIBS="$LIBS"
[AC_DEFINE([HAVE_PAM_PAM_APPL_H],[1],[This header file is available.])])fi
if test x$ac_cv_lib_pam_pam_start != xno; then @@ -86,11 +86,11 @@ if test x$enable_pam != xno; then esac fi
-AC_SUBST(PAMDIR) -AC_SUBST(PAMFILE) -AC_SUBST(PAMLIBS) -AC_SUBST(PAMMOD) -AC_SUBST(PAMMODAUTH) +AC_SUBST([PAMDIR]) +AC_SUBST([PAMFILE]) +AC_SUBST([PAMLIBS]) +AC_SUBST([PAMMOD]) +AC_SUBST([PAMMODAUTH])
dnl dnl End of "$Id$". diff --git a/config-scripts/cups-poll.m4 b/config-scripts/cups-poll.m4 index 901068c..e1dd0c2 100644 --- a/config-scripts/cups-poll.m4 +++ b/config-scripts/cups-poll.m4 @@ -13,9 +13,9 @@ dnl which should have been included with this file. If this file is dnl file is missing or damaged, see the license at "http://www.cups.org/". dnl
-AC_CHECK_FUNC(poll, AC_DEFINE(HAVE_POLL)) -AC_CHECK_FUNC(epoll_create, AC_DEFINE(HAVE_EPOLL)) -AC_CHECK_FUNC(kqueue, AC_DEFINE(HAVE_KQUEUE)) +AC_CHECK_FUNC([poll],[AC_DEFINE([HAVE_POLL],[1],[The poll() function is available.])]) +AC_CHECK_FUNC([epoll_create],[AC_DEFINE([HAVE_EPOLL],[1],[The epoll_create() function is available.])]) +AC_CHECK_FUNC([kqueue],[AC_DEFINE([HAVE_KQUEUE],[1],[The kqueue() function is available.])])
dnl dnl End of "$Id$". diff --git a/config-scripts/cups-scripting.m4 b/config-scripts/cups-scripting.m4 index af97a94..bd0f7af 100644 --- a/config-scripts/cups-scripting.m4 +++ b/config-scripts/cups-scripting.m4 @@ -14,74 +14,74 @@ dnl file is missing or damaged, see the license at "http://www.cups.org/". dnl
dnl Do we have Java? -AC_ARG_WITH(java, [ --with-java set Java interpreter for web interfaces ],
[CUPS_JAVA=""])
if test "x$CUPS_JAVA" = x; then
-AC_DEFINE_UNQUOTED(CUPS_JAVA, "$CUPS_JAVA") +AC_DEFINE_UNQUOTED([CUPS_JAVA],["$CUPS_JAVA"])
if test "x$CUPS_JAVA" != x; then
AC_DEFINE([HAVE_JAVA],[1],[This software is available.]) fi
dnl Do we have Perl? -AC_ARG_WITH(perl, [ --with-perl set Perl interpreter for web interfaces ],
[CUPS_PERL=""])
if test "x$CUPS_PERL" = x; then
-AC_DEFINE_UNQUOTED(CUPS_PERL, "$CUPS_PERL") +AC_DEFINE_UNQUOTED([CUPS_PERL],["$CUPS_PERL"])
if test "x$CUPS_PERL" != x; then
AC_DEFINE([HAVE_PERL],[1],[This software is available.]) fi
dnl Do we have PHP? -AC_ARG_WITH(php, [ --with-php set PHP interpreter for web interfaces ],
[CUPS_PHP=""])
if test "x$CUPS_PHP" = x; then
-AC_DEFINE_UNQUOTED(CUPS_PHP, "$CUPS_PHP") +AC_DEFINE_UNQUOTED([CUPS_PHP],["$CUPS_PHP"])
if test "x$CUPS_PHP" = x; then CUPS_PHP="no" else
AC_DEFINE([HAVE_PHP],[1],[This software is available.]) fi
dnl Do we have Python? -AC_ARG_WITH(python, [ --with-python set Python interpreter for web interfaces ],
[CUPS_PYTHON=""])
if test "x$CUPS_PYTHON" = x; then
-AC_DEFINE_UNQUOTED(CUPS_PYTHON, "$CUPS_PYTHON") +AC_DEFINE_UNQUOTED([CUPS_PYTHON],["$CUPS_PYTHON"])
if test "x$CUPS_PYTHON" != x; then
AC_DEFINE([HAVE_PYTHON],[1],[This software is available.]) fi
dnl diff --git a/config-scripts/cups-sharedlibs.m4 b/config-scripts/cups-sharedlibs.m4 index 23b1adf..b0a8763 100644 --- a/config-scripts/cups-sharedlibs.m4 +++ b/config-scripts/cups-sharedlibs.m4 @@ -16,7 +16,7 @@ dnl PICFLAG=1 DSOFLAGS="${DSOFLAGS:=}"
-AC_ARG_ENABLE(shared, [ --disable-shared do not create shared libraries]) +AC_ARG_ENABLE([shared],[ --disable-shared do not create shared libraries])
cupsbase="cups" LIBCUPSBASE="lib$cupsbase" @@ -78,16 +78,16 @@ else DSOXX=":" fi
-AC_SUBST(DSO) -AC_SUBST(DSOXX) -AC_SUBST(DSOFLAGS) -AC_SUBST(LIBCUPS) -AC_SUBST(LIBCUPSBASE) -AC_SUBST(LIBCUPSCGI) -AC_SUBST(LIBCUPSIMAGE) -AC_SUBST(LIBCUPSMIME) -AC_SUBST(LIBCUPSPPDC) -AC_SUBST(LIBCUPSSTATIC) +AC_SUBST([DSO]) +AC_SUBST([DSOXX]) +AC_SUBST([DSOFLAGS]) +AC_SUBST([LIBCUPS]) +AC_SUBST([LIBCUPSBASE]) +AC_SUBST([LIBCUPSCGI]) +AC_SUBST([LIBCUPSIMAGE]) +AC_SUBST([LIBCUPSMIME]) +AC_SUBST([LIBCUPSPPDC]) +AC_SUBST([LIBCUPSSTATIC])
if test x$enable_shared = xno; then LINKCUPS="../cups/lib$cupsbase.a" @@ -103,10 +103,10 @@ else EXTLINKCUPSIMAGE="-lcupsimage" fi
-AC_SUBST(EXTLINKCUPS) -AC_SUBST(EXTLINKCUPSIMAGE) -AC_SUBST(LINKCUPS) -AC_SUBST(LINKCUPSIMAGE) +AC_SUBST([EXTLINKCUPS]) +AC_SUBST([EXTLINKCUPSIMAGE]) +AC_SUBST([LINKCUPS]) +AC_SUBST([LINKCUPSIMAGE])
dnl Update libraries for DSOs... EXPORT_LDFLAGS="" @@ -153,9 +153,9 @@ else IMGLIBS="\$(LIBZ)" fi
-AC_SUBST(DSOLIBS) -AC_SUBST(IMGLIBS) -AC_SUBST(EXPORT_LDFLAGS) +AC_SUBST([DSOLIBS]) +AC_SUBST([IMGLIBS]) +AC_SUBST([EXPORT_LDFLAGS])
dnl dnl End of "$Id$". diff --git a/config-scripts/cups-ssl.m4 b/config-scripts/cups-ssl.m4 index d48681e..22314ce 100644 --- a/config-scripts/cups-ssl.m4 +++ b/config-scripts/cups-ssl.m4 @@ -13,9 +13,9 @@ dnl which should have been included with this file. If this file is dnl file is missing or damaged, see the license at "http://www.cups.org/". dnl
-AC_ARG_ENABLE(ssl, [ --disable-ssl disable SSL/TLS support]) -AC_ARG_ENABLE(cdsassl, [ --enable-cdsassl use CDSA for SSL/TLS support, default=first]) -AC_ARG_ENABLE(gnutls, [ --enable-gnutls use GNU TLS for SSL/TLS support, default=second]) +AC_ARG_ENABLE([ssl],[ --disable-ssl disable SSL/TLS support]) +AC_ARG_ENABLE([cdsassl],[ --enable-cdsassl use CDSA for SSL/TLS support, default=first]) +AC_ARG_ENABLE([gnutls],[ --enable-gnutls use GNU TLS for SSL/TLS support, default=second])
SSLFLAGS="" SSLLIBS="" @@ -26,56 +26,56 @@ if test x$enable_ssl != xno; then dnl Look for CDSA... if test $have_ssl = 0 -a "x$enable_cdsassl" != "xno"; then if test $uname = Darwin; then
AC_DEFINE([HAVE_CDSASSL],[1],[This software is available.])
CUPS_SERVERKEYCHAIN="/Library/Keychains/System.keychain"
dnl Check for the various security headers... [AC_DEFINE([HAVE_SECIDENTITYSEARCHPRIV_H],[1],[This header file is available.])])AC_DEFINE(HAVE_CSSMERRORSTRING)AC_DEFINE([HAVE_SECKEYCHAINOPEN],[1],[This functionality is available.])])
if test $uversion -ge 150; then AC_DEFINE([HAVE_SSLSETENABLEDCIPHERS],[1],[This functionality is available.])
fifi fi
dnl Then look for GNU TLS... if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a "x$PKGCONFIG" != x; then
$PKGCONFIG --libs gnutls
SSLFLAGS=$PKGCONFIG --cflags gnutls$LIBGNUTLSCONFIG --libs
SSLFLAGS=$LIBGNUTLSCONFIG --cflagsAC_DEFINE([HAVE_GNUTLS],[1],[This software is available.])fi
if test $have_ssl = 1; then @@ -83,8 +83,8 @@ if test x$enable_ssl != xno; then
SAVELIBS="$LIBS"
LIBS="$LIBS $SSLLIBS"-AC_SUBST(CUPS_SERVERKEYCHAIN) -AC_SUBST(IPPALIASES) -AC_SUBST(SSLFLAGS) -AC_SUBST(SSLLIBS) +AC_SUBST([CUPS_SERVERKEYCHAIN]) +AC_SUBST([IPPALIASES]) +AC_SUBST([SSLFLAGS]) +AC_SUBST([SSLLIBS])
EXPORT_SSLLIBS="$SSLLIBS" -AC_SUBST(EXPORT_SSLLIBS) +AC_SUBST([EXPORT_SSLLIBS])
dnl dnl End of "$Id$". diff --git a/config-scripts/cups-startup.m4 b/config-scripts/cups-startup.m4 index 2aeeac1..35b3130 100644 --- a/config-scripts/cups-startup.m4 +++ b/config-scripts/cups-startup.m4 @@ -15,22 +15,22 @@ dnl
ONDEMANDFLAGS="" ONDEMANDLIBS="" -AC_SUBST(ONDEMANDFLAGS) -AC_SUBST(ONDEMANDLIBS) +AC_SUBST([ONDEMANDFLAGS]) +AC_SUBST([ONDEMANDLIBS])
dnl Launchd is used on OS X/Darwin... -AC_ARG_ENABLE(launchd, [ --disable-launchd disable launchd support]) +AC_ARG_ENABLE([launchd],[ --disable-launchd disable launchd support]) LAUNCHD_DIR="" -AC_SUBST(LAUNCHD_DIR) +AC_SUBST([LAUNCHD_DIR])
if test x$enable_launchd != xno; then
AC_CHECK_HEADER([launch.h],[AC_DEFINE([HAVE_LAUNCH_H],[1],[This header file is available.])])
case "$uname" in Darwin*) @@ -45,43 +45,43 @@ if test x$enable_launchd != xno; then fi
dnl Systemd is used on Linux... -AC_ARG_ENABLE(systemd, [ --disable-systemd disable systemd support]) -AC_ARG_WITH(systemd, [ --with-systemd set directory for systemd service files],
[SYSTEMD_DIR="$withval"],[SYSTEMD_DIR=""])+AC_SUBST([SYSTEMD_DIR])
if test x$enable_systemd != xno; then if test "x$PKGCONFIG" = x; then if test x$enable_systemd = xyes; then
$PKGCONFIG --cflags libsystemd
ONDEMANDLIBS=$PKGCONFIG --libs libsystemd$PKGCONFIG --variable=systemdsystemunitdir systemd"
fi
else AC_MSG_RESULT([no])
fi
fifi
dnl Solaris uses smf SMFMANIFESTDIR="" -AC_SUBST(SMFMANIFESTDIR) -AC_ARG_WITH(smfmanifestdir, [ --with-smfmanifestdir set path for Solaris SMF manifest],SMFMANIFESTDIR="$withval") +AC_SUBST([SMFMANIFESTDIR]) +AC_ARG_WITH([smfmanifestdir],[ --with-smfmanifestdir set path for Solaris SMF manifest],[SMFMANIFESTDIR="$withval"])
dnl Use init on other platforms... -AC_ARG_WITH(rcdir, [ --with-rcdir set path for rc scripts],rcdir="$withval",rcdir="") -AC_ARG_WITH(rclevels, [ --with-rclevels set run levels for rc scripts],rclevels="$withval",rclevels="2 3 5") -AC_ARG_WITH(rcstart, [ --with-rcstart set start number for rc scripts],rcstart="$withval",rcstart="") -AC_ARG_WITH(rcstop, [ --with-rcstop set stop number for rc scripts],rcstop="$withval",rcstop="") +AC_ARG_WITH([rcdir],[ --with-rcdir set path for rc scripts],[rcdir="$withval"],[rcdir=""]) +AC_ARG_WITH([rclevels],[ --with-rclevels set run levels for rc scripts],[rclevels="$withval"],[rclevels="2 3 5"]) +AC_ARG_WITH([rcstart],[ --with-rcstart set start number for rc scripts],[rcstart="$withval"],[rcstart=""]) +AC_ARG_WITH([rcstop],[ --with-rcstop set stop number for rc scripts],[rcstop="$withval"],[rcstop=""])
if test x$rcdir = x; then if test x$LAUNCHD_DIR = x -a x$SYSTEMD_DIR = x -a x$SMFMANIFESTDIR = x; then @@ -139,11 +139,11 @@ INITDDIR="" RCLEVELS="$rclevels" RCSTART="$rcstart" RCSTOP="$rcstop" -AC_SUBST(INITDIR) -AC_SUBST(INITDDIR) -AC_SUBST(RCLEVELS) -AC_SUBST(RCSTART) -AC_SUBST(RCSTOP) +AC_SUBST([INITDIR]) +AC_SUBST([INITDDIR]) +AC_SUBST([RCLEVELS]) +AC_SUBST([RCSTART]) +AC_SUBST([RCSTOP])
if test "x$rcdir" != xno; then if test "x$rclevels" = x; then @@ -154,9 +154,9 @@ if test "x$rcdir" != xno; then fi
dnl Xinetd support... -AC_ARG_WITH(xinetd, [ --with-xinetd set path for xinetd config files],xinetd="$withval",xinetd="") +AC_ARG_WITH([xinetd],[ --with-xinetd set path for xinetd config files],[xinetd="$withval"],[xinetd=""]) XINETD="" -AC_SUBST(XINETD) +AC_SUBST([XINETD])
if test "x$xinetd" = x; then if test ! -x /sbin/launchd; then diff --git a/config-scripts/cups-threads.m4 b/config-scripts/cups-threads.m4 index bd5c698..0d3d303 100644 --- a/config-scripts/cups-threads.m4 +++ b/config-scripts/cups-threads.m4 @@ -13,13 +13,13 @@ dnl which should have been included with this file. If this file is dnl file is missing or damaged, see the license at "http://www.cups.org/". dnl
-AC_ARG_ENABLE(threads, [ --disable-threads disable multi-threading support]) +AC_ARG_ENABLE([threads],[ --disable-threads disable multi-threading support])
have_pthread=no PTHREAD_FLAGS=""
if test "x$enable_threads" != xno; then
AC_CHECK_HEADER([pthread.h],[AC_DEFINE([HAVE_PTHREAD_H],[1],[This header file is available.])])
if test x$ac_cv_header_pthread_h = xyes; then dnl Check various threading options for the platforms we support @@ -47,7 +47,7 @@ if test "x$enable_threads" != xno; then fi fi
-AC_SUBST(PTHREAD_FLAGS) +AC_SUBST([PTHREAD_FLAGS])
dnl dnl End of "$Id$". diff --git a/configure.ac b/configure.ac index 2145713..b9f558a 100644 --- a/configure.ac +++ b/configure.ac @@ -18,27 +18,26 @@ AC_PREREQ(2.60)
dnl Package name and version...
-sinclude(config-scripts/cups-opsys.m4) -sinclude(config-scripts/cups-common.m4) -sinclude(config-scripts/cups-directories.m4)
-sinclude(config-scripts/cups-sharedlibs.m4) -sinclude(config-scripts/cups-libtool.m4)
-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-pam.m4) -sinclude(config-scripts/cups-largefile.m4) -sinclude(config-scripts/cups-dnssd.m4) -sinclude(config-scripts/cups-startup.m4) -sinclude(config-scripts/cups-defaults.m4) -sinclude(config-scripts/cups-scripting.m4) +m4_foreach_w([area], +[opsys +common +directories +manpages +sharedlibs +libtool +compiler +network +poll +gssapi +threads +ssl +pam +largefile +dnssd +startup +defaults +scripting], +[sinclude([config-scripts/cups-]area[.m4])])
INSTALL_LANGUAGES="" UNINSTALL_LANGUAGES="" @@ -60,10 +59,10 @@ elif test "x$CUPS_BUNDLEDIR" != x; then UNINSTALL_LANGUAGES="uninstall-langbundle" fi
-AC_SUBST(INSTALL_LANGUAGES) -AC_SUBST(UNINSTALL_LANGUAGES) +AC_SUBST([INSTALL_LANGUAGES]) +AC_SUBST([UNINSTALL_LANGUAGES])
-AC_OUTPUT(Makedefs +AC_CONFIG_FILES([Makedefs conf/cups-files.conf conf/cupsd.conf conf/mime.convs @@ -88,9 +87,10 @@ AC_OUTPUT(Makedefs scheduler/org.cups.cupsd.path scheduler/org.cups.cupsd.service scheduler/org.cups.cupsd.socket
$LANGFILES])+AC_OUTPUT
chmod +x cups-config
2.5.0
Version: -feature CUPS.org User: elfring
I suggest to be more explicit where macro expansion will not be required in the current build scripts. https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.69/html_node/Autoconf-Language.html https://www.gnu.org/savannah-checkouts/gnu/m4/manual/m4-1.4.17/html_node/Quoting-Arguments.html