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

diff --git a/cups-config.in b/cups-config.in
index 0f6d5041b..9dd094d16 100755
--- a/cups-config.in
+++ b/cups-config.in
@@ -1,37 +1,24 @@
-#! /bin/sh
+#!/bin/sh
 #
-# "$Id$"
-# 
-#   CUPS configuration utility.
+# CUPS configuration utility.
 #
-#   Copyright 2001-2006 by Easy Software Products, all rights reserved.
+# Copyright © 2007-2019 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
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
 #
 
 VERSION="@CUPS_VERSION@"
-APIVERSION="1.3"
+APIVERSION="2.3"
+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@
@@ -39,23 +26,18 @@ cups_serverbin=@CUPS_SERVERBIN@
 cups_serverroot=@CUPS_SERVERROOT@
 INSTALLSTATIC=@INSTALLSTATIC@
 
-# flags for C++ compiler:
+# flags for compiler and linker...
 CFLAGS=""
 LDFLAGS="@EXPORT_LDFLAGS@"
-LIBS="@EXPORT_SSLLIBS@ @LIBS@"
-IMGLIBS="@EXPORT_LIBTIFF@ @EXPORT_LIBJPEG@ @EXPORT_LIBPNG@ @EXPORT_LIBZ@"
+LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
 
 # 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"
+    LDFLAGS="-L$selfdir/cups $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 +52,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"
@@ -88,13 +71,15 @@ fi
 
 # Parse command line options
 static=no
-image=no
 
 while test $# -gt 0; do
     case $1 in
 	--api-version)
 	    echo $APIVERSION
 	    ;;
+	--build)
+	    echo $BUILD
+	    ;;
 	--cflags)
 	    echo $CFLAGS
 	    ;;
@@ -105,25 +90,18 @@ while test $# -gt 0; do
 	    usage 0
 	    ;;
 	--image)
-	    image=yes
+	    # Do nothing
 	    ;;
 	--ldflags)
 	    echo $LDFLAGS
 	    ;;
 	--libs)
 	    if test $static = no; then
- 	        if test $image = no; then
- 	            echo -lcups $LIBS
- 		else
- 	            echo -lcupsimage $IMGLIBS -lcups $LIBS
- 		fi
+	        libs="@EXTLINKCUPS@";
 	    else
-	        if test $image = no; then
-	            echo $libdir/libcups.a $LIBS
-		else
-	            echo $imagelibdir/libcupsimage.a $IMGLIBS $libdir/libcups.a $LIBS
-		fi
+	        libs="$libdir/libcups.a $LIBS";
 	    fi
+	    echo $libs
 	    ;;
 	--serverbin)
 	    echo $cups_serverbin
@@ -133,7 +111,7 @@ while test $# -gt 0; do
 	    ;;
 	--static)
 	    if test -z "$INSTALLSTATIC"; then
-	        echo "WARNING: Static libraries not installed!" >&2
+	        echo "WARNING: Static libraries not installed." >&2
 	    else
 	        static=yes
 	    fi
@@ -148,7 +126,3 @@ while test $# -gt 0; do
 
     shift
 done
-
-#
-# End of "$Id$".
-#