Changeset 587 for vendor/current/source3/configure.in

Timestamp:

Jun 29, 2011, 7:36:41 AM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update vendor to version 3.5.6

File:

• vendor/current/source3/configure.in (modified) (1 diff)

vendor/current/source3/configure.in

@@ -757 +757 @@
         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 -lcups"
                 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