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 f3962ab85fde67a3d24c6b7d0a0add15e3ce8c99..f126f360454ae5e48e6f61198be406f14a7605c8 100644 (file)
--- a/config-scripts/cups-sharedlibs.m4
+++ b/config-scripts/cups-sharedlibs.m4
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-sharedlibs.m4 6649 2007-07-11 21:46:42Z mike $"
+dnl "$Id: cups-sharedlibs.m4 7630 2008-06-09 22:31:44Z mike $"
 dnl
-dnl   Shared library support for the Common UNIX Printing System (CUPS).
+dnl   Shared library support for CUPS.
 dnl
-dnl   Copyright 2007-2008 by Apple Inc.
+dnl   Copyright 2007-2010 by Apple Inc.
 dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
@@ -16,14 +16,17 @@ dnl
 PICFLAG=1
 DSOFLAGS="${DSOFLAGS:=}"
 
-AC_ARG_ENABLE(shared, [  --enable-shared         turn on shared libraries, default=yes])
+AC_ARG_ENABLE(shared, [  --disable-shared        do not create shared libraries])
+
+cupsbase="cups"
+LIBCUPSBASE="lib$cupsbase"
+LIBCUPSSTATIC="lib$cupsbase.a"
 
 if test x$enable_shared != xno; then
        case "$uname" in
                SunOS*)
-                       LIBCUPS="libcups.so.2"
+                       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"
@@ -32,9 +35,8 @@ if test x$enable_shared != xno; then
                        DSOFLAGS="$DSOFLAGS -Wl,-h\`basename \$@\` -G \$(OPTIM)"
                        ;;
                UNIX_S*)
-                       LIBCUPS="libcups.so.2"
+                       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"
@@ -45,9 +47,8 @@ if test x$enable_shared != xno; then
                HP-UX*)
                        case "$uarch" in
                                ia64)
-                                       LIBCUPS="libcups.so.2"
+                                       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"
@@ -56,9 +57,8 @@ if test x$enable_shared != xno; then
                                        DSOFLAGS="$DSOFLAGS -Wl,-b,-z,+h,\`basename \$@\`"
                                        ;;
                                *)
-                                       LIBCUPS="libcups.sl.2"
+                                       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"
@@ -69,9 +69,8 @@ if test x$enable_shared != xno; then
                        esac
                        ;;
                IRIX)
-                       LIBCUPS="libcups.so.2"
+                       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"
@@ -80,9 +79,8 @@ if test x$enable_shared != xno; then
                        DSOFLAGS="$DSOFLAGS -set_version,sgi2.6,-soname,\`basename \$@\` -shared \$(OPTIM)"
                        ;;
                OSF1* | Linux | GNU | *BSD*)
-                       LIBCUPS="libcups.so.2"
+                       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"
@@ -91,9 +89,8 @@ if test x$enable_shared != xno; then
                        DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` -shared \$(OPTIM)"
                        ;;
                Darwin*)
-                       LIBCUPS="libcups.2.dylib"
+                       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"
@@ -102,9 +99,9 @@ if test x$enable_shared != xno; then
                        DSOFLAGS="$DSOFLAGS -dynamiclib -single_module -lc"
                        ;;
                AIX*)
-                       LIBCUPS="libcups_s.a"
+                       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"
@@ -115,9 +112,8 @@ if test x$enable_shared != xno; then
                *)
                        echo "Warning: shared libraries may not be supported.  Trying -shared"
                        echo "         option with compiler."
-                       LIBCUPS="libcups.so.2"
+                       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"
@@ -128,9 +124,8 @@ if test x$enable_shared != xno; then
        esac
 else
        PICFLAG=0
-       LIBCUPS="libcups.a"
+       LIBCUPS="lib$cupsbase.a"
        LIBCUPSCGI="libcupscgi.a"
-       LIBCUPSDRIVER="libcupsdriver.a"
        LIBCUPSIMAGE="libcupsimage.a"
        LIBCUPSMIME="libcupsmime.a"
        LIBCUPSPPDC="libcupsppdc.a"
@@ -149,25 +144,37 @@ AC_SUBST(DSOFLAGS)
 AC_SUBST(DSO32FLAGS)
 AC_SUBST(DSO64FLAGS)
 AC_SUBST(LIBCUPS)
+AC_SUBST(LIBCUPSBASE)
 AC_SUBST(LIBCUPSCGI)
-AC_SUBST(LIBCUPSDRIVER)
 AC_SUBST(LIBCUPSIMAGE)
 AC_SUBST(LIBCUPSMIME)
 AC_SUBST(LIBCUPSPPDC)
+AC_SUBST(LIBCUPSSTATIC)
 
 if test x$enable_shared = xno; then
-       LINKCUPS="../cups/libcups.a"
+       LINKCUPS="../cups/lib$cupsbase.a"
        LINKCUPSIMAGE="../filter/libcupsimage.a"
+
+       EXTLINKCUPS="-lcups"
+       EXTLINKCUPSIMAGE="-lcupsimage"
 else
        if test $uname = AIX; then
-               LINKCUPS="-lcups_s"
+               LINKCUPS="-l${cupsbase}_s"
                LINKCUPSIMAGE="-lcupsimage_s"
+
+               EXTLINKCUPS="-lcups_s"
+               EXTLINKCUPSIMAGE="-lcupsimage_s"
        else
-               LINKCUPS="-lcups"
+               LINKCUPS="-l${cupsbase}"
                LINKCUPSIMAGE="-lcupsimage"
+
+               EXTLINKCUPS="-lcups"
+               EXTLINKCUPSIMAGE="-lcupsimage"
        fi
 fi
 
+AC_SUBST(EXTLINKCUPS)
+AC_SUBST(EXTLINKCUPSIMAGE)
 AC_SUBST(LINKCUPS)
 AC_SUBST(LINKCUPSIMAGE)
 
@@ -179,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
@@ -236,7 +243,7 @@ if test "$DSO" != ":"; then
        esac
 else
        DSOLIBS=""
-       IMGLIBS="\$(LIBTIFF) \$(LIBPNG) \$(LIBJPEG) \$(LIBZ)"
+       IMGLIBS="\$(LIBZ)"
 fi
 
 AC_SUBST(DSOLIBS)
@@ -244,5 +251,5 @@ AC_SUBST(IMGLIBS)
 AC_SUBST(EXPORT_LDFLAGS)
 
 dnl
-dnl End of "$Id: cups-sharedlibs.m4 6649 2007-07-11 21:46:42Z mike $".
+dnl End of "$Id: cups-sharedlibs.m4 7630 2008-06-09 22:31:44Z mike $".
 dnl