Merge changes from CUPS 1.5svn-r9198.

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

diff --git a/cups-config.in b/cups-config.in
index 81a982b4743386e0e5f3471267beddf83654ff58..f59abe0bb8d37fbfa00aa9b127f22e145a0bfbe1 100755 (executable)
--- a/cups-config.in
+++ b/cups-config.in
@@ -1,30 +1,22 @@
 #! /bin/sh
 #
-# "$Id: cups-config.in 5799 2006-08-03 00:54:38Z mike $"
+# "$Id: cups-config.in 7394 2008-03-21 23:41:43Z mike $"
 # 
 #   CUPS configuration utility.
 #
+#   Copyright 2007-2010 by Apple Inc.
 #   Copyright 2001-2006 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 VERSION="@CUPS_VERSION@"
-APIVERSION="1.2"
+APIVERSION="1.5"
+BUILD="@CUPS_BUILD@"
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
@@ -43,7 +35,7 @@ INSTALLSTATIC=@INSTALLSTATIC@
 # flags for C++ compiler:
 CFLAGS=""
 LDFLAGS="@EXPORT_LDFLAGS@"
-LIBS="@EXPORT_SSLLIBS@ @EXPORT_LIBZ@ @LIBS@"
+LIBS="@LIBGSSAPI@ @EXPORT_SSLLIBS@ @EXPORT_LIBZ@ @LIBS@"
 IMGLIBS="@EXPORT_LIBTIFF@ @EXPORT_LIBJPEG@ @EXPORT_LIBPNG@"
 
 # Check for local invocation...
@@ -71,11 +63,12 @@ fi
 usage ()
 {
     echo "Usage: cups-config --api-version"
+    echo "       cups-config --build"
     echo "       cups-config --cflags"
     echo "       cups-config --datadir"
     echo "       cups-config --help"
     echo "       cups-config --ldflags"
-    echo "       cups-config [--image] [--static] --libs"
+    echo "       cups-config [--driver] [--image] [--static] --libs"
     echo "       cups-config --serverbin"
     echo "       cups-config --serverroot"
     echo "       cups-config --version"
@@ -90,18 +83,25 @@ fi
 # Parse command line options
 static=no
 image=no
+driver=no
 
 while test $# -gt 0; do
     case $1 in
        --api-version)
            echo $APIVERSION
            ;;
+       --build)
+           echo $BUILD
+           ;;
        --cflags)
            echo $CFLAGS
            ;;
        --datadir)
            echo $cups_datadir
            ;;
+       --driver)
+           driver=yes
+           ;;
        --help)
            usage 0
            ;;
@@ -113,18 +113,23 @@ 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
+               if test $driver = yes; then
+                   libs="@EXTLINKCUPSDRIVER@ $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 $IMGLIBS $libs"
+               fi
+               if test $driver = yes; then
+                   libs="$libdir/libcupsdriver.a $libs"
                fi
            fi
+           echo $libs
            ;;
        --serverbin)
            echo $cups_serverbin
@@ -151,5 +156,5 @@ while test $# -gt 0; do
 done
 
 #
-# End of "$Id: cups-config.in 5799 2006-08-03 00:54:38Z mike $".
+# End of "$Id: cups-config.in 7394 2008-03-21 23:41:43Z mike $".
 #