SIGSEGV in CUPS web ui when adding a printer

[thirdparty/cups.git] / Makedefs.in

diff --git a/Makedefs.in b/Makedefs.in
index f085bc3f03813ac7b2dd97b0d686a175040dda43..9ee75856dec509148acd5845ae6c96114ac7d42b 100644 (file)
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -26,7 +26,7 @@ CHMOD         =       @CHMOD@
 CXX            =       @LIBTOOL_CXX@ @CXX@
 DSO            =       @DSO@
 DSOXX          =       @DSOXX@
-GZIP           =       @GZIP@
+GZIPPROG       =       @GZIPPROG@
 INSTALL                =       @INSTALL@
 LD             =       @LD@
 LD_CC          =       @LD_CC@
@@ -116,6 +116,14 @@ INSTALLSTATIC      =       @INSTALLSTATIC@
 
 IPPALIASES     =       @IPPALIASES@
 
+
+#
+# ippeveprinter commands...
+#
+
+IPPEVECOMMANDS =       @IPPEVECOMMANDS@
+
+
 #
 # Install XPC backends?
 #
@@ -145,6 +153,9 @@ ALL_CFLAGS  =       -I.. -D_CUPS_SOURCE $(CFLAGS) \
 ALL_CXXFLAGS   =       -I.. -D_CUPS_SOURCE $(CXXFLAGS) \
                        $(SSLFLAGS) @LARGEFILE@ @PTHREAD_FLAGS@ \
                        $(ONDEMANDFLAGS) $(OPTIONS)
+ALL_DSOFLAGS   =       -L../cups @ARCHFLAGS@ @RELROFLAGS@ $(DSOFLAGS) $(OPTIM)
+ALL_LDFLAGS    =       -L../cups @LDARCHFLAGS@ @RELROFLAGS@ $(LDFLAGS)  \
+                       @PIEFLAGS@ $(OPTIM)
 ARCHFLAGS      =       @ARCHFLAGS@
 ARFLAGS                =       @ARFLAGS@
 BACKLIBS       =       @BACKLIBS@
@@ -156,17 +167,14 @@ CXXLIBS           =       @CXXLIBS@
 DBUS_NOTIFIER  =       @DBUS_NOTIFIER@
 DBUS_NOTIFIERLIBS =    @DBUS_NOTIFIERLIBS@
 DNSSD_BACKEND  =       @DNSSD_BACKEND@
-DSOFLAGS       =       -L../cups @ARCHFLAGS@ @LDFLAGS@ @RELROFLAGS@ \
-                       @DSOFLAGS@ $(OPTIM)
-DSOLIBS                =       @DSOLIBS@ $(COMMONLIBS)
+DSOFLAGS       =       @DSOFLAGS@
 DNSSDLIBS      =       @DNSSDLIBS@
 IPPFIND_BIN    =       @IPPFIND_BIN@
 IPPFIND_MAN    =       @IPPFIND_MAN@
-LDFLAGS                =       -L../cups @LDARCHFLAGS@ @LDFLAGS@ @RELROFLAGS@ \
-                       @PIEFLAGS@ $(OPTIM)
-LINKCUPS       =       @LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(SSLLIBS) $(LIBZ)
-LINKCUPSIMAGE  =       @LINKCUPSIMAGE@
-LIBS           =       $(LINKCUPS) $(COMMONLIBS)
+LDFLAGS                =       @LDFLAGS@
+LINKCUPS       =       @LINKCUPS@
+LINKCUPSSTATIC =       ../cups/$(LIBCUPSSTATIC) $(LIBS)
+LIBS           =       $(LIBGSSAPI) $(DNSSDLIBS) $(SSLLIBS) $(LIBZ) $(COMMONLIBS)
 ONDEMANDFLAGS  =       @ONDEMANDFLAGS@
 ONDEMANDLIBS   =       @ONDEMANDLIBS@
 OPTIM          =       @OPTIM@
@@ -214,7 +222,6 @@ top_srcdir  =       @top_srcdir@
 
 BUILDROOT      =       $(DSTROOT)$(DESTDIR)
 
-AMANDIR                =       $(BUILDROOT)@AMANDIR@
 BINDIR         =       $(BUILDROOT)@bindir@
 BUNDLEDIR      =       @CUPS_BUNDLEDIR@
 CACHEDIR       =       $(BUILDROOT)@CUPS_CACHEDIR@
@@ -227,7 +234,6 @@ LOCALEDIR   =       $(BUILDROOT)@CUPS_LOCALEDIR@
 LOGDIR         =       $(BUILDROOT)@CUPS_LOGDIR@
 MANDIR         =       $(BUILDROOT)@mandir@
 MENUDIR                =       @MENUDIR@
-PMANDIR                =       $(BUILDROOT)@PMANDIR@
 PRIVATEINCLUDE =       $(BUILDROOT)@PRIVATEINCLUDE@
 RCLEVELS       =       @RCLEVELS@
 RCSTART                =       @RCSTART@
@@ -239,12 +245,6 @@ SERVERBIN  =       $(BUILDROOT)@CUPS_SERVERBIN@
 SERVERROOT     =       $(BUILDROOT)@CUPS_SERVERROOT@
 STATEDIR       =       $(BUILDROOT)@CUPS_STATEDIR@
 
-MAN1EXT                =       @MAN1EXT@
-MAN5EXT                =       @MAN5EXT@
-MAN7EXT                =       @MAN7EXT@
-MAN8EXT                =       @MAN8EXT@
-MAN8DIR                =       @MAN8DIR@
-
 PAMDIR         =       @PAMDIR@
 PAMFILE                =       @PAMFILE@
 
@@ -264,7 +264,7 @@ USBQUIRKS   =       @USBQUIRKS@
 #
 
 .SILENT:
-.SUFFIXES:     .1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz
+.SUFFIXES:     .a .c .cxx .h .o
 
 .c.o:
        echo Compiling $<...
@@ -273,13 +273,3 @@ USBQUIRKS  =       @USBQUIRKS@
 .cxx.o:
        echo Compiling $<...
        $(CXX) $(ARCHFLAGS) $(OPTIM) $(ALL_CXXFLAGS) -c -o $@ $<
-
-.man.1 .man.1m .man.3 .man.5 .man.7 .man.8:
-       echo Linking $<...
-       $(RM) $@
-       $(LN) $< $@
-
-.man.1.gz .man.1m.gz .man.3.gz .man.5.gz .man.7.gz .man.8.gz .man.gz:
-       echo -n Compressing $<...
-       $(RM) $@
-       gzip -v9 <$< >$@