Mirror fix from trunk.

[thirdparty/cups.git] / cups-config.in

diff --git a/cups-config.in b/cups-config.in
index 66bf149979876cd9552f57efd2b2d59e92cf1b21..436800a6403be90f786d65752b63614a8525e75f 100755 (executable)
--- a/cups-config.in
+++ b/cups-config.in
@@ -1,10 +1,10 @@
 #! /bin/sh
 #
-# "$Id: cups-config.in 6649 2007-07-11 21:46:42Z mike $"
-# 
+# "$Id$"
+#
 #   CUPS configuration utility.
 #
-#   Copyright 2007 by Apple Inc.
+#   Copyright 2007-2011 by Apple Inc.
 #   Copyright 2001-2006 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -15,7 +15,8 @@
 #
 
 VERSION="@CUPS_VERSION@"
-APIVERSION="1.3"
+APIVERSION="1.6"
+BUILD="@CUPS_BUILD@"
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
@@ -34,8 +35,7 @@ INSTALLSTATIC=@INSTALLSTATIC@
 # flags for C++ compiler:
 CFLAGS=""
 LDFLAGS="@EXPORT_LDFLAGS@"
-LIBS="@LIBGSSAPI@ @EXPORT_SSLLIBS@ @EXPORT_LIBZ@ @LIBS@"
-IMGLIBS="@EXPORT_LIBTIFF@ @EXPORT_LIBJPEG@ @EXPORT_LIBPNG@"
+LIBS="@LIBGSSAPI@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
 
 # Check for local invocation...
 selfdir=`dirname $0`
@@ -45,9 +45,6 @@ if test -f "$selfdir/cups/cups.h"; then
     LDFLAGS="-L$selfdir/cups -L$selfdir/filter $LDFLAGS"
     libdir="$selfdir/cups"
     imagelibdir="$selfdir/filter"
-    if test ! -f "$selfdir/cups/raster.h"; then
-        ln -s ../filter/raster.h "$selfdir/cups"
-    fi
 else
     if test $includedir != /usr/include; then
        CFLAGS="$CFLAGS -I$includedir"
@@ -62,6 +59,7 @@ fi
 usage ()
 {
     echo "Usage: cups-config --api-version"
+    echo "       cups-config --build"
     echo "       cups-config --cflags"
     echo "       cups-config --datadir"
     echo "       cups-config --help"
@@ -87,6 +85,9 @@ while test $# -gt 0; do
        --api-version)
            echo $APIVERSION
            ;;
+       --build)
+           echo $BUILD
+           ;;
        --cflags)
            echo $CFLAGS
            ;;
@@ -104,18 +105,17 @@ while test $# -gt 0; do
            ;;
        --libs)
            if test $static = no; then
-               if test $image = no; then
-                   echo -lcups $LIBS
-               else
-                   echo -lcupsimage -lcups $IMGLIBS $LIBS
-               fi
+               libs="@EXTLINKCUPS@ $LIBS";
+               if test $image = yes; then
+                   libs="@EXTLINKCUPSIMAGE@ $libs"
+               fi
            else
-               if test $image = no; then
-                   echo $libdir/libcups.a $LIBS
-               else
-                   echo $imagelibdir/libcupsimage.a $libdir/libcups.a $IMGLIBS $LIBS
+               libs="$libdir/libcups.a $LIBS";
+               if test $image = yes; then
+                   libs="$libdir/libcupsimage.a $libs"
                fi
            fi
+           echo $libs
            ;;
        --serverbin)
            echo $cups_serverbin
@@ -142,5 +142,5 @@ while test $# -gt 0; do
 done
 
 #
-# End of "$Id: cups-config.in 6649 2007-07-11 21:46:42Z mike $".
+# End of "$Id$".
 #