Put all of the common library definitions (from LIBS) in COMMONLIBS.

Remove all remaining references to NETLIBS, and use LIBS instead of
COMMONLIBS in cups-config.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@4802 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/Makedefs.in b/Makedefs.in
index e6b5a3ce71bce2d2916d9b2c57d970a8a89276ca..3153b96e8e6d4bca1649b9b72dec3ef04dbef26f 100644 (file)
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -87,7 +87,7 @@ ARFLAGS               =       @ARFLAGS@
 BACKLIBS       =       @BACKLIBS@
 CFLAGS         =       -I.. $(RC_CFLAGS) $(SSLFLAGS) @CPPFLAGS@ @CFLAGS@ \
                        @LARGEFILE@ $(OPTIONS)
-COMMONLIBS     =       @COMMONLIBS@
+COMMONLIBS     =       @LIBS@
 CXXFLAGS       =       -I.. $(RC_CFLAGS) $(SSLFLAGS) @CPPFLAGS@ @CXXFLAGS@ \
                        @LARGEFILE@ $(OPTIONS)
 CXXLIBS                =       @CXXLIBS@
@@ -97,7 +97,7 @@ IMGLIBS               =       @IMGLIBS@ -lm
 LDFLAGS                =       -L../cups -L../filter $(RC_CFLAGS) @LDFLAGS@ $(OPTIM)
 LINKCUPS       =       @LINKCUPS@ $(SSLLIBS)
 LINKCUPSIMAGE  =       @LINKCUPSIMAGE@
-LIBS           =       $(LINKCUPS) @LIBS@ $(COMMONLIBS)
+LIBS           =       $(LINKCUPS) $(COMMONLIBS)
 OPTIM          =       @OPTIM@
 OPTIONS                =
 PAMLIBS                =       @PAMLIBS@

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index 99da437bea7716b0bc038e53a6c783d7bdc22d98..9b8dab01c7de1c98a4301760378c151cf1596989 100644 (file)
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -184,16 +184,14 @@ dnl Extra platform-specific libraries...
 case $uname in
         Darwin*)
                 BACKLIBS="-framework IOKit"
-                COMMONLIBS="-framework CoreFoundation"
+                LIBS="-framework CoreFoundation $LIBS"
                 ;;
         *)
                 BACKLIBS=""
-               COMMONLIBS=""
                 ;;
 esac
 
 AC_SUBST(BACKLIBS)
-AC_SUBST(COMMONLIBS)
 
 dnl New default port definition for IPP...
 AC_ARG_WITH(ipp-port, [  --with-ipp-port         set default port number for IPP ],

diff --git a/config-scripts/cups-threads.m4 b/config-scripts/cups-threads.m4
index 69e8c0395a1364e218e9f5b7a7f9921e2d1fba07..788ce838ce9e1cfe9ecd251004f3350d666d5ebd 100644 (file)
--- a/config-scripts/cups-threads.m4
+++ b/config-scripts/cups-threads.m4
@@ -28,8 +28,7 @@ have_pthread=no
 
 if test "x$enable_threads" != xno; then
        AC_CHECK_HEADER(pthread.h, AC_DEFINE(HAVE_PTHREAD_H))
-       AC_CHECK_LIB(pthread, pthread_create,
-               COMMONLIBS="-lpthread $COMMONLIBS")
+       AC_CHECK_LIB(pthread, pthread_create)
 
        if test "x$ac_cv_lib_pthread_pthread_create" = xyes -a x$ac_cv_header_pthread_h = xyes; then
                have_pthread=yes
@@ -40,9 +39,8 @@ if test "x$enable_threads" != xno; then
                LIBS="-pthread $LIBS"
                AC_TRY_LINK([#include <pthread.h>],
                        [pthread_create(0, 0, 0, 0);],
-                       COMMONLIBS="-pthread $COMMONLIBS"
-                       have_pthread=yes)
-               LIBS="$SAVELIBS"
+                       have_pthread=yes,
+                       LIBS="$SAVELIBS")
                AC_MSG_RESULT([$have_pthread])
        fi
 fi

diff --git a/cups-config.in b/cups-config.in
index 9c6c64ec4934e0c48555934bd73e46705a218909..f5d0b2c471acc1375d29540fc6849a05b6587424 100755 (executable)
--- a/cups-config.in
+++ b/cups-config.in
@@ -40,7 +40,7 @@ cups_serverroot=@CUPS_SERVERROOT@
 # flags for C++ compiler:
 CFLAGS=""
 LDFLAGS="@EXPORT_LDFLAGS@"
-LIBS="@EXPORT_SSLLIBS@ @NETLIBS@ @COMMONLIBS@"
+LIBS="@EXPORT_SSLLIBS@ @LIBS@"
 IMGLIBS="@EXPORT_LIBTIFF@ @EXPORT_LIBJPEG@ @EXPORT_LIBPNG@ @EXPORT_LIBZ@"
 
 if test $includedir != /usr/include; then