From: Michael R Sweet <michaelrsweet@gmail.com>
Date: Fri, 17 May 2019 11:43:00 +0000 (-0400)
Subject: Fix Linux build issues with new LINKCUPS macro (Issue #5261)
X-Git-Tag: v2.3rc1~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c11d5aea4d9ba596e71e82697bf28b0a00ea5fa;p=thirdparty%2Fcups.git

Fix Linux build issues with new LINKCUPS macro (Issue #5261)
---

diff --git a/backend/Makefile b/backend/Makefile
index 6f8168c0f0..e3ce49be6b 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -243,7 +243,7 @@ libbackend.a:	$(LIBOBJS)
 
 dnssd:	dnssd.o ../cups/$(LIBCUPS) libbackend.a
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o dnssd dnssd.o libbackend.a $(LINKCUPS)
+	$(LD_CC) $(ALL_LDFLAGS) -o dnssd dnssd.o libbackend.a $(DNSSDLIBS) $(LINKCUPS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 	if test `uname` = Darwin; then \
 		$(RM) mdns; \
diff --git a/scheduler/Makefile b/scheduler/Makefile
index a6be9db001..b50bd0a99b 100644
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -315,7 +315,7 @@ uninstall:
 cupsd:	$(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPS)
 	echo Linking $@...
 	$(LD_CC) $(ALL_LDFLAGS) -o cupsd $(CUPSDOBJS) libcupsmime.a \
-		$(PAMLIBS) $(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) \
+		$(PAMLIBS) $(LIBPAPER) $(LIBMALLOC) $(DNSSDLIBS) $(SERVERLIBS) \
 		$(ONDEMANDLIBS) $(LIBWRAP) $(LIBGSSAPI) $(COMMONLIBS) $(LINKCUPS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
diff --git a/systemv/Makefile b/systemv/Makefile
index b5a0c8fd6a..d11dc598ce 100644
--- a/systemv/Makefile
+++ b/systemv/Makefile
@@ -179,7 +179,7 @@ cupsctl:	cupsctl.o ../cups/$(LIBCUPS)
 
 cupstestppd:	cupstestppd.o ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o $@ cupstestppd.o $(LINKCUPS)
+	$(LD_CC) $(ALL_LDFLAGS) -o $@ cupstestppd.o -lm $(LINKCUPS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 cupstestppd-static:	cupstestppd.o ../cups/$(LIBCUPSSTATIC)
diff --git a/tools/Makefile b/tools/Makefile
index 7d19f5f738..be9cba3663 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -147,7 +147,7 @@ local:	ippeveprinter-static ipptool-static
 
 ippeveprinter:	ippeveprinter.o ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o $@ ippeveprinter.o $(LINKCUPS)
+	$(LD_CC) $(ALL_LDFLAGS) -o $@ ippeveprinter.o $(DNSSDLIBS) $(LINKCUPS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -187,7 +187,7 @@ ippeveps:	ippeveps.o ../cups/$(LIBCUPS)
 
 ippfind:	ippfind.o ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o $@ ippfind.o $(LINKCUPS)
+	$(LD_CC) $(ALL_LDFLAGS) -o $@ ippfind.o $(DNSSDLIBS) $(LINKCUPS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@