Merge changes from CUPS 1.6svn-r9939.

[thirdparty/cups.git] / config-scripts / cups-sharedlibs.m4

diff --git a/config-scripts/cups-sharedlibs.m4 b/config-scripts/cups-sharedlibs.m4
index 2e255b7633f5a7c8bb6ac54cd59524252832d419..f126f360454ae5e48e6f61198be406f14a7605c8 100644 (file)
--- a/config-scripts/cups-sharedlibs.m4
+++ b/config-scripts/cups-sharedlibs.m4
@@ -27,7 +27,6 @@ if test x$enable_shared != xno; then
                SunOS*)
                        LIBCUPS="lib$cupsbase.so.2"
                        LIBCUPSCGI="libcupscgi.so.1"
-                       LIBCUPSDRIVER="libcupsdriver.so.1"
                        LIBCUPSIMAGE="libcupsimage.so.2"
                        LIBCUPSMIME="libcupsmime.so.1"
                        LIBCUPSPPDC="libcupsppdc.so.1"
@@ -38,7 +37,6 @@ if test x$enable_shared != xno; then
                UNIX_S*)
                        LIBCUPS="lib$cupsbase.so.2"
                        LIBCUPSCGI="libcupscgi.so.1"
-                       LIBCUPSDRIVER="libcupsdriver.so.1"
                        LIBCUPSIMAGE="libcupsimage.so.2"
                        LIBCUPSMIME="libcupsmime.so.1"
                        LIBCUPSPPDC="libcupsppdc.so.1"
@@ -51,7 +49,6 @@ if test x$enable_shared != xno; then
                                ia64)
                                        LIBCUPS="lib$cupsbase.so.2"
                                        LIBCUPSCGI="libcupscgi.so.1"
-                                       LIBCUPSDRIVER="libcupsdriver.so.1"
                                        LIBCUPSIMAGE="libcupsimage.so.2"
                                        LIBCUPSMIME="libcupsmime.so.1"
                                        LIBCUPSPPDC="libcupsppdc.so.1"
@@ -62,7 +59,6 @@ if test x$enable_shared != xno; then
                                *)
                                        LIBCUPS="lib$cupsbase.sl.2"
                                        LIBCUPSCGI="libcupscgi.sl.1"
-                                       LIBCUPSDRIVER="libcupsdriver.sl.1"
                                        LIBCUPSIMAGE="libcupsimage.sl.2"
                                        LIBCUPSMIME="libcupsmime.sl.1"
                                        LIBCUPSPPDC="libcupsppdc.sl.1"
@@ -75,7 +71,6 @@ if test x$enable_shared != xno; then
                IRIX)
                        LIBCUPS="lib$cupsbase.so.2"
                        LIBCUPSCGI="libcupscgi.so.1"
-                       LIBCUPSDRIVER="libcupsdriver.so.1"
                        LIBCUPSIMAGE="libcupsimage.so.2"
                        LIBCUPSMIME="libcupsmime.so.1"
                        LIBCUPSPPDC="libcupsppdc.so.1"
@@ -86,7 +81,6 @@ if test x$enable_shared != xno; then
                OSF1* | Linux | GNU | *BSD*)
                        LIBCUPS="lib$cupsbase.so.2"
                        LIBCUPSCGI="libcupscgi.so.1"
-                       LIBCUPSDRIVER="libcupsdriver.so.1"
                        LIBCUPSIMAGE="libcupsimage.so.2"
                        LIBCUPSMIME="libcupsmime.so.1"
                        LIBCUPSPPDC="libcupsppdc.so.1"
@@ -97,7 +91,6 @@ if test x$enable_shared != xno; then
                Darwin*)
                        LIBCUPS="lib$cupsbase.2.dylib"
                        LIBCUPSCGI="libcupscgi.1.dylib"
-                       LIBCUPSDRIVER="libcupsdriver.1.dylib"
                        LIBCUPSIMAGE="libcupsimage.2.dylib"
                        LIBCUPSMIME="libcupsmime.1.dylib"
                        LIBCUPSPPDC="libcupsppdc.1.dylib"
@@ -109,7 +102,6 @@ if test x$enable_shared != xno; then
                        LIBCUPS="lib${cupsbase}_s.a"
                        LIBCUPSBASE="${cupsbase}_s"
                        LIBCUPSCGI="libcupscgi_s.a"
-                       LIBCUPSDRIVER="libcupsdriver_s.a"
                        LIBCUPSIMAGE="libcupsimage_s.a"
                        LIBCUPSMIME="libcupsmime_s.a"
                        LIBCUPSPPDC="libcupsppdc_s.a"
@@ -122,7 +114,6 @@ if test x$enable_shared != xno; then
                        echo "         option with compiler."
                        LIBCUPS="lib$cupsbase.so.2"
                        LIBCUPSCGI="libcupscgi.so.1"
-                       LIBCUPSDRIVER="libcupsdriver.so.1"
                        LIBCUPSIMAGE="libcupsimage.so.2"
                        LIBCUPSMIME="libcupsmime.so.1"
                        LIBCUPSPPDC="libcupsppdc.so.1"
@@ -135,7 +126,6 @@ else
        PICFLAG=0
        LIBCUPS="lib$cupsbase.a"
        LIBCUPSCGI="libcupscgi.a"
-       LIBCUPSDRIVER="libcupsdriver.a"
        LIBCUPSIMAGE="libcupsimage.a"
        LIBCUPSMIME="libcupsmime.a"
        LIBCUPSPPDC="libcupsppdc.a"
@@ -156,7 +146,6 @@ AC_SUBST(DSO64FLAGS)
 AC_SUBST(LIBCUPS)
 AC_SUBST(LIBCUPSBASE)
 AC_SUBST(LIBCUPSCGI)
-AC_SUBST(LIBCUPSDRIVER)
 AC_SUBST(LIBCUPSIMAGE)
 AC_SUBST(LIBCUPSMIME)
 AC_SUBST(LIBCUPSPPDC)
@@ -167,7 +156,6 @@ if test x$enable_shared = xno; then
        LINKCUPSIMAGE="../filter/libcupsimage.a"
 
        EXTLINKCUPS="-lcups"
-       EXTLINKCUPSDRIVER="-lcupsdriver"
        EXTLINKCUPSIMAGE="-lcupsimage"
 else
        if test $uname = AIX; then
@@ -175,20 +163,17 @@ else
                LINKCUPSIMAGE="-lcupsimage_s"
 
                EXTLINKCUPS="-lcups_s"
-               EXTLINKCUPSDRIVER="-lcupsdriver_s"
                EXTLINKCUPSIMAGE="-lcupsimage_s"
        else
                LINKCUPS="-l${cupsbase}"
                LINKCUPSIMAGE="-lcupsimage"
 
                EXTLINKCUPS="-lcups"
-               EXTLINKCUPSDRIVER="-lcupsdriver"
                EXTLINKCUPSIMAGE="-lcupsimage"
        fi
 fi
 
 AC_SUBST(EXTLINKCUPS)
-AC_SUBST(EXTLINKCUPSDRIVER)
 AC_SUBST(EXTLINKCUPSIMAGE)
 AC_SUBST(LINKCUPS)
 AC_SUBST(LINKCUPSIMAGE)
@@ -201,7 +186,7 @@ if test "$DSO" != ":"; then
        # 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="\$(LIBTIFF) \$(LIBPNG) \$(LIBJPEG) \$(LIBZ)"
+       DSOLIBS="\$(LIBZ)"
        IMGLIBS=""
 
        # Tell the run-time linkers where to find a DSO.  Some platforms
@@ -258,7 +243,7 @@ if test "$DSO" != ":"; then
        esac
 else
        DSOLIBS=""
-       IMGLIBS="\$(LIBTIFF) \$(LIBPNG) \$(LIBJPEG) \$(LIBZ)"
+       IMGLIBS="\$(LIBZ)"
 fi
 
 AC_SUBST(DSOLIBS)