Update build system and cups-config script to not add extra libraries to the

[thirdparty/cups.git] / configure

diff --git a/configure b/configure
index 8b50ca90a5c2818fd7c0158ee0f27047a80ea845..2804c46b10b6e9f8d931a7b98eea2aaba096f267 100755 (executable)
--- a/configure
+++ b/configure
@@ -682,11 +682,7 @@ LIBTOOL
 LD_CXX
 LD_CC
 EXPORT_LDFLAGS
-IMGLIBS
-DSOLIBS
-LINKCUPSIMAGE
 LINKCUPS
-EXTLINKCUPSIMAGE
 EXTLINKCUPS
 LIBCUPSSTATIC
 LIBCUPSIMAGE
@@ -6546,44 +6542,19 @@ fi
 
 
 if test x$enable_shared = xno; then
-       LINKCUPS="../cups/lib$cupsbase.a"
-       EXTLINKCUPS="-lcups"
-
-       if test "x$cupsimagebase" != x; then
-               LINKCUPSIMAGE="../cups/lib$cupsimagebase.a"
-               EXTLINKCUPSIMAGE="-l$cupsimagebase"
-       else
-               LINKCUPSIMAGE=""
-               EXTLINKCUPSIMAGE=""
-       fi
+       LINKCUPS="../cups/lib$cupsbase.a \$(LIBS)"
+       EXTLINKCUPS="-lcups \$LIBS"
 else
-       LINKCUPS="-l${cupsbase}"
+       LINKCUPS="-L../cups -l${cupsbase}"
        EXTLINKCUPS="-lcups"
-
-       if test "x$cupsimagebase" != x; then
-               LINKCUPSIMAGE="-l$cupsimagebase"
-               EXTLINKCUPSIMAGE="-l$cupsimagebase"
-       else
-               LINKCUPSIMAGE=""
-               EXTLINKCUPSIMAGE=""
-       fi
 fi
 
 
 
 
-
-
 EXPORT_LDFLAGS=""
 
 if test "$DSO" != ":"; then
-       # When using DSOs the image libraries are linked to libcupsimage.so
-       # rather than to the executables.  This makes things smaller if you
-       # are using any static libraries, and it also allows us to distribute
-       # a single DSO rather than a bunch...
-       DSOLIBS="\$(LIBZ)"
-       IMGLIBS=""
-
        # Tell the run-time linkers where to find a DSO.  Some platforms
        # need this option, even when the library is installed in a
        # standard location...
@@ -6613,16 +6584,11 @@ if test "$DSO" != ":"; then
                        fi
                        ;;
        esac
-else
-       DSOLIBS=""
-       IMGLIBS="\$(LIBZ)"
 fi
 
 
 
 
-
-
 # Check whether --enable-libtool_unsupported was given.
 if test "${enable_libtool_unsupported+set}" = set; then :
   enableval=$enable_libtool_unsupported; if test x$enable_libtool_unsupported != xno; then