]> git.ipfire.org Git - thirdparty/cups.git/commitdiff
Fix compile warning.
authorMichael R Sweet <michael.r.sweet@gmail.com>
Sat, 17 Jun 2017 01:46:04 +0000 (21:46 -0400)
committerMichael R Sweet <michael.r.sweet@gmail.com>
Sat, 17 Jun 2017 01:46:04 +0000 (21:46 -0400)
Include systemd options.

cups/dest.c
packaging/cups.spec.in

index 4ce5234fa84f289cf88e27fca79d4acc945c923e..0c9050c2a3d3780582071980e79ab044ee74da89 100644 (file)
@@ -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 */
 
 
 /*
index 687a3f661b4d9c13d31bb59aab72762bdd47e49b..b1afb964712b57669ef81b1709dab902d9f04df9 100644 (file)
@@ -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