Merge pull request #5054 from sanbrother/master

Fix : dead lock when there is already an active job

diff --git a/CHANGES.md b/CHANGES.md
index fd03ddf4cc5d275cd4f5c3b721b57461bc22613d..eeedf34ecbc2da844f950dceea4538ece229b3d2 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-CHANGES - 2.2.5 - 2017-07-07
+CHANGES - 2.2.5 - 2017-07-17
 ============================
 
 CHANGES IN CUPS V2.2.5
@@ -12,6 +12,10 @@ CHANGES IN CUPS V2.2.5
 - The IPP backend now always sends the "finishings" attribute for printers that
   support it because otherwise the client cannot override printer defaults
   (rdar://33169732)
+- Libtool support was completely broken with current libtool versions that use
+  an incompatible command-line syntax (Issue #5050)
+- The --enable-libtool configure option requires a path to the libtool program,
+  but doesn't document or check for it (Issue #5062)
 
 
 CHANGES IN CUPS V2.2.4

diff --git a/Makedefs.in b/Makedefs.in
index f958c263f32865af226a696b362aa836112a0d5a..f3ae6cd66bcdc099c878cb7fcdc164fe65f706fc 100644 (file)
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -17,14 +17,16 @@
 
 AR             =       @AR@
 AWK            =       @AWK@
-CC             =       @LIBTOOL@ @CC@
+CC             =       @LIBTOOL_CC@ @CC@
 CHMOD          =       @CHMOD@
-CXX            =       @LIBTOOL@ @CXX@
+CXX            =       @LIBTOOL_CXX@ @CXX@
 DSO            =       @DSO@
 DSOXX          =       @DSOXX@
 GZIP           =       @GZIP@
 INSTALL                =       @INSTALL@
 LD             =       @LD@
+LD_CC          =       @LD_CC@
+LD_CXX         =       @LD_CXX@
 LIBTOOL                =       @LIBTOOL@
 LN             =       @LN@ -sf
 MV             =       @MV@
@@ -38,12 +40,12 @@ SHELL               =       /bin/sh
 # Installation programs...
 #
 
-INSTALL_BIN    =       $(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
+INSTALL_BIN    =       @LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
 INSTALL_COMPDATA =     $(INSTALL) -c -m 444 @INSTALL_GZIP@
 INSTALL_CONFIG =       $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
 INSTALL_DATA   =       $(INSTALL) -c -m 444
 INSTALL_DIR    =       $(INSTALL) -d
-INSTALL_LIB    =       $(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
+INSTALL_LIB    =       @LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
 INSTALL_MAN    =       $(INSTALL) -c -m 444
 INSTALL_SCRIPT =       $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
 

diff --git a/backend/Makefile b/backend/Makefile
index 4c6a11b4dd665770a144a3532d1db6d7c07e3378..aeb33d846cfb8b1d85f93f735c303e185b83dd98 100644 (file)
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -1,7 +1,7 @@
 #
 # Backend makefile for CUPS.
 #
-# Copyright 2007-2016 by Apple Inc.
+# Copyright 2007-2017 by Apple Inc.
 # Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 # These coded instructions, statements, and computer programs are the
@@ -24,7 +24,7 @@ include ../Makedefs
 # UBACKENDS and ULBACKENDS are installed mode 0755 so cupsd will run them as
 # an unprivileged user...
 #
-# See http://www.cups.org/documentation.php/api-filter.html for more info...
+# See http://www.cups.org/doc/api-filter.html for more info...
 RBACKENDS =    \
                ipp \
                lpd \
@@ -207,7 +207,7 @@ uninstall:
 
 test1284:      test1284.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o test1284 test1284.o ../cups/$(LIBCUPSSTATIC) \
+       $(LD_CC) $(LDFLAGS) -o test1284 test1284.o ../cups/$(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 
 
@@ -217,7 +217,7 @@ test1284:   test1284.o ../cups/$(LIBCUPSSTATIC)
 
 testbackend:   testbackend.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o testbackend testbackend.o ../cups/$(LIBCUPSSTATIC) \
+       $(LD_CC) $(LDFLAGS) -o testbackend testbackend.o ../cups/$(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 
 
@@ -227,7 +227,7 @@ testbackend:        testbackend.o ../cups/$(LIBCUPSSTATIC)
 
 testsupplies:  testsupplies.o libbackend.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o testsupplies testsupplies.o libbackend.a \
+       $(LD_CC) $(LDFLAGS) -o testsupplies testsupplies.o libbackend.a \
                ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
                $(COMMONLIBS) $(LIBZ)
 
@@ -249,7 +249,7 @@ libbackend.a:       $(LIBOBJS)
 
 dnssd: dnssd.o ../cups/$(LIBCUPS) libbackend.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o dnssd dnssd.o libbackend.a $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o dnssd dnssd.o libbackend.a $(LIBS)
        if test `uname` = Darwin; then \
                $(RM) mdns; \
                $(LN) dnssd mdns; \
@@ -262,7 +262,7 @@ dnssd:      dnssd.o ../cups/$(LIBCUPS) libbackend.a
 
 ipp:   ipp.o ../cups/$(LIBCUPS) libbackend.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o ipp ipp.o libbackend.a $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o ipp ipp.o libbackend.a $(LIBS)
        $(RM) http
        $(LN) ipp http
 
@@ -273,7 +273,7 @@ ipp:        ipp.o ../cups/$(LIBCUPS) libbackend.a
 
 lpd:   lpd.o ../cups/$(LIBCUPS) libbackend.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o lpd lpd.o libbackend.a $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o lpd lpd.o libbackend.a $(LIBS)
 
 
 #
@@ -282,7 +282,7 @@ lpd:        lpd.o ../cups/$(LIBCUPS) libbackend.a
 
 snmp:  snmp.o ../cups/$(LIBCUPS) libbackend.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o snmp snmp.o libbackend.a $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o snmp snmp.o libbackend.a $(LIBS)
 
 
 #
@@ -291,11 +291,11 @@ snmp:     snmp.o ../cups/$(LIBCUPS) libbackend.a
 
 socket:        socket.o ../cups/$(LIBCUPS) libbackend.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o socket socket.o libbackend.a $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o socket socket.o libbackend.a $(LIBS)
 
 socket-static: socket.o  ../cups/$(LIBCUPSSTATIC) libbackend.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o socket-static socket.o libbackend.a \
+       $(LD_CC) $(LDFLAGS) -o socket-static socket.o libbackend.a \
                ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
                $(COMMONLIBS) $(LIBZ)
 
@@ -306,7 +306,7 @@ socket-static:      socket.o  ../cups/$(LIBCUPSSTATIC) libbackend.a
 
 usb:   usb.o ../cups/$(LIBCUPS) libbackend.a
        echo Linking $@...
-       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o usb usb.o libbackend.a $(LIBUSB) \
+       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o usb usb.o libbackend.a $(LIBUSB) \
                $(BACKLIBS) $(LIBS)
 usb.o: usb.c usb-darwin.c usb-libusb.c usb-unix.c
 

diff --git a/berkeley/Makefile b/berkeley/Makefile
index 5e0f22f6704c42c68070636d97be8b1f4db1ce6b..0a17b535e82b283b6af372c097a0893aca96d8c7 100644 (file)
--- a/berkeley/Makefile
+++ b/berkeley/Makefile
@@ -1,7 +1,7 @@
 #
 # Berkeley commands makefile for CUPS.
 #
-# Copyright 2007-2012 by Apple Inc.
+# Copyright 2007-2017 by Apple Inc.
 # Copyright 1997-2006 by Easy Software Products, all rights reserved.
 #
 # These coded instructions, statements, and computer programs are the
@@ -124,7 +124,7 @@ uninstall:
 
 lpc:   lpc.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o lpc lpc.o $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o lpc lpc.o $(LIBS)
 
 
 #
@@ -133,7 +133,7 @@ lpc:        lpc.o ../cups/$(LIBCUPS)
 
 lpq:   lpq.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o lpq lpq.o $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o lpq lpq.o $(LIBS)
 
 
 #
@@ -142,7 +142,7 @@ lpq:        lpq.o ../cups/$(LIBCUPS)
 
 lpr:   lpr.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o lpr lpr.o $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o lpr lpr.o $(LIBS)
 
 
 #
@@ -151,7 +151,7 @@ lpr:        lpr.o ../cups/$(LIBCUPS)
 
 lprm:  lprm.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o lprm lprm.o $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o lprm lprm.o $(LIBS)
 
 
 #

diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile
index 27d75f28ff2544a6691e2d4a11c92b50970b1423..ae9630786a91ebc9292667e25a96a698a043dbb2 100644 (file)
--- a/cgi-bin/Makefile
+++ b/cgi-bin/Makefile
@@ -1,7 +1,7 @@
 #
 # CGI makefile for CUPS.
 #
-# Copyright 2007-2016 by Apple Inc.
+# Copyright 2007-2017 by Apple Inc.
 # Copyright 1997-2006 by Easy Software Products.
 #
 # These coded instructions, statements, and computer programs are the
@@ -219,7 +219,7 @@ libcupscgi.1.dylib: $(LIBOBJS) libcupscgi.exp
 
 libcupscgi.la:    $(LIBOBJS)
        echo Linking $@...
-       $(CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
+       $(LD_CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
                -version-info 1:0 $(LIBS)
 
 
@@ -240,7 +240,7 @@ libcupscgi.a:       $(LIBOBJS)
 
 admin.cgi:     admin.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ admin.o -lcupscgi $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o $@ admin.o -lcupscgi $(LIBS)
 
 
 #
@@ -249,7 +249,7 @@ admin.cgi:  admin.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
 
 classes.cgi:   classes.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ classes.o -lcupscgi $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o $@ classes.o -lcupscgi $(LIBS)
 
 
 #
@@ -258,7 +258,7 @@ classes.cgi:        classes.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
 
 help.cgi:      help.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ help.o -lcupscgi $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o $@ help.o -lcupscgi $(LIBS)
 
 
 #
@@ -267,7 +267,7 @@ help.cgi:   help.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
 
 jobs.cgi:      jobs.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ jobs.o -lcupscgi $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o $@ jobs.o -lcupscgi $(LIBS)
 
 
 #
@@ -276,7 +276,7 @@ jobs.cgi:   jobs.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
 
 makedocset:    makedocset.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ makedocset.o libcupscgi.a \
+       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ makedocset.o libcupscgi.a \
                ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
                $(LIBZ) $(LIBGSSAPI)
 
@@ -287,7 +287,7 @@ makedocset: makedocset.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
 
 printers.cgi:  printers.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ printers.o -L. -lcupscgi $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o $@ printers.o -L. -lcupscgi $(LIBS)
 
 
 #
@@ -296,7 +296,7 @@ printers.cgi:       printers.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
 
 testcgi:       testcgi.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testcgi.o libcupscgi.a \
+       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testcgi.o libcupscgi.a \
                ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
                $(LIBZ) $(LIBGSSAPI)
        echo Testing CGI API...
@@ -309,7 +309,7 @@ testcgi:    testcgi.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
 
 testhi:        testhi.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testhi.o libcupscgi.a \
+       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testhi.o libcupscgi.a \
                ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
                $(LIBZ) $(LIBGSSAPI)
        echo Testing help index API...
@@ -322,7 +322,7 @@ testhi:     testhi.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
 
 testtemplate:  testtemplate.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testtemplate.o libcupscgi.a ../cups/$(LIBCUPSSTATIC) \
+       $(LD_CC) $(LDFLAGS) -o $@ testtemplate.o libcupscgi.a ../cups/$(LIBCUPSSTATIC) \
                $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) $(LIBZ) $(LIBGSSAPI)
 
 

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index 8136ce161ba1a447e68ce846e6ca57b59fa3c865..c86f9b9056f54347d733244be5a61eb48c63963e 100644 (file)
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -305,7 +305,7 @@ fi
 LIBS="$SAVELIBS"
 
 dnl Check for DBUS support
-AC_ARG_ENABLE(dbus, [  --disable-dbus           build without DBUS support])
+AC_ARG_ENABLE(dbus, [  --disable-dbus          build without DBUS support])
 AC_ARG_WITH(dbusdir, [  --with-dbusdir          set DBUS configuration directory ],
        DBUSDIR="$withval")
 
@@ -388,20 +388,15 @@ case $host_os_name in
                        if test "x$default_adminkey" != xdefault; then
                                CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey $default_adminkey"
                                CUPS_DEFAULT_SYSTEM_AUTHKEY="$default_adminkey"
-                       elif grep -q system.print.operator /etc/authorization; then
+                       else
                                CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.print.admin"
                                CUPS_DEFAULT_SYSTEM_AUTHKEY="system.print.admin"
-                       else
-                               CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.preferences"
-                               CUPS_DEFAULT_SYSTEM_AUTHKEY="system.preferences"
                        fi
 
                        if test "x$default_operkey" != xdefault; then
                                CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY($default_operkey) @admin @lpadmin"
-                       elif grep -q system.print.operator /etc/authorization; then
-                               CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY(system.print.operator) @admin @lpadmin"
                        else
-                               CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY(system.print.admin) @admin @lpadmin"
+                               CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY(system.print.operator) @admin @lpadmin"
                        fi])
                AC_CHECK_HEADER(Security/SecBasePriv.h,AC_DEFINE(HAVE_SECBASEPRIV_H))
 

diff --git a/config-scripts/cups-defaults.m4 b/config-scripts/cups-defaults.m4
index 9fd99689bbe539e7cf648175051d9e7f9b4d1d78..120fd3b3e497796699c69c682da8dfc3b7252d93 100644 (file)
--- a/config-scripts/cups-defaults.m4
+++ b/config-scripts/cups-defaults.m4
@@ -38,7 +38,7 @@ if test "x$CUPS_BUNDLEDIR" != x; then
 fi
 
 dnl Default executable file permissions
-AC_ARG_WITH(exe_file_perm, [  --with-exe-file-perm set default exectuable permissions value, default=0555],
+AC_ARG_WITH(exe_file_perm, [  --with-exe-file-perm    set default executable permissions value, default=0555],
        CUPS_EXE_FILE_PERM="$withval",
        [case "$host_os_name" in
                linux* | gnu*)

diff --git a/config-scripts/cups-libtool.m4 b/config-scripts/cups-libtool.m4
index 429ce0ba3524066db1d5e346a6b2c3f0881fec1f..8e1b9c743aa89802f23bbc99731c7330599f39e1 100644 (file)
--- a/config-scripts/cups-libtool.m4
+++ b/config-scripts/cups-libtool.m4
@@ -1,7 +1,7 @@
 dnl
 dnl Libtool stuff for CUPS.
 dnl
-dnl Copyright 2007-2011 by Apple Inc.
+dnl Copyright 2007-2017 by Apple Inc.
 dnl Copyright 1997-2005 by Easy Software Products, all rights reserved.
 dnl
 dnl These coded instructions, statements, and computer programs are the
@@ -11,9 +11,12 @@ dnl which should have been included with this file.  If this file is
 dnl 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=/path/to/libtool
                           build with libtool (UNSUPPORTED!)],
        [if test x$enable_libtool_unsupported != xno; then
+               if test x$enable_libtool_unsupported == xyes; then
+                       AC_MSG_ERROR([Use --enable-libtool-unsupported=/path/to/libtool.])
+               fi
                LIBTOOL="$enable_libtool_unsupported"
                enable_shared=no
                echo "WARNING: libtool is not supported or endorsed by Apple Inc."
@@ -22,12 +25,40 @@ AC_ARG_ENABLE(libtool_unsupported, [  --enable-libtool-unsupported
                LIBTOOL=""
        fi])
 
-AC_SUBST(LIBTOOL)
-
 if test x$LIBTOOL != x; then
+       DSO="\$(LIBTOOL) --mode=link --tag=CC ${CC}"
+       DSOXX="\$(LIBTOOL) --mode=link --tag=CXX ${CXX}"
+
+       LD_CC="\$(LIBTOOL) --mode=link --tag=CC ${CC}"
+       LD_CXX="\$(LIBTOOL) --mode=link --tag=CXX ${CXX}"
+
        LIBCUPS="libcups.la"
+       LIBCUPSSTATIC="libcups.la"
+       LIBCUPSCGI="libcupscgi.la"
        LIBCUPSIMAGE="libcupsimage.la"
+       LIBCUPSMIME="libcupsmime.la"
+       LIBCUPSPPDC="libcupsppdc.la"
+
+       LIBTOOL_CC="\$(LIBTOOL) --mode=compile --tag=CC"
+       LIBTOOL_CXX="\$(LIBTOOL) --mode=compile --tag=CXX"
+       LIBTOOL_INSTALL="\$(LIBTOOL) --mode=install"
+
        LINKCUPS="../cups/\$(LIBCUPS)"
        LINKCUPSIMAGE="../filter/\$(LIBCUPSIMAGE)"
-       DSO="\$(CC)"
+
+else
+       LD_CC="\$(CC)"
+       LD_CXX="\$(CXX)"
+
+       LIBTOOL_CC=""
+       LIBTOOL_CXX=""
+       LIBTOOL_INSTALL=""
 fi
+
+AC_SUBST(LD_CC)
+AC_SUBST(LD_CXX)
+
+AC_SUBST(LIBTOOL)
+AC_SUBST(LIBTOOL_CC)
+AC_SUBST(LIBTOOL_CXX)
+AC_SUBST(LIBTOOL_INSTALL)

diff --git a/config-scripts/cups-pam.m4 b/config-scripts/cups-pam.m4
index 0adec3852e71cb7377581318028069d3a81680b1..2ff24022e50102fc13e13040c772e20100468efd 100644 (file)
--- a/config-scripts/cups-pam.m4
+++ b/config-scripts/cups-pam.m4
@@ -12,7 +12,7 @@ dnl 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_WITH(pam_module, [  --with-pam-module       set the PAM module to use])
 
 PAMDIR=""
 PAMFILE="pam.std"

diff --git a/config-scripts/cups-startup.m4 b/config-scripts/cups-startup.m4
index 978daae7553d9f6f538b18d9c54dd01f2cb7dbe3..13b738b770b4e076a8d4f2ab88492a5a0446ee40 100644 (file)
--- a/config-scripts/cups-startup.m4
+++ b/config-scripts/cups-startup.m4
@@ -78,7 +78,7 @@ if test x$enable_systemd != xno; then
 fi
 
 dnl Upstart is also used on Linux (e.g., Chrome OS)
-AC_ARG_ENABLE(upstart, [ --enable-upstart         enable upstart support])
+AC_ARG_ENABLE(upstart, [  --enable-upstart        enable upstart support])
 if test "x$enable_upstart" = "xyes"; then
        if test "x$have_systemd" = "xyes"; then
                AC_MSG_ERROR(Cannot support both systemd and upstart.)

diff --git a/configure b/configure
index 5ba1b6043ffe85c314c822a9fbc7f5bf84951ab4..1366050bf20035fea4dd741d1970015ce6b1eb1d 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for CUPS 2.2.4.
+# Generated by GNU Autoconf 2.68 for CUPS 2.2.5.
 #
 # Report bugs to <https://github.com/apple/cups/issues>.
 #
@@ -560,8 +560,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='CUPS'
 PACKAGE_TARNAME='cups'
-PACKAGE_VERSION='2.2.4'
-PACKAGE_STRING='CUPS 2.2.4'
+PACKAGE_VERSION='2.2.5'
+PACKAGE_STRING='CUPS 2.2.5'
 PACKAGE_BUGREPORT='https://github.com/apple/cups/issues'
 PACKAGE_URL='https://www.cups.org/'
 
@@ -679,7 +679,12 @@ ARCHFLAGS
 UNITTESTS
 OPTIM
 INSTALL_STRIP
+LIBTOOL_INSTALL
+LIBTOOL_CXX
+LIBTOOL_CC
 LIBTOOL
+LD_CXX
+LD_CC
 EXPORT_LDFLAGS
 IMGLIBS
 DSOLIBS
@@ -1459,7 +1464,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures CUPS 2.2.4 to adapt to many kinds of systems.
+\`configure' configures CUPS 2.2.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1524,7 +1529,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of CUPS 2.2.4:";;
+     short | recursive ) echo "Configuration of CUPS 2.2.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1538,9 +1543,9 @@ Optional Features:
   --enable-libusb         use libusb for USB printing
   --enable-tcp-wrappers   use libwrap for TCP wrappers support
   --enable-acl            build with POSIX ACL support
-  --disable-dbus           build without DBUS support
+  --disable-dbus          build without DBUS support
   --disable-shared        do not create shared libraries
-  --enable-libtool-unsupported
+  --enable-libtool-unsupported=/path/to/libtool
                           build with libtool (UNSUPPORTED!)
   --enable-debug          build with debugging symbols
   --enable-debug-guards   build with memory allocation guards
@@ -1558,7 +1563,7 @@ Optional Features:
   --disable-dnssd         disable DNS Service Discovery support using mDNSResponder
   --disable-launchd       disable launchd support
   --disable-systemd       disable systemd support
- --enable-upstart         enable upstart support
+  --enable-upstart        enable upstart support
   --enable-page-logging   enable page_log by default
   --disable-browsing      disable Browsing by default
   --disable-default-shared
@@ -1591,7 +1596,7 @@ Optional Packages:
   --with-ldarchflags      set program architecture flags
   --with-domainsocket     set unix domain socket name
   --with-gssservicename   set default gss service name
-  --with-pam-module       specify the PAM module to use
+  --with-pam-module       set the PAM module to use
   --with-dnssd-libs       set directory for DNS Service Discovery library
   --with-dnssd-includes   set directory for DNS Service Discovery includes
   --with-systemd          set directory for systemd service files
@@ -1603,7 +1608,7 @@ Optional Packages:
   --with-xinetd           set path for xinetd config files
   --with-languages        set installed languages, default=all
   --with-bundledir        set macOS localization bundle directory
-  --with-exe-file-perm set default exectuable permissions value, default=0555
+  --with-exe-file-perm    set default executable permissions value, default=0555
   --with-config-file-perm set default ConfigFilePerm value, default=0640
   --with-cupsd-file-perm  set default cupsd permissions, default=0500
   --with-log-file-perm    set default LogFilePerm value, default=0644
@@ -1705,7 +1710,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-CUPS configure 2.2.4
+CUPS configure 2.2.5
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2169,7 +2174,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by CUPS $as_me 2.2.4, which was
+It was created by CUPS $as_me 2.2.5, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2644,7 +2649,7 @@ fi
 ac_config_headers="$ac_config_headers config.h"
 
 
-CUPS_VERSION="2.2.4"
+CUPS_VERSION="2.2.5"
 CUPS_REVISION=""
 CUPS_BUILD="cups-$CUPS_VERSION"
 
@@ -5940,20 +5945,15 @@ if test "x$ac_cv_header_Security_Authorization_h" = xyes; then :
                        if test "x$default_adminkey" != xdefault; then
                                CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey $default_adminkey"
                                CUPS_DEFAULT_SYSTEM_AUTHKEY="$default_adminkey"
-                       elif grep -q system.print.operator /etc/authorization; then
+                       else
                                CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.print.admin"
                                CUPS_DEFAULT_SYSTEM_AUTHKEY="system.print.admin"
-                       else
-                               CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.preferences"
-                               CUPS_DEFAULT_SYSTEM_AUTHKEY="system.preferences"
                        fi
 
                        if test "x$default_operkey" != xdefault; then
                                CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY($default_operkey) @admin @lpadmin"
-                       elif grep -q system.print.operator /etc/authorization; then
-                               CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY(system.print.operator) @admin @lpadmin"
                        else
-                               CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY(system.print.admin) @admin @lpadmin"
+                               CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY(system.print.operator) @admin @lpadmin"
                        fi
 fi
 
@@ -6656,6 +6656,9 @@ fi
 # Check whether --enable-libtool_unsupported was given.
 if test "${enable_libtool_unsupported+set}" = set; then :
   enableval=$enable_libtool_unsupported; if test x$enable_libtool_unsupported != xno; then
+               if test x$enable_libtool_unsupported == xyes; then
+                       as_fn_error $? "Use --enable-libtool-unsupported=/path/to/libtool." "$LINENO" 5
+               fi
                LIBTOOL="$enable_libtool_unsupported"
                enable_shared=no
                echo "WARNING: libtool is not supported or endorsed by Apple Inc."
@@ -6666,17 +6669,45 @@ if test "${enable_libtool_unsupported+set}" = set; then :
 fi
 
 
+if test x$LIBTOOL != x; then
+       DSO="\$(LIBTOOL) --mode=link --tag=CC ${CC}"
+       DSOXX="\$(LIBTOOL) --mode=link --tag=CXX ${CXX}"
 
+       LD_CC="\$(LIBTOOL) --mode=link --tag=CC ${CC}"
+       LD_CXX="\$(LIBTOOL) --mode=link --tag=CXX ${CXX}"
 
-if test x$LIBTOOL != x; then
        LIBCUPS="libcups.la"
+       LIBCUPSSTATIC="libcups.la"
+       LIBCUPSCGI="libcupscgi.la"
        LIBCUPSIMAGE="libcupsimage.la"
+       LIBCUPSMIME="libcupsmime.la"
+       LIBCUPSPPDC="libcupsppdc.la"
+
+       LIBTOOL_CC="\$(LIBTOOL) --mode=compile --tag=CC"
+       LIBTOOL_CXX="\$(LIBTOOL) --mode=compile --tag=CXX"
+       LIBTOOL_INSTALL="\$(LIBTOOL) --mode=install"
+
        LINKCUPS="../cups/\$(LIBCUPS)"
        LINKCUPSIMAGE="../filter/\$(LIBCUPSIMAGE)"
-       DSO="\$(CC)"
+
+else
+       LD_CC="\$(CC)"
+       LD_CXX="\$(CXX)"
+
+       LIBTOOL_CC=""
+       LIBTOOL_CXX=""
+       LIBTOOL_INSTALL=""
 fi
 
 
+
+
+
+
+
+
+
+
 INSTALL_STRIP=""
 OPTIM=""
 
@@ -10887,7 +10918,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by CUPS $as_me 2.2.4, which was
+This file was extended by CUPS $as_me 2.2.5, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -10950,7 +10981,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-CUPS config.status 2.2.4
+CUPS config.status 2.2.5
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 

diff --git a/cups/Makefile b/cups/Makefile
index 962bee636ca3c59f5bf3b550d002e906db7cc252..94fed7a9f8178e87699929903875abd53910324f 100644 (file)
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -344,7 +344,7 @@ libcups.2.dylib:    $(LIBOBJS) $(LIBCUPSORDER)
 
 libcups.la:    $(LIBOBJS)
        echo Linking $@...
-       $(CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) \
+       $(LD_CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) \
                -rpath $(LIBDIR) -version-info 2:12 $(LIBGSSAPI) $(SSLLIBS) \
                $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 
@@ -383,7 +383,7 @@ libcups2.def: $(LIBOBJS) Makefile
 
 testadmin:     testadmin.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testadmin.o $(LIBCUPSSTATIC) \
+       $(LD_CC) $(LDFLAGS) -o $@ testadmin.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 
 
@@ -393,7 +393,7 @@ testadmin:  testadmin.o $(LIBCUPSSTATIC)
 
 testarray:     testarray.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testarray.o $(LIBCUPSSTATIC) \
+       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testarray.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        echo Running array API tests...
        ./testarray
@@ -405,7 +405,7 @@ testarray:  testarray.o $(LIBCUPSSTATIC)
 
 testcache:     testcache.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testcache.o $(LIBCUPSSTATIC) \
+       $(LD_CC) $(LDFLAGS) -o $@ testcache.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 
 
@@ -415,7 +415,7 @@ testcache:  testcache.o $(LIBCUPSSTATIC)
 
 testconflicts: testconflicts.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testconflicts.o $(LIBCUPSSTATIC) \
+       $(LD_CC) $(LDFLAGS) -o $@ testconflicts.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 
 
@@ -425,7 +425,7 @@ testconflicts:      testconflicts.o $(LIBCUPSSTATIC)
 
 testcreds:     testcreds.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testcreds.o $(LIBCUPSSTATIC) \
+       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testcreds.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 
 
@@ -435,7 +435,7 @@ testcreds:  testcreds.o $(LIBCUPSSTATIC)
 
 testcups:      testcups.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testcups.o $(LIBCUPSSTATIC) \
+       $(LD_CC) $(LDFLAGS) -o $@ testcups.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 
 
@@ -445,7 +445,7 @@ testcups:   testcups.o $(LIBCUPSSTATIC)
 
 testdest:      testdest.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testdest.o $(LIBCUPSSTATIC) \
+       $(LD_CC) $(LDFLAGS) -o $@ testdest.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 
 
@@ -455,7 +455,7 @@ testdest:   testdest.o $(LIBCUPSSTATIC)
 
 testfile:      testfile.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testfile.o $(LIBCUPSSTATIC) \
+       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testfile.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        echo Running file API tests...
        ./testfile
@@ -467,7 +467,7 @@ testfile:   testfile.o $(LIBCUPSSTATIC)
 
 testhttp:      testhttp.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testhttp.o $(LIBCUPSSTATIC) \
+       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testhttp.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        echo Running HTTP API tests...
        ./testhttp
@@ -479,7 +479,7 @@ testhttp:   testhttp.o $(LIBCUPSSTATIC)
 
 testipp:       testipp.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testipp.o $(LIBCUPSSTATIC) \
+       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testipp.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        echo Running IPP API tests...
        ./testipp
@@ -491,7 +491,7 @@ testipp:    testipp.o $(LIBCUPSSTATIC)
 
 testi18n:      testi18n.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testi18n.o $(LIBCUPSSTATIC) \
+       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testi18n.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        echo Running internationalization API tests...
        ./testi18n
@@ -503,7 +503,7 @@ testi18n:   testi18n.o $(LIBCUPSSTATIC)
 
 testlang:      testlang.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testlang.o $(LIBCUPSSTATIC) \
+       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testlang.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        echo Running language API tests...
        ./testlang
@@ -515,7 +515,7 @@ testlang:   testlang.o $(LIBCUPSSTATIC)
 
 testoptions:   testoptions.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testoptions.o $(LIBCUPSSTATIC) \
+       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testoptions.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        echo Running option API tests...
        ./testoptions
@@ -527,7 +527,7 @@ testoptions:        testoptions.o $(LIBCUPSSTATIC)
 
 testppd:       testppd.o $(LIBCUPSSTATIC) test.ppd test2.ppd
        echo Linking $@...
-       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testppd.o $(LIBCUPSSTATIC) \
+       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testppd.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        echo Running PPD API tests...
        ./testppd
@@ -539,7 +539,7 @@ testppd:    testppd.o $(LIBCUPSSTATIC) test.ppd test2.ppd
 
 testpwg:       testpwg.o $(LIBCUPSSTATIC) test.ppd
        echo Linking $@...
-       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testpwg.o $(LIBCUPSSTATIC) \
+       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testpwg.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        echo Running PWG API tests...
        ./testpwg test.ppd
@@ -551,7 +551,7 @@ testpwg:    testpwg.o $(LIBCUPSSTATIC) test.ppd
 
 testsnmp:      testsnmp.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testsnmp.o $(LIBCUPSSTATIC) \
+       $(LD_CC) $(LDFLAGS) -o $@ testsnmp.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 
 
@@ -561,7 +561,7 @@ testsnmp:   testsnmp.o $(LIBCUPSSTATIC)
 
 tlscheck:      tlscheck.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ tlscheck.o $(LIBCUPSSTATIC) \
+       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ tlscheck.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 
 

diff --git a/filter/Makefile b/filter/Makefile
index 7da764d311194fc11c2081e7a0616411605e85ac..fc53f85c6c1517918f2bb024af3958a5639ce06c 100644 (file)
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -1,7 +1,7 @@
 #
 # Filter makefile for CUPS.
 #
-# Copyright 2007-2012 by Apple Inc.
+# Copyright 2007-2017 by Apple Inc.
 # Copyright 1997-2006 by Easy Software Products.
 #
 # These coded instructions, statements, and computer programs are the
@@ -216,7 +216,7 @@ apihelp:
 
 commandtops:   commandtops.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ commandtops.o $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o $@ commandtops.o $(LIBS)
 
 
 #
@@ -225,7 +225,7 @@ commandtops:        commandtops.o ../cups/$(LIBCUPS)
 
 gziptoany:     gziptoany.o ../Makedefs ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ gziptoany.o $(LIBZ) $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o $@ gziptoany.o $(LIBZ) $(LIBS)
 
 
 #
@@ -295,7 +295,7 @@ libcupsimage.a:     $(IMAGEOBJS)
 
 pstops:        pstops.o common.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ pstops.o common.o $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o $@ pstops.o common.o $(LIBS)
 
 
 #
@@ -304,7 +304,7 @@ pstops:     pstops.o common.o ../cups/$(LIBCUPS)
 
 rastertoepson: rastertoepson.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ rastertoepson.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o $@ rastertoepson.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
 
 
 #
@@ -313,7 +313,7 @@ rastertoepson:      rastertoepson.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE)
 
 rastertohp:    rastertohp.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ rastertohp.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o $@ rastertohp.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
 
 
 #
@@ -322,7 +322,7 @@ rastertohp: rastertohp.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE)
 
 rastertolabel: rastertolabel.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ rastertolabel.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o $@ rastertolabel.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
 
 
 #
@@ -331,11 +331,11 @@ rastertolabel:    rastertolabel.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE)
 
 rastertopwg:   rastertopwg.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ rastertopwg.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o $@ rastertopwg.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
 
 rastertopwg-static:    rastertopwg.o ../cups/$(LIBCUPSSTATIC) libcupsimage.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ rastertopwg.o libcupsimage.a \
+       $(LD_CC) $(LDFLAGS) -o $@ rastertopwg.o libcupsimage.a \
                ../cups/$(LIBCUPSSTATIC) $(IMGLIBS) $(DSOLIBS) $(COMMONLIBS) \
                $(SSLLIBS) $(DNSSDLIBS) $(LIBGSSAPI)
 
@@ -346,7 +346,7 @@ rastertopwg-static: rastertopwg.o ../cups/$(LIBCUPSSTATIC) libcupsimage.a
 
 testraster:    testraster.o ../cups/$(LIBCUPSSTATIC) libcupsimage.a
        echo Linking $@...
-       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testraster.o libcupsimage.a \
+       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testraster.o libcupsimage.a \
                ../cups/$(LIBCUPSSTATIC) $(IMGLIBS) $(DSOLIBS) $(COMMONLIBS) \
                $(SSLLIBS) $(DNSSDLIBS) $(LIBGSSAPI)
        echo Running raster API tests...
@@ -359,7 +359,7 @@ testraster: testraster.o ../cups/$(LIBCUPSSTATIC) libcupsimage.a
 
 rasterbench:   rasterbench.o libcupsimage.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ rasterbench.o libcupsimage.a $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o $@ rasterbench.o libcupsimage.a $(LIBS)
 
 
 #

diff --git a/locale/Makefile b/locale/Makefile
index 3fcbc1a56dae5a66aa91a5c4b724f8ebd30e4a2a..7d55289ec2b78d2c03e8e006e782b48f083646df 100644 (file)
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -1,7 +1,7 @@
 #
 # Locale file makefile for CUPS.
 #
-# Copyright 2007-2014 by Apple Inc.
+# Copyright 2007-2017 by Apple Inc.
 # Copyright 1993-2007 by Easy Software Products.
 #
 # These coded instructions, statements, and computer programs are the
@@ -158,7 +158,7 @@ pot:        checkpo po2strings
 
 checkpo:       checkpo.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o checkpo checkpo.o \
+       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o checkpo checkpo.o \
                ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
                $(COMMONLIBS) $(LIBZ)
 
@@ -177,7 +177,7 @@ checkall:   checkpo
 
 po2strings:    po2strings.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o po2strings po2strings.o \
+       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o po2strings po2strings.o \
                ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
                $(COMMONLIBS) $(LIBZ)
 
@@ -191,7 +191,7 @@ po2strings: po2strings.o ../cups/$(LIBCUPSSTATIC)
 
 strings2po:    strings2po.o
        echo Linking $@...
-       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o strings2po strings2po.o
+       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o strings2po strings2po.o
 
 
 #

diff --git a/man/Makefile b/man/Makefile
index 8f7476834bf0e595958261351599dd65795a8091..4b10dffc519ffaae175ee5ebf897dbc5a51d4a25 100644 (file)
--- a/man/Makefile
+++ b/man/Makefile
@@ -227,6 +227,6 @@ html:       $(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
        done
 
 mantohtml:     mantohtml.o ../cups/$(LIBCUPSSTATIC)
-       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ mantohtml.o \
+       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ mantohtml.o \
                ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \
                $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)

diff --git a/monitor/Makefile b/monitor/Makefile
index db8f2c035cb08d18fc73e8c4bf5932854b51de5b..75b911b518fbeb615622c8dbb621fff33503c58b 100644 (file)
--- a/monitor/Makefile
+++ b/monitor/Makefile
@@ -1,7 +1,7 @@
 #
 # Port monitor makefile for CUPS.
 #
-# Copyright 2007-2012 by Apple Inc.
+# Copyright 2007-2017 by Apple Inc.
 # Copyright 2006 by Easy Software Products.
 #
 # These coded instructions, statements, and computer programs are the
@@ -121,7 +121,7 @@ uninstall:
 
 bcp:   bcp.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ bcp.o $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o $@ bcp.o $(LIBS)
 
 
 #
@@ -130,7 +130,7 @@ bcp:        bcp.o ../cups/$(LIBCUPS)
 
 tbcp:  tbcp.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ tbcp.o $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o $@ tbcp.o $(LIBS)
 
 
 #

diff --git a/notifier/Makefile b/notifier/Makefile
index c575c5173deae5dfe2a2bbca3eefe8479b3d847b..ffed312f4f586b57e6d6596d6350a1da8a745fa6 100644 (file)
--- a/notifier/Makefile
+++ b/notifier/Makefile
@@ -1,7 +1,7 @@
 #
 # Notifier makefile for CUPS.
 #
-# Copyright 2007-2012 by Apple Inc.
+# Copyright 2007-2017 by Apple Inc.
 # Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 # These coded instructions, statements, and computer programs are the
@@ -123,7 +123,7 @@ depend:
 
 dbus:  dbus.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o dbus dbus.o $(DBUS_NOTIFIERLIBS) $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o dbus dbus.o $(DBUS_NOTIFIERLIBS) $(LIBS)
 
 
 #
@@ -132,7 +132,7 @@ dbus:       dbus.o ../cups/$(LIBCUPS)
 
 mailto:        mailto.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o mailto mailto.o $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o mailto mailto.o $(LIBS)
 
 
 #
@@ -141,7 +141,7 @@ mailto:     mailto.o ../cups/$(LIBCUPS)
 
 rss:   rss.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o rss rss.o $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o rss rss.o $(LIBS)
 
 
 #
@@ -150,7 +150,7 @@ rss:        rss.o ../cups/$(LIBCUPS)
 
 testnotify:    testnotify.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o testnotify testnotify.o $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o testnotify testnotify.o $(LIBS)
 
 
 $(OBJS):       ../Makedefs

diff --git a/ppdc/Makefile b/ppdc/Makefile
index fb35c7fd677127d4f3d46b6c53a7f79021d6be0f..b91c9ec431be8210a1b760cc1598e276117455a4 100644 (file)
--- a/ppdc/Makefile
+++ b/ppdc/Makefile
@@ -225,7 +225,7 @@ local:      genstrings
 genstrings:            genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \
                        sample.drv ../data/media.defs
        echo Linking $@...
-       $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \
+       $(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \
                libcupsppdc.a ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \
                $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        echo Generating localization strings...
@@ -238,12 +238,12 @@ genstrings:               genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \
 
 ppdc:                  ppdc.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CXX) $(LDFLAGS) -o $@ ppdc.o -L. -lcupsppdc $(LIBS)
+       $(LD_CXX) $(LDFLAGS) -o $@ ppdc.o -L. -lcupsppdc $(LIBS)
 
 
 ppdc-static:           ppdc.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) foo.drv foo-fr.po
        echo Linking $@...
-       $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \
+       $(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \
                ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
                $(COMMONLIBS) $(LIBZ)
        echo Testing PPD compiler...
@@ -257,7 +257,7 @@ ppdc-static:                ppdc.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) foo.drv foo-fr.po
 
 ppdhtml:                       ppdhtml.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CXX) $(LDFLAGS) -o $@ ppdhtml.o -L. -lcupsppdc $(LIBS)
+       $(LD_CXX) $(LDFLAGS) -o $@ ppdhtml.o -L. -lcupsppdc $(LIBS)
 
 
 #
@@ -266,12 +266,12 @@ ppdhtml:                  ppdhtml.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS)
 
 ppdi:                  ppdi.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CXX) $(LDFLAGS) -o $@ ppdi.o -L. -lcupsppdc $(LIBS)
+       $(LD_CXX) $(LDFLAGS) -o $@ ppdi.o -L. -lcupsppdc $(LIBS)
 
 
 ppdi-static:           ppdc-static ppdi.o libcupsppdc.a  ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdi-static ppdi.o libcupsppdc.a \
+       $(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdi-static ppdi.o libcupsppdc.a \
                ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
                $(COMMONLIBS) $(LIBZ)
        echo Testing PPD importer...
@@ -293,7 +293,7 @@ ppdi-static:                ppdc-static ppdi.o libcupsppdc.a  ../cups/$(LIBCUPSSTATIC)
 
 ppdmerge:                      ppdmerge.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CXX) $(LDFLAGS) -o $@ ppdmerge.o $(LIBS)
+       $(LD_CXX) $(LDFLAGS) -o $@ ppdmerge.o $(LIBS)
 
 
 #
@@ -302,7 +302,7 @@ ppdmerge:                   ppdmerge.o ../cups/$(LIBCUPS)
 
 ppdpo:                 ppdpo.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CXX) $(LDFLAGS) -o $@ ppdpo.o -L. -lcupsppdc $(LIBS)
+       $(LD_CXX) $(LDFLAGS) -o $@ ppdpo.o -L. -lcupsppdc $(LIBS)
 
 
 #
@@ -311,7 +311,7 @@ ppdpo:                      ppdpo.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS)
 
 testcatalog:           testcatalog.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(CXX) $(LDFLAGS) -o $@ testcatalog.o libcupsppdc.a \
+       $(LD_CXX) $(LDFLAGS) -o $@ testcatalog.o libcupsppdc.a \
                ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
                $(COMMONLIBS) $(LIBZ)
 
@@ -351,7 +351,7 @@ libcupsppdc.1.dylib:        $(LIBOBJS) ../cups/$(LIBCUPS)
 
 libcupsppdc.la:    $(LIBOBJS) ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
+       $(LD_CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
                -version-info 1:0 $(LINKCUPS)
 
 

diff --git a/scheduler/Makefile b/scheduler/Makefile
index 251f017e2fa5b79951606e6d4c98e758e9ebebae..0178934b25c8533a6892b6185d3dfb93ce53546c 100644 (file)
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -1,7 +1,7 @@
 #
 # Scheduler Makefile for CUPS.
 #
-# Copyright 2007-2016 by Apple Inc.
+# Copyright 2007-2017 by Apple Inc.
 # Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 # These coded instructions, statements, and computer programs are the
@@ -59,7 +59,7 @@ CXXOBJS       =       \
                cups-driverd.o
 OBJS   =       \
                $(COBJS) \
-               $(CXXOBJS)
+               $(LD_CXXOBJS)
 LIBTARGETS =   \
                $(LIBCUPSMIME) \
                libcupsmime.a
@@ -120,7 +120,7 @@ clean:
 
 depend:
        $(CC) -MM $(ALL_CFLAGS) $(COBJS:.o=.c) >Dependencies
-       $(CXX) -MM $(ALL_CXXFLAGS) $(CXXOBJS:.o=.cxx) >>Dependencies
+       $(CXX) -MM $(ALL_CXXFLAGS) $(LD_CXXOBJS:.o=.cxx) >>Dependencies
 
 
 #
@@ -356,14 +356,14 @@ uninstall:
 
 cupsd: $(CUPSDOBJS) $(LIBCUPSMIME) ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \
+       $(LD_CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \
                $(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
                $(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) $(ONDEMANDLIBS) \
                 $(DNSSDLIBS) $(LIBS) $(LIBGSSAPI) $(LIBWRAP)
 
 cupsd-static:  $(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o cupsd-static $(CUPSDOBJS) libcupsmime.a \
+       $(LD_CC) $(LDFLAGS) -o cupsd-static $(CUPSDOBJS) libcupsmime.a \
                $(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
                ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(LIBPAPER) \
                $(LIBMALLOC) $(SERVERLIBS) $(ONDEMANDLIBS) $(DNSSDLIBS) \
@@ -376,13 +376,13 @@ cupsd-static:     $(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC)
 
 cupsfilter:    cupsfilter.o $(LIBCUPSMIME) ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o cupsfilter cupsfilter.o -L. -lcupsmime $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o cupsfilter cupsfilter.o -L. -lcupsmime $(LIBS)
        $(RM) convert
        $(LN) cupsfilter convert
 
 cupsfilter-static:     cupsfilter.o libcupsmime.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o cupsfilter-static cupsfilter.o libcupsmime.a \
+       $(LD_CC) $(LDFLAGS) -o cupsfilter-static cupsfilter.o libcupsmime.a \
                ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(SSLLIBS) \
                $(DNSSDLIBS) $(LIBGSSAPI)
 
@@ -393,7 +393,7 @@ cupsfilter-static:  cupsfilter.o libcupsmime.a ../cups/$(LIBCUPSSTATIC)
 
 cups-deviced:  cups-deviced.o util.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o cups-deviced cups-deviced.o util.o $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o cups-deviced cups-deviced.o util.o $(LIBS)
 
 
 #
@@ -402,7 +402,7 @@ cups-deviced:       cups-deviced.o util.o ../cups/$(LIBCUPS)
 
 cups-driverd:  cups-driverd.o util.o ../cups/$(LIBCUPS) ../ppdc/$(LIBCUPSPPDC)
        echo Linking $@...
-       $(CXX) $(LDFLAGS) -o cups-driverd cups-driverd.o util.o \
+       $(LD_CXX) $(LDFLAGS) -o cups-driverd cups-driverd.o util.o \
                -L../ppdc -lcupsppdc $(LIBS)
 
 
@@ -412,7 +412,7 @@ cups-driverd:       cups-driverd.o util.o ../cups/$(LIBCUPS) ../ppdc/$(LIBCUPSPPDC)
 
 cups-exec:     cups-exec.o
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o cups-exec cups-exec.o $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o cups-exec cups-exec.o $(LIBS)
 
 
 #
@@ -421,7 +421,7 @@ cups-exec:  cups-exec.o
 
 cups-lpd:      cups-lpd.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o cups-lpd cups-lpd.o $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o cups-lpd cups-lpd.o $(LIBS)
 
 
 #
@@ -457,7 +457,7 @@ libcupsmime.1.dylib:        $(LIBOBJS) libcupsmime.exp
 
 libcupsmime.la:    $(LIBOBJS)
        echo Linking $@...
-       $(CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
+       $(LD_CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
                -version-info 1:0 $(LIBS)
 
 
@@ -478,7 +478,7 @@ libcupsmime.a:      $(LIBOBJS)
 
 testlpd:       testlpd.o ../cups/$(LIBCUPSSTATIC) cups-lpd
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o testlpd testlpd.o ../cups/$(LIBCUPSSTATIC) \
+       $(LD_CC) $(LDFLAGS) -o testlpd testlpd.o ../cups/$(LIBCUPSSTATIC) \
                $(COMMONLIBS) $(LIBZ) $(SSLLIBS) $(DNSSDLIBS) $(LIBGSSAPI)
 
 
@@ -488,7 +488,7 @@ testlpd:    testlpd.o ../cups/$(LIBCUPSSTATIC) cups-lpd
 
 testmime:      testmime.o libcupsmime.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testmime.o libcupsmime.a \
+       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testmime.o libcupsmime.a \
                ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(SSLLIBS) \
                $(DNSSDLIBS) $(LIBGSSAPI)
        echo Running MIME tests...
@@ -501,7 +501,7 @@ testmime:   testmime.o libcupsmime.a ../cups/$(LIBCUPSSTATIC)
 
 testspeed:     testspeed.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o testspeed testspeed.o ../cups/$(LIBCUPSSTATIC) \
+       $(LD_CC) $(LDFLAGS) -o testspeed testspeed.o ../cups/$(LIBCUPSSTATIC) \
                $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) $(LIBGSSAPI)
 
 
@@ -511,7 +511,7 @@ testspeed:  testspeed.o ../cups/$(LIBCUPSSTATIC)
 
 testsub:       testsub.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o testsub testsub.o ../cups/$(LIBCUPSSTATIC) \
+       $(LD_CC) $(LDFLAGS) -o testsub testsub.o ../cups/$(LIBCUPSSTATIC) \
                $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) $(LIBGSSAPI)
 
 

diff --git a/systemv/Makefile b/systemv/Makefile
index 7515d511460d39ff42de07a435cb55e3a5c2f626..a9edd56166664f31292af5c171cacde4fcbede9a 100644 (file)
--- a/systemv/Makefile
+++ b/systemv/Makefile
@@ -158,7 +158,7 @@ uninstall:
 
 cancel:        cancel.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o cancel cancel.o $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o cancel cancel.o $(LIBS)
 
 
 #
@@ -167,7 +167,7 @@ cancel:     cancel.o ../cups/$(LIBCUPS)
 
 cupsaccept:    cupsaccept.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o cupsaccept cupsaccept.o $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o cupsaccept cupsaccept.o $(LIBS)
        for file in accept cupsenable cupsdisable cupsreject reject; do \
                $(RM) $$file; \
                $(LN) cupsaccept $$file; \
@@ -180,7 +180,7 @@ cupsaccept: cupsaccept.o ../cups/$(LIBCUPS)
 
 cupsaddsmb:    cupsaddsmb.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o cupsaddsmb cupsaddsmb.o $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o cupsaddsmb cupsaddsmb.o $(LIBS)
 
 
 #
@@ -189,7 +189,7 @@ cupsaddsmb: cupsaddsmb.o ../cups/$(LIBCUPS)
 
 cupsctl:       cupsctl.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o cupsctl cupsctl.o $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o cupsctl cupsctl.o $(LIBS)
 
 
 #
@@ -198,7 +198,7 @@ cupsctl:    cupsctl.o ../cups/$(LIBCUPS)
 
 cupstestdsc:   cupstestdsc.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ cupstestdsc.o $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o $@ cupstestdsc.o $(LIBS)
 
 
 #
@@ -207,11 +207,11 @@ cupstestdsc:      cupstestdsc.o ../cups/$(LIBCUPS)
 
 cupstestppd:   cupstestppd.o ../cups/$(LIBCUPS) ../filter/$(LIBCUPSIMAGE)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ cupstestppd.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o $@ cupstestppd.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
 
 cupstestppd-static:    cupstestppd.o ../cups/$(LIBCUPSSTATIC) ../filter/libcupsimage.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ cupstestppd.o ../filter/libcupsimage.a \
+       $(LD_CC) $(LDFLAGS) -o $@ cupstestppd.o ../filter/libcupsimage.a \
                ../cups/$(LIBCUPSSTATIC) $(IMGLIBS) $(LIBGSSAPI) $(LIBS) $(LIBZ)
 
 
@@ -221,7 +221,7 @@ cupstestppd-static: cupstestppd.o ../cups/$(LIBCUPSSTATIC) ../filter/libcupsimag
 
 lp:    lp.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o lp lp.o $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o lp lp.o $(LIBS)
 
 
 #
@@ -230,7 +230,7 @@ lp: lp.o ../cups/$(LIBCUPS)
 
 lpadmin:       lpadmin.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o lpadmin lpadmin.o $(LIBZ) $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o lpadmin lpadmin.o $(LIBZ) $(LIBS)
 
 
 #
@@ -239,7 +239,7 @@ lpadmin:    lpadmin.o ../cups/$(LIBCUPS)
 
 lpinfo:        lpinfo.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o lpinfo lpinfo.o $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o lpinfo lpinfo.o $(LIBS)
 
 
 #
@@ -248,7 +248,7 @@ lpinfo:     lpinfo.o ../cups/$(LIBCUPS)
 
 lpmove:        lpmove.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o lpmove lpmove.o $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o lpmove lpmove.o $(LIBS)
 
 
 #
@@ -257,7 +257,7 @@ lpmove:     lpmove.o ../cups/$(LIBCUPS)
 
 lpoptions:     lpoptions.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o lpoptions lpoptions.o $(LIBZ) $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o lpoptions lpoptions.o $(LIBZ) $(LIBS)
 
 
 #
@@ -266,7 +266,7 @@ lpoptions:  lpoptions.o ../cups/$(LIBCUPS)
 
 lpstat:        lpstat.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o lpstat lpstat.o $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o lpstat lpstat.o $(LIBS)
 
 
 #

diff --git a/templates/Makefile b/templates/Makefile
index 09c1892ece7740d5433ab24e8b62b251dbda4e9c..7a0819183733a784a048d1a7ad91c73a40562929 100644 (file)
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -1,7 +1,7 @@
 #
 # Template makefile for CUPS.
 #
-# Copyright 2007-2014 by Apple Inc.
+# Copyright 2007-2017 by Apple Inc.
 # Copyright 1993-2007 by Easy Software Products.
 #
 # These coded instructions, statements, and computer programs are the

diff --git a/test/Makefile b/test/Makefile
index 611397e04a788c02342f6dc6363e15e4eb93a8a2..03a552e82027b3bbd4d113dcf5235a87fb0c9679 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -183,9 +183,9 @@ local:      ippserver ippserver-shared ipptool-static
 
 ippfind:       ippfind.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ ippfind.o $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o $@ ippfind.o $(LIBS)
        echo Linking $@-static...
-       $(CC) $(LDFLAGS) -o $@-static ippfind.o  ../cups/$(LIBCUPSSTATIC) \
+       $(LD_CC) $(LDFLAGS) -o $@-static ippfind.o  ../cups/$(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 
 
@@ -195,7 +195,7 @@ ippfind:    ippfind.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSSTATIC)
 
 ippserver:     ippserver.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ ippserver.o  ../cups/$(LIBCUPSSTATIC) \
+       $(LD_CC) $(LDFLAGS) -o $@ ippserver.o  ../cups/$(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 
 
@@ -205,7 +205,7 @@ ippserver:  ippserver.o ../cups/$(LIBCUPSSTATIC)
 
 ippserver-shared:      ippserver.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ ippserver.o $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o $@ ippserver.o $(LIBS)
 
 
 #
@@ -214,7 +214,7 @@ ippserver-shared:   ippserver.o ../cups/$(LIBCUPS)
 
 ipptool:       ipptool.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ ipptool.o $(LIBS)
+       $(LD_CC) $(LDFLAGS) -o $@ ipptool.o $(LIBS)
 
 
 #
@@ -223,7 +223,7 @@ ipptool:    ipptool.o ../cups/$(LIBCUPS)
 
 ipptool-static:        ipptool.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ ipptool.o  ../cups/$(LIBCUPSSTATIC) \
+       $(LD_CC) $(LDFLAGS) -o $@ ipptool.o  ../cups/$(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)