Merge pull request #5054 from sanbrother/master

[thirdparty/cups.git] / Makedefs.in

diff --git a/Makedefs.in b/Makedefs.in
index 2edb13f46fc222f486fec6b66b1a06fcce758539..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@
 
@@ -149,7 +151,7 @@ IPPFIND_MAN =       @IPPFIND_MAN@
 LDFLAGS                =       -L../cgi-bin -L../cups -L../filter -L../ppdc \
                        -L../scheduler @LDARCHFLAGS@ \
                        @LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
-LINKCUPS       =       @LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(LIBZ)
+LINKCUPS       =       @LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(SSLLIBS) $(LIBZ)
 LINKCUPSIMAGE  =       @LINKCUPSIMAGE@
 LIBS           =       $(LINKCUPS) $(COMMONLIBS)
 ONDEMANDFLAGS  =       @ONDEMANDFLAGS@