Merge changes from CUPS 1.4svn-r7874.

[thirdparty/cups.git] / Makedefs.in

diff --git a/Makedefs.in b/Makedefs.in
index 1868ee86169b2903d616d39500dbcf0b6d34362c..f213a3f38f157aea6e3ab178e9a2fa1c57276fb4 100644 (file)
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -1,5 +1,5 @@
 #
-# "$Id: Makedefs.in 7016 2007-10-10 22:07:51Z mike $"
+# "$Id: Makedefs.in 7687 2008-06-24 01:28:36Z mike $"
 #
 #   Common makefile definitions for the Common UNIX Printing System (CUPS).
 #
@@ -22,6 +22,7 @@ AWK           =       @AWK@
 CC             =       @LIBTOOL@ @CC@
 CXX            =       @LIBTOOL@ @CXX@
 DSO            =       @DSO@
+DSOXX          =       @DSOXX@
 HTMLDOC                =       @HTMLDOC@
 INSTALL                =       @INSTALL@
 LD             =       @LD@
@@ -34,17 +35,17 @@ RM          =       @RM@ -f
 RMDIR          =       @RMDIR@
 SED            =       @SED@
 SHELL          =       /bin/sh
-STRIP          =       @STRIP@
+
 
 #
 # Installation programs...
 #
 
-INSTALL_BIN    =       $(LIBTOOL) $(INSTALL) -m 755
+INSTALL_BIN    =       $(LIBTOOL) $(INSTALL) -m 755 @INSTALL_STRIP@
 INSTALL_CONFIG =       $(INSTALL) -m @CUPS_CONFIG_FILE_PERM@
 INSTALL_DATA   =       $(INSTALL) -m 644
 INSTALL_DIR    =       $(INSTALL) -d
-INSTALL_LIB    =       $(LIBTOOL) $(INSTALL) -m 755
+INSTALL_LIB    =       $(LIBTOOL) $(INSTALL) -m 755 @INSTALL_STRIP@
 INSTALL_MAN    =       $(INSTALL) -m 644
 INSTALL_SCRIPT =       $(INSTALL) -m 755
 
@@ -77,7 +78,11 @@ UNINSTALL_LANGUAGES =        @UNINSTALL_LANGUAGES@
 #
 
 LIBCUPS                =       @LIBCUPS@
+LIBCUPSCGI     =       @LIBCUPSCGI@
+LIBCUPSDRIVER  =       @LIBCUPSDRIVER@
 LIBCUPSIMAGE   =       @LIBCUPSIMAGE@
+LIBCUPSMIME    =       @LIBCUPSMIME@
+LIBCUPSPPDC    =       @LIBCUPSPPDC@
 LIBJPEG                =       @LIBJPEG@
 LIBLDAP                =       @LIBLDAP@
 LIBMALLOC      =       @LIBMALLOC@
@@ -86,6 +91,8 @@ LIBPNG                =       @LIBPNG@
 LIBSLP         =       @LIBSLP@
 LIBGSSAPI      =       @LIBGSSAPI@
 LIBTIFF                =       @LIBTIFF@
+LIBUSB         =       @LIBUSB@
+LIBWRAP                =       @LIBWRAP@
 LIBZ           =       @LIBZ@
 
 #
@@ -120,7 +127,7 @@ COMMONLIBS  =       @LIBS@
 CUPSDLIBS      =       @CUPSDLIBS@
 CXXFLAGS       =       @CPPFLAGS@ @CXXFLAGS@
 CXXLIBS                =       @CXXLIBS@
-DSOFLAGS       =       @DSOFLAGS@
+DSOFLAGS       =       -L../cups @DSOFLAGS@
 DSOLIBS                =       @DSOLIBS@ $(COMMONLIBS)
 DNSSDLIBS      =       @DNSSDLIBS@
 FONTS          =       @FONTS@
@@ -135,14 +142,18 @@ LIBCUPSIMAGEORDER =       @LIBCUPSIMAGEORDER@
 LINKCUPS       =       @LINKCUPS@ $(SSLLIBS)
 LINKCUPSIMAGE  =       @LINKCUPSIMAGE@
 LIBS           =       $(LINKCUPS) $(COMMONLIBS)
+MDNS           =       @MDNS@
 OPTIM          =       @OPTIM@
 OPTIONS                =
 PAMLIBS                =       @PAMLIBS@
 PAP            =       @PAP@
 PDFTOPS                =       @PDFTOPS@
 PHPDIR         =       @PHPDIR@
+PHPOPTIONS     =       @PHPOPTIONS@ -I../.. `$(PHPCONFIG) --includes`
 SSLFLAGS       =       @SSLFLAGS@
 SSLLIBS                =       @SSLLIBS@
+UNITTESTS      =       @UNITTESTS@
+
 
 #
 # Separate 32/64-bit library support...
@@ -221,6 +232,7 @@ REQUESTS    =       $(BUILDROOT)@CUPS_REQUESTS@
 SBINDIR                =       $(BUILDROOT)@sbindir@
 SERVERBIN      =       $(BUILDROOT)@CUPS_SERVERBIN@
 SERVERROOT     =       $(BUILDROOT)@CUPS_SERVERROOT@
+SMFMANIFESTDIR =       @SMFMANIFESTDIR@
 STATEDIR       =       $(BUILDROOT)@CUPS_STATEDIR@
 XINETD         =       @XINETD@
 
@@ -272,5 +284,5 @@ DBUSDIR             =       @DBUSDIR@
 
 
 #
-# End of "$Id: Makedefs.in 7016 2007-10-10 22:07:51Z mike $"
+# End of "$Id: Makedefs.in 7687 2008-06-24 01:28:36Z mike $"
 #