From d1f53e404496dff10df7dc5e5b58ed676982c955 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Thu, 23 Aug 2001 19:06:20 +0000
Subject: Fixed detection of CUPS.  We need to check for the presence of the
 cups header files as well as libcups. (This used to be commit
 2dbb41a7b88e7fad63579111aaab4a1cd28c54d5)

---
 source3/printing/pcap.c       | 8 ++++----
 source3/printing/print_cups.c | 4 ++--
 source3/printing/printing.c   | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'source3/printing')

diff --git a/source3/printing/pcap.c b/source3/printing/pcap.c
index 313e17fb1c..cbafe27728 100644
--- a/source3/printing/pcap.c
+++ b/source3/printing/pcap.c
@@ -270,10 +270,10 @@ BOOL pcap_printername_ok(char *pszPrintername, char *pszPrintcapname)
 	return(False);
       }
 
-#ifdef HAVE_LIBCUPS
+#ifdef HAVE_CUPS
     if (strequal(psz, "cups"))
        return (cups_printername_ok(pszPrintername));
-#endif /* HAVE_LIBCUPS */
+#endif /* HAVE_CUPS */
 
 #ifdef SYSV
     if (strequal(psz, "lpstat"))
@@ -344,12 +344,12 @@ void pcap_printer_fn(void (*fn)(char *, char *))
       return;
     }
 
-#ifdef HAVE_LIBCUPS
+#ifdef HAVE_CUPS
     if (strequal(psz, "cups")) {
       cups_printer_fn(fn);
       return;
     }
-#endif /* HAVE_LIBCUPS */
+#endif /* HAVE_CUPS */
 
 #ifdef SYSV
     if (strequal(psz, "lpstat")) {
diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c
index ab2ba20b9c..c2feb2a83c 100644
--- a/source3/printing/print_cups.c
+++ b/source3/printing/print_cups.c
@@ -21,7 +21,7 @@
 #include "printing.h"
 #include "smb.h"
 
-#ifdef HAVE_LIBCUPS
+#ifdef HAVE_CUPS
 #include <cups/cups.h>
 #include <cups/language.h>
 
@@ -1189,4 +1189,4 @@ cups_queue_resume(int snum)
 #else
  /* this keeps fussy compilers happy */
  void print_cups_dummy(void) {}
-#endif /* HAVE_LIBCUPS */
+#endif /* HAVE_CUPS */
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index f1eaf3723c..370abd4fdf 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -72,10 +72,10 @@ BOOL print_backend_init(void)
 	tdb_unlock_bystring(tdb, sversion);
 
 	/* select the appropriate printing interface... */
-#ifdef HAVE_LIBCUPS
+#ifdef HAVE_CUPS
 	if (strcmp(lp_printcapname(), "cups") == 0)
 		current_printif = &cups_printif;
-#endif /* HAVE_LIBCUPS */
+#endif /* HAVE_CUPS */
 
 	/* do NT print initialization... */
 	return nt_printing_init();
-- 
cgit