Merge changes from CUPS 1.5svn-r9717.

[thirdparty/cups.git] / Makedefs.in

diff --git a/Makedefs.in b/Makedefs.in
index 21b5874925a48ae0e3cd8c3bd67744d3fad9c27b..10fb71da84638c9eede48c3928ffa43c0cb3e797 100644 (file)
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -3,7 +3,7 @@
 #
 #   Common makefile definitions for CUPS.
 #
-#   Copyright 2007-2010 by Apple Inc.
+#   Copyright 2007-2011 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -127,7 +127,6 @@ BANNERTOPS  =       @BANNERTOPS@
 BUILDDIRS      =       @BUILDDIRS@
 CFLAGS         =       @CPPFLAGS@ @CFLAGS@
 COMMONLIBS     =       @LIBS@
-CUPSDLIBS      =       @CUPSDLIBS@
 CXXFLAGS       =       @CPPFLAGS@ @CXXFLAGS@
 CXXLIBS                =       @CXXLIBS@
 DBUS_NOTIFIER  =       @DBUS_NOTIFIER@
@@ -144,9 +143,7 @@ LDFLAGS             =       -L../cgi-bin -L../cups -L../filter -L../ppdc \
                        -L../scheduler @LDARCHFLAGS@ \
                        @LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
 LEGACY_BACKENDS        =       @LEGACY_BACKENDS@
-LIBCUPSORDER   =       @LIBCUPSORDER@
-LIBCUPSIMAGEORDER =    @LIBCUPSIMAGEORDER@
-LINKCUPS       =       @LINKCUPS@ $(SSLLIBS) $(DNSSDLIBS)
+LINKCUPS       =       @LINKCUPS@ $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(LIBZ)
 LINKCUPSIMAGE  =       @LINKCUPSIMAGE@
 LIBS           =       $(LINKCUPS) $(COMMONLIBS)
 OPTIM          =       @OPTIM@
@@ -156,6 +153,7 @@ PAP         =       @PAP@
 PDFTOPS                =       @PDFTOPS@
 PHPDIR         =       @PHPDIR@
 PHPOPTIONS     =       @PHPOPTIONS@ -I../.. `$(PHPCONFIG) --includes`
+SERVERLIBS     =       @SERVERLIBS@
 SSLFLAGS       =       @SSLFLAGS@
 SSLLIBS                =       @SSLLIBS@
 TEXTTOPS       =       @TEXTTOPS@
@@ -220,6 +218,7 @@ BUILDROOT   =       $(DSTROOT)
 
 AMANDIR                =       $(BUILDROOT)@AMANDIR@
 BINDIR         =       $(BUILDROOT)@bindir@
+BUNDLEDIR      =       @CUPS_BUNDLEDIR@
 CACHEDIR       =       $(BUILDROOT)@CUPS_CACHEDIR@
 DATADIR                =       $(BUILDROOT)@CUPS_DATADIR@
 DOCDIR         =       $(BUILDROOT)@CUPS_DOCROOT@