From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Sat, 17 Jun 2017 01:46:04 +0000 (-0400)
Subject: Fix compile warning.
X-Git-Tag: v2.2.4~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f34c1c99cd8dba4b43a287613833408400a37412;p=thirdparty%2Fcups.git

Fix compile warning.

Include systemd options.
---

diff --git a/cups/dest.c b/cups/dest.c
index 4ce5234fa8..0c9050c2a3 100644
--- a/cups/dest.c
+++ b/cups/dest.c
@@ -225,8 +225,8 @@ static const char	*cups_dnssd_resolve(cups_dest_t *dest, const char *uri,
 static int		cups_dnssd_resolve_cb(void *context);
 static void		cups_dnssd_unquote(char *dst, const char *src,
 			                   size_t dstsize);
-#endif /* HAVE_DNSSD || HAVE_AVAHI */
 static int		cups_elapsed(struct timeval *t);
+#endif /* HAVE_DNSSD || HAVE_AVAHI */
 static int		cups_find_dest(const char *name, const char *instance,
 				       int num_dests, cups_dest_t *dests, int prev,
 				       int *rdiff);
@@ -3845,6 +3845,7 @@ cups_dnssd_unquote(char       *dst,	/* I - Destination buffer */
 #endif /* HAVE_DNSSD */
 
 
+#if defined(HAVE_AVAHI) || defined(HAVE_DNSSD)
 /*
  * 'cups_elapsed()' - Return the elapsed time in milliseconds.
  */
@@ -3864,6 +3865,7 @@ cups_elapsed(struct timeval *t)		/* IO - Previous time */
 
   return (msecs);
 }
+#endif /* HAVE_AVAHI || HAVE_DNSSD */
 
 
 /*
diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in
index 687a3f661b..b1afb96471 100644
--- a/packaging/cups.spec.in
+++ b/packaging/cups.spec.in
@@ -116,7 +116,7 @@ This package provides LPD client support.
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS" \
-    ./configure %{_dbus} %{_dnssd} %{_libusb1} %{_static}
+    ./configure %{_dbus} %{_dnssd} %{_libusb1} %{_static} %{_systemd}
 # If we got this far, all prerequisite libraries must be here.
 make