Merge CUPS 1.4svn-r7493.

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

diff --git a/cups-config.in b/cups-config.in
index 0c88b72b929cfddeba62bd99b09637d76848f689..7f53c60ba80c0d8cec745e060254b1ab193642b6 100755 (executable)
--- a/cups-config.in
+++ b/cups-config.in
@@ -1,30 +1,21 @@
 #! /bin/sh
 #
-# "$Id: cups-config.in 5503 2006-05-10 18:55:39Z mike $"
+# "$Id: cups-config.in 6649 2007-07-11 21:46:42Z mike $"
 # 
 #   CUPS configuration utility.
 #
+#   Copyright 2007 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.3"
+APIVERSION="1.4"
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
@@ -32,6 +23,7 @@ bindir=@bindir@
 includedir=@includedir@
 libdir=@libdir@
 imagelibdir=@libdir@
+datarootdir=@datadir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
 cups_datadir=@CUPS_DATADIR@
@@ -42,8 +34,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
 # flags for C++ compiler:
 CFLAGS=""
 LDFLAGS="@EXPORT_LDFLAGS@"
-LIBS="@EXPORT_SSLLIBS@ @LIBS@"
-IMGLIBS="@EXPORT_LIBTIFF@ @EXPORT_LIBJPEG@ @EXPORT_LIBPNG@ @EXPORT_LIBZ@"
+LIBS="@LIBGSSAPI@ @EXPORT_SSLLIBS@ @EXPORT_LIBZ@ @LIBS@"
+IMGLIBS="@EXPORT_LIBTIFF@ @EXPORT_LIBJPEG@ @EXPORT_LIBPNG@"
 
 # Check for local invocation...
 selfdir=`dirname $0`
@@ -53,7 +45,7 @@ if test -f "$selfdir/cups/cups.h"; then
     LDFLAGS="-L$selfdir/cups -L$selfdir/filter $LDFLAGS"
     libdir="$selfdir/cups"
     imagelibdir="$selfdir/filter"
-    if test ! -e "$selfdir/cups/raster.h"; then
+    if test ! -f "$selfdir/cups/raster.h"; then
         ln -s ../filter/raster.h "$selfdir/cups"
     fi
 else
@@ -74,7 +66,7 @@ usage ()
     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"
@@ -89,6 +81,7 @@ fi
 # Parse command line options
 static=no
 image=no
+driver=no
 
 while test $# -gt 0; do
     case $1 in
@@ -101,6 +94,9 @@ while test $# -gt 0; do
        --datadir)
            echo $cups_datadir
            ;;
+       --driver)
+           driver=yes
+           ;;
        --help)
            usage 0
            ;;
@@ -112,18 +108,23 @@ while test $# -gt 0; do
            ;;
        --libs)
            if test $static = no; then
-               if test $image = no; then
-                   echo -lcups $LIBS
-               else
-                   echo -lcupsimage $IMGLIBS -lcups $LIBS
-               fi
+               libs="-lcups $LIBS";
+               if test $image = yes; then
+                   libs="-lcupsimage $libs"
+               fi
+               if test $driver = yes; then
+                   libs="-lcupsdriver $libs"
+               fi
            else
-               if test $image = no; then
-                   echo $libdir/libcups.a $LIBS
-               else
-                   echo $imagelibdir/libcupsimage.a $IMGLIBS $libdir/libcups.a $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
@@ -150,5 +151,5 @@ while test $# -gt 0; do
 done
 
 #
-# End of "$Id: cups-config.in 5503 2006-05-10 18:55:39Z mike $".
+# End of "$Id: cups-config.in 6649 2007-07-11 21:46:42Z mike $".
 #