X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=cups-config.in;h=436800a6403be90f786d65752b63614a8525e75f;hb=7416dfe99a59dda6e39920e13355209f42ebdfb5;hp=fdea47ea2525ffd84ec5057e85871cec57296ec9;hpb=ef416fc25c4af449e930416117bedb12fc9924ba;p=thirdparty%2Fcups.git

diff --git a/cups-config.in b/cups-config.in
index fdea47ea2..436800a64 100755
--- a/cups-config.in
+++ b/cups-config.in
@@ -1,59 +1,65 @@
 #! /bin/sh
 #
-# "$Id: cups-config.in 4802 2005-10-19 13:48:06Z mike $"
-# 
+# "$Id$"
+#
 #   CUPS configuration utility.
 #
-#   Copyright 2001-2005 by Easy Software Products, all rights reserved.
+#   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
-#   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.6"
+BUILD="@CUPS_BUILD@"
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 includedir=@includedir@
 libdir=@libdir@
+imagelibdir=@libdir@
+datarootdir=@datadir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
 cups_datadir=@CUPS_DATADIR@
 cups_serverbin=@CUPS_SERVERBIN@
 cups_serverroot=@CUPS_SERVERROOT@
+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@ @LIBZ@ @LIBS@"
 
-if test $includedir != /usr/include; then
-    CFLAGS="$CFLAGS -I$includedir"
-fi
+# Check for local invocation...
+selfdir=`dirname $0`
+
+if test -f "$selfdir/cups/cups.h"; then
+    CFLAGS="-I$selfdir"
+    LDFLAGS="-L$selfdir/cups -L$selfdir/filter $LDFLAGS"
+    libdir="$selfdir/cups"
+    imagelibdir="$selfdir/filter"
+else
+    if test $includedir != /usr/include; then
+	CFLAGS="$CFLAGS -I$includedir"
+    fi
 
-if test $libdir != /usr/lib -a $libdir != /usr/lib32; then
-    LDFLAGS="$LDFLAGS -L$libdir"
+    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
+	LDFLAGS="$LDFLAGS -L$libdir"
+    fi
 fi
 
+
 usage ()
 {
     echo "Usage: cups-config --api-version"
+    echo "       cups-config --build"
     echo "       cups-config --cflags"
     echo "       cups-config --datadir"
     echo "       cups-config --help"
@@ -79,6 +85,9 @@ while test $# -gt 0; do
 	--api-version)
 	    echo $APIVERSION
 	    ;;
+	--build)
+	    echo $BUILD
+	    ;;
 	--cflags)
 	    echo $CFLAGS
 	    ;;
@@ -96,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 $IMGLIBS -lcups $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 $libdir/libcupsimage.a $IMGLIBS $libdir/libcups.a $LIBS
+	        libs="$libdir/libcups.a $LIBS";
+ 	        if test $image = yes; then
+ 	            libs="$libdir/libcupsimage.a $libs"
 		fi
 	    fi
+	    echo $libs
 	    ;;
 	--serverbin)
 	    echo $cups_serverbin
@@ -116,7 +124,11 @@ while test $# -gt 0; do
 	    echo $cups_serverroot
 	    ;;
 	--static)
-	    static=yes
+	    if test -z "$INSTALLSTATIC"; then
+	        echo "WARNING: Static libraries not installed!" >&2
+	    else
+	        static=yes
+	    fi
 	    ;;
 	--version)
 	    echo $VERSION
@@ -130,5 +142,5 @@ while test $# -gt 0; do
 done
 
 #
-# End of "$Id: cups-config.in 4802 2005-10-19 13:48:06Z mike $".
+# End of "$Id$".
 #