X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=cups-config.in;h=f0951d0e1fbfb1105d7dea54c4c2eea87a18e55d;hb=6cf21c3b8774bbfcbd51f03c742cd1d6e80caeb5;hp=0f6d5041b61ba3c2cb2cc6f782eab2b1b248c92f;hpb=ed4869111296da3b8514751fab9dffaa3146cb87;p=thirdparty%2Fcups.git

diff --git a/cups-config.in b/cups-config.in
index 0f6d5041b..f0951d0e1 100755
--- a/cups-config.in
+++ b/cups-config.in
@@ -1,30 +1,20 @@
-#! /bin/sh
+#!/bin/sh
 #
-# "$Id$"
-# 
-#   CUPS configuration utility.
+# CUPS configuration utility.
 #
-#   Copyright 2001-2006 by Easy Software Products, all rights reserved.
+# Copyright 2007-2016 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
+# These coded instructions, statements, and computer programs are the
+# 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="2.2"
+BUILD="@CUPS_BUILD@"
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
@@ -32,6 +22,7 @@ bindir=@bindir@
 includedir=@includedir@
 libdir=@libdir@
 imagelibdir=@libdir@
+datarootdir=@datadir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
 cups_datadir=@CUPS_DATADIR@
@@ -42,8 +33,7 @@ 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@"
 
 # Check for local invocation...
 selfdir=`dirname $0`
@@ -53,9 +43,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"
@@ -70,6 +57,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"
@@ -95,6 +83,9 @@ while test $# -gt 0; do
 	--api-version)
 	    echo $APIVERSION
 	    ;;
+	--build)
+	    echo $BUILD
+	    ;;
 	--cflags)
 	    echo $CFLAGS
 	    ;;
@@ -112,18 +103,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 $imagelibdir/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
@@ -148,7 +138,3 @@ while test $# -gt 0; do
 
     shift
 done
-
-#
-# End of "$Id$".
-#