From 72f883cea0b4b69f639d30d79aceef34f0ec4fe4 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 14 Jun 2008 10:59:11 +0200 Subject: [PATCH] Use the correct cups-devel test for HAVE_IPRINT also (cherry picked from commit a42d7e1146e7469062ead2c8f22f549a48154e03) (cherry picked from commit 70e5b876b6b422c44ea588dbe319b6ce86a035d7) --- source/configure.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/configure.in b/source/configure.in index 463e7a356da..64a4681b5f3 100644 --- a/source/configure.in +++ b/source/configure.in @@ -767,6 +767,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 @@ -783,7 +784,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.) -- 2.11.4.GIT