summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2008-06-14 10:59:11 +0200
committerVolker Lendecke <vl@samba.org>2008-06-14 11:10:13 +0200
commite7530f567cf14d843d185656d71bf0fadb04379a (patch)
tree0ac3b9b0b992cf8782a51aa4c2bdc9e185f22750 /source3
parentc08611a6c53d3a965afd16e56cf5c90777344314 (diff)
downloadsamba-e7530f567cf14d843d185656d71bf0fadb04379a.tar.gz
samba-e7530f567cf14d843d185656d71bf0fadb04379a.tar.bz2
samba-e7530f567cf14d843d185656d71bf0fadb04379a.zip
Use the correct cups-devel test for HAVE_IPRINT also
(This used to be commit a42d7e1146e7469062ead2c8f22f549a48154e03)
Diffstat (limited to 'source3')
-rw-r--r--source3/configure.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/configure.in b/source3/configure.in
index f3663d72c7..7ac13398c9 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -780,6 +780,7 @@ if test x$enable_cups != xno; then
if test x"$ac_cv_header_cups_cups_h" = xyes -a \
x"$ac_cv_header_cups_language_h" = xyes; then
AC_DEFINE(HAVE_CUPS,1,[Whether we have CUPS])
+ samba_cv_HAVE_CUPS=yes
else
AC_MSG_WARN([cups-config around but cups-devel not installed])
CFLAGS=$ac_save_CFLAGS
@@ -796,7 +797,7 @@ AC_ARG_ENABLE(iprint,
[AS_HELP_STRING([--enable-iprint], [Turn on iPrint support (default=yes if cups is yes)])])
if test x$enable_iprint != xno; then
- if test "x$CUPS_CONFIG" != x; then
+ if test x"$samba_cv_HAVE_CUPS" = xyes; then
AC_DEFINE(HAVE_IPRINT,1,[Whether we have iPrint])
elif test x"$enable_iprint" = x"yes"; then
AC_MSG_ERROR(iPrint support required but cups not enabled. Make sure cups-devel related files are installed and that cups is enabled.)