Merge changes from CUPS 1.4svn-r7696.

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

diff --git a/cups-config.in b/cups-config.in
index 66bf149979876cd9552f57efd2b2d59e92cf1b21..1a68a12c7086fddbbfebeb4de417950fae86e855 100755 (executable)
--- a/cups-config.in
+++ b/cups-config.in
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# "$Id: cups-config.in 6649 2007-07-11 21:46:42Z mike $"
+# "$Id: cups-config.in 7394 2008-03-21 23:41:43Z mike $"
 # 
 #   CUPS configuration utility.
 #
@@ -15,7 +15,7 @@
 #
 
 VERSION="@CUPS_VERSION@"
-APIVERSION="1.3"
+APIVERSION="1.4"
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
@@ -66,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"
@@ -81,6 +81,7 @@ fi
 # Parse command line options
 static=no
 image=no
+driver=no
 
 while test $# -gt 0; do
     case $1 in
@@ -93,6 +94,9 @@ while test $# -gt 0; do
        --datadir)
            echo $cups_datadir
            ;;
+       --driver)
+           driver=yes
+           ;;
        --help)
            usage 0
            ;;
@@ -104,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 -lcups $IMGLIBS $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 $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
@@ -142,5 +151,5 @@ while test $# -gt 0; do
 done
 
 #
-# End of "$Id: cups-config.in 6649 2007-07-11 21:46:42Z mike $".
+# End of "$Id: cups-config.in 7394 2008-03-21 23:41:43Z mike $".
 #