From: Volker Lendecke <vl@samba.org>
Date: Sat, 14 Jun 2008 08:31:11 +0000 (+0200)
Subject: Correctly check for presence of cups-devel
X-Git-Tag: samba-3.3.0pre1~919
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2408d2493f7c6e0beee58febd547516bbeb0929d;p=thirdparty%2Fsamba.git

Correctly check for presence of cups-devel

On SuSE at least cups-config belongs to cups-libs which does not contain the
headers which are in cups-devel.
---

diff --git a/source/configure.in b/source/configure.in
index 358d9da7b7b..f3663d72c7d 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -769,10 +769,24 @@ if test x$enable_cups != xno; then
 	AC_PATH_PROG(CUPS_CONFIG, cups-config)
 
         if test "x$CUPS_CONFIG" != x; then
-                AC_DEFINE(HAVE_CUPS,1,[Whether we have CUPS])
+
+		ac_save_CFLAGS=$CFLAGS
+		ac_save_LDFLAGS=$LDFLAGS
+		ac_save_PRINT_LIBS=$PRINT_LIBS
 		CFLAGS="$CFLAGS `$CUPS_CONFIG --cflags`"
 		LDFLAGS="$LDFLAGS `$CUPS_CONFIG --ldflags`"
 		PRINT_LIBS="$PRINT_LIBS `$CUPS_CONFIG --libs`"
+		AC_CHECK_HEADERS(cups/cups.h cups/language.h)
+		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])
+		else
+			AC_MSG_WARN([cups-config around but cups-devel not installed])
+			CFLAGS=$ac_save_CFLAGS
+			LDFLAGS=$ac_save_LDFLAGS
+			PRINT_LIBS=$ac_save_PRINT_LIBS
+		fi
+
 	elif test x"$enable_cups" = x"yes"; then
 		AC_MSG_ERROR(Cups support required but cups-config not located.  Make sure cups-devel related files are installed.)
         fi