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

Volker Lendecke vlendec at samba.org
Sat Jun 14 08:38:03 GMT 2008


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

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


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

    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.

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

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


Changeset truncated at 500 lines:

diff --git a/source/configure.in b/source/configure.in
index 358d9da..f3663d7 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


-- 
Samba Shared Repository


More information about the samba-cvs mailing list