[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2840-ga42d7e1

[Volker Lendecke]

The branch, v3-3-test has been updated
       via  a42d7e1146e7469062ead2c8f22f549a48154e03 (commit)
      from  2408d2493f7c6e0beee58febd547516bbeb0929d (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit a42d7e1146e7469062ead2c8f22f549a48154e03
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Jun 14 10:59:11 2008 +0200

    Use the correct cups-devel test for HAVE_IPRINT also

-----------------------------------------------------------------------

Summary of changes:
 source/configure.in |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/configure.in b/source/configure.in
index f3663d7..7ac1339 100644
--- a/source/configure.in
+++ b/source/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.)


-- 
Samba Shared Repository