Merge changes from CUPS 1.4svn-r7874.

[thirdparty/cups.git] / Makedefs.in

diff --git a/Makedefs.in b/Makedefs.in
index cb771a0fa7a24c03bb69873f5416e7e77967e4ea..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).
 #
@@ -35,7 +35,7 @@ RM            =       @RM@ -f
 RMDIR          =       @RMDIR@
 SED            =       @SED@
 SHELL          =       /bin/sh
-STRIP          =       @STRIP@
+
 
 #
 # Installation programs...
@@ -91,6 +91,8 @@ LIBPNG                =       @LIBPNG@
 LIBSLP         =       @LIBSLP@
 LIBGSSAPI      =       @LIBGSSAPI@
 LIBTIFF                =       @LIBTIFF@
+LIBUSB         =       @LIBUSB@
+LIBWRAP                =       @LIBWRAP@
 LIBZ           =       @LIBZ@
 
 #
@@ -140,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...
@@ -226,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@
 
@@ -277,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 $"
 #