diff options
author | Tim Potter <tpot@samba.org> | 2001-08-23 19:06:20 +0000 |
---|---|---|
committer | Tim Potter <tpot@samba.org> | 2001-08-23 19:06:20 +0000 |
commit | d1f53e404496dff10df7dc5e5b58ed676982c955 (patch) | |
tree | d43108f7f1a4fe99602b919032166e5935411413 /source3/include | |
parent | 2f6486b55f05947205c380e071b16cd40af4d057 (diff) | |
download | samba-d1f53e404496dff10df7dc5e5b58ed676982c955.tar.gz samba-d1f53e404496dff10df7dc5e5b58ed676982c955.tar.bz2 samba-d1f53e404496dff10df7dc5e5b58ed676982c955.zip |
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)
Diffstat (limited to 'source3/include')
-rw-r--r-- | source3/include/config.h.in | 4 | ||||
-rw-r--r-- | source3/include/includes.h | 2 | ||||
-rw-r--r-- | source3/include/printing.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source3/include/config.h.in b/source3/include/config.h.in index b6107a9836..060f41bedb 100644 --- a/source3/include/config.h.in +++ b/source3/include/config.h.in @@ -983,8 +983,8 @@ /* Define if you have the acl library (-lacl). */ #undef HAVE_LIBACL -/* Define if you have the cups library (-lcups). */ -#undef HAVE_LIBCUPS +/* Define if you have cups installed. */ +#undef HAVE_CUPS /* Define if you have the gen library (-lgen). */ #undef HAVE_LIBGEN diff --git a/source3/include/includes.h b/source3/include/includes.h index 8b138030ef..bf82469aa3 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -760,7 +760,7 @@ typedef enum #endif #ifndef DEFAULT_PRINTING -#ifdef HAVE_LIBCUPS +#ifdef HAVE_CUPS #define DEFAULT_PRINTING PRINT_CUPS #define PRINTCAP_NAME "cups" #elif defined(SYSV) diff --git a/source3/include/printing.h b/source3/include/printing.h index 676a0c74bf..ee0b25d63f 100644 --- a/source3/include/printing.h +++ b/source3/include/printing.h @@ -57,9 +57,9 @@ struct printif extern struct printif generic_printif; -#ifdef HAVE_LIBCUPS +#ifdef HAVE_CUPS extern struct printif cups_printif; -#endif /* HAVE_LIBCUPS */ +#endif /* HAVE_CUPS */ #define PRINT_MAX_JOBID 10000 #define UNIX_JOB_START PRINT_MAX_JOBID |