[SCM] Samba Shared Repository - branch master updated

[Björn Jacke]

The branch, master has been updated
       via  616e187... s3: fall back to cups-config for underlinked libs
       via  1d443f6... Revert "s3: Use cups-config --libs"
      from  feb4322... ntlmssp: fix unitialized variable in ntlmssp_server_postauth().

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 616e187d68e3e7b202413a96518b31d029e9563a
Author: Björn Jacke <bj at sernet.de>
Date:   Thu Aug 12 16:18:45 2010 +0200

    s3: fall back to cups-config for underlinked libs
    
    some OpenBSD systems have underlinked cups libraries. If linking against cups
    alone fails, try to link against all the cups-config --libs cruft, which we
    usually don't want. (bugzila #7244)

commit 1d443f6bc251303e827e97401771a66c03fc33e7
Author: Björn Jacke <bj at sernet.de>
Date:   Mon Aug 9 18:37:58 2010 +0200

    Revert "s3: Use cups-config --libs"
    
    This reverts commit 911db761148. This was introduced in 18f1f5b56b140
    intentionally.

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

Summary of changes:
 source3/configure.in |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index 294cd53..0023fe2 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -813,15 +813,21 @@ if test x$enable_cups != xno; then
 
         if test "x$CUPS_CONFIG" != x; then
 
-		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
+			# try linking with -lcups alone first. That should work unless libcups is
+			# underlinked. With cups-config --libs we pull in unwanted and unneeded
+			# dendencies including thread libraries - use cups-config only if really
+			# required. 
+			AC_CHECK_LIB_EXT(cups, ac_save_PRINT_LIBS , httpConnect,
+				[PRINT_LIBS"$ac_save_PRINT_LIBS -lcups"],
+				[AC_MSG_WARN([your cups library doesn't link with -lcups alone, it might be underlinked.]) ;
+				 PRINT_LIBS="$ac_save_PRINT_LIBS `$CUPS_CONFIG --libs`"])
+
 			AC_DEFINE(HAVE_CUPS,1,[Whether we have CUPS])
 			samba_cv_HAVE_CUPS=yes
 			AC_CHECK_LIB_EXT(cups, PRINT_LIBS, httpConnectEncrypt)


-- 
Samba Shared Repository