Remove svn:keywords since they cause svn_load_dirs.pl to complain about every file.

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

diff --git a/config-scripts/cups-sharedlibs.m4 b/config-scripts/cups-sharedlibs.m4
index 0654faf8949dd3306696583b43477427970fb7cf..a39d1d300a2681ff89850b8a0ee8de3a0a5fc56e 100644 (file)
--- a/config-scripts/cups-sharedlibs.m4
+++ b/config-scripts/cups-sharedlibs.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-sharedlibs.m4 5568 2006-05-22 15:34:01Z mike $"
+dnl "$Id: cups-sharedlibs.m4 181 2006-06-22 20:01:18Z jlovell $"
 dnl
 dnl   Shared library support for the Common UNIX Printing System (CUPS).
 dnl
@@ -117,7 +117,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="\$(LIBPNG) \$(LIBTIFF) \$(LIBJPEG) \$(LIBZ)"
+       DSOLIBS="\$(LIBTIFF) \$(LIBPNG) \$(LIBJPEG) \$(LIBZ)"
        IMGLIBS=""
 
        # Tell the run-time linkers where to find a DSO.  Some platforms
@@ -126,46 +126,46 @@ if test "$DSO" != ":"; then
        case $uname in
                 HP-UX*)
                        # HP-UX needs the path, even for /usr/lib...
-                       DSOFLAGS="+s +b \$(libdir) $DSOFLAGS"
-                       DSO32FLAGS="+s +b \$(LIB32DIR) $DSO32FLAGS"
-                       DSO64FLAGS="+s +b \$(LIB64DIR) $DSO64FLAGS"
-                       LDFLAGS="$LDFLAGS -Wl,+s,+b,\$(libdir)"
-                       EXPORT_LDFLAGS="-Wl,+s,+b,\$(libdir)"
+                       DSOFLAGS="+s +b $libdir $DSOFLAGS"
+                       DSO32FLAGS="+s +b $LIB32DIR $DSO32FLAGS"
+                       DSO64FLAGS="+s +b $LIB64DIR $DSO64FLAGS"
+                       LDFLAGS="$LDFLAGS -Wl,+s,+b,$libdir"
+                       EXPORT_LDFLAGS="-Wl,+s,+b,$libdir"
                        ;;
                 SunOS*)
                        # Solaris...
                        if test $exec_prefix != /usr; then
-                               DSOFLAGS="-R\$(libdir) $DSOFLAGS"
-                               DSO32FLAGS="-R\$(LIB32DIR) $DSO32FLAGS"
-                               DSO64FLAGS="-R\$(LIB64DIR) $DSO64FLAGS"
-                               LDFLAGS="$LDFLAGS -R\$(libdir)"
-                               EXPORT_LDFLAGS="-R\$(libdir)"
+                               DSOFLAGS="-R$libdir $DSOFLAGS"
+                               DSO32FLAGS="-R$LIB32DIR $DSO32FLAGS"
+                               DSO64FLAGS="-R$LIB64DIR $DSO64FLAGS"
+                               LDFLAGS="$LDFLAGS -R$libdir"
+                               EXPORT_LDFLAGS="-R$libdir"
                        fi
                        ;;
                 *BSD*)
                         # *BSD...
                        if test $exec_prefix != /usr; then
-                               DSOFLAGS="-Wl,-R\$(libdir) $DSOFLAGS"
-                               DSO32FLAGS="-Wl,-R\$(LIB32DIR) $DSO32FLAGS"
-                               DSO64FLAGS="-Wl,-R\$(LIB64DIR) $DSO64FLAGS"
-                               LDFLAGS="$LDFLAGS -Wl,-R\$(libdir)"
-                               EXPORT_LDFLAGS="-Wl,-R\$(libdir)"
+                               DSOFLAGS="-Wl,-R$libdir $DSOFLAGS"
+                               DSO32FLAGS="-Wl,-R$LIB32DIR $DSO32FLAGS"
+                               DSO64FLAGS="-Wl,-R$LIB64DIR $DSO64FLAGS"
+                               LDFLAGS="$LDFLAGS -Wl,-R$libdir"
+                               EXPORT_LDFLAGS="-Wl,-R$libdir"
                        fi
                        ;;
                 IRIX | Linux | GNU)
                         # IRIX, Linux, and HURD...
                        if test $exec_prefix != /usr; then
-                               DSOFLAGS="-Wl,-rpath,\$(libdir) $DSOFLAGS"
-                               DSO32FLAGS="-Wl,-rpath,\$(LIB32DIR) $DSO32FLAGS"
-                               DSO64FLAGS="-Wl,-rpath,\$(LIB64DIR) $DSO64FLAGS"
-                               LDFLAGS="$LDFLAGS -Wl,-rpath,\$(libdir)"
-                               EXPORT_LDFLAGS="-Wl,-rpath,\$(libdir)"
+                               DSOFLAGS="-Wl,-rpath,$libdir $DSOFLAGS"
+                               DSO32FLAGS="-Wl,-rpath,$LIB32DIR $DSO32FLAGS"
+                               DSO64FLAGS="-Wl,-rpath,$LIB64DIR $DSO64FLAGS"
+                               LDFLAGS="$LDFLAGS -Wl,-rpath,$libdir"
+                               EXPORT_LDFLAGS="-Wl,-rpath,$libdir"
                        fi
                        ;;
        esac
 else
        DSOLIBS=""
-       IMGLIBS="\$(LIBPNG) \$(LIBTIFF) \$(LIBJPEG) \$(LIBZ)"
+       IMGLIBS="\$(LIBTIFF) \$(LIBPNG) \$(LIBJPEG) \$(LIBZ)"
 fi
 
 AC_SUBST(DSOLIBS)
@@ -173,5 +173,5 @@ AC_SUBST(IMGLIBS)
 AC_SUBST(EXPORT_LDFLAGS)
 
 dnl
-dnl End of "$Id: cups-sharedlibs.m4 5568 2006-05-22 15:34:01Z mike $".
+dnl End of "$Id: cups-sharedlibs.m4 181 2006-06-22 20:01:18Z jlovell $".
 dnl