Changelog.

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

diff --git a/cups-config.in b/cups-config.in
index 2f5ea715c68f101b3f632dd9adfd3bc1c01d3975..9dd094d16f4bf6208a6c5fbaeca68159dc584b58 100755 (executable)
--- a/cups-config.in
+++ b/cups-config.in
@@ -1,36 +1,24 @@
-#! /bin/sh
+#!/bin/sh
 #
-# "$Id: cups-config.in 5134 2006-02-19 15:16:08Z mike $"
-# 
-#   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.2"
+APIVERSION="2.3"
+BUILD="@CUPS_BUILD@"
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 includedir=@includedir@
 libdir=@libdir@
+datarootdir=@datadir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
 cups_datadir=@CUPS_DATADIR@
@@ -38,23 +26,33 @@ 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@"
 
-if test $includedir != /usr/include; then
-    CFLAGS="$CFLAGS -I$includedir"
-fi
+# Check for local invocation...
+selfdir=`dirname $0`
 
-if test $libdir != /usr/lib -a $libdir != /usr/lib32; then
-    LDFLAGS="$LDFLAGS -L$libdir"
+if test -f "$selfdir/cups/cups.h"; then
+    CFLAGS="-I$selfdir"
+    LDFLAGS="-L$selfdir/cups $LDFLAGS"
+    libdir="$selfdir/cups"
+else
+    if test $includedir != /usr/include; then
+       CFLAGS="$CFLAGS -I$includedir"
+    fi
+
+    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"
@@ -73,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
            ;;
@@ -90,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 $libdir/libcupsimage.a $IMGLIBS $libdir/libcups.a $LIBS
-               fi
+               libs="$libdir/libcups.a $LIBS";
            fi
+           echo $libs
            ;;
        --serverbin)
            echo $cups_serverbin
@@ -118,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
@@ -133,7 +126,3 @@ while test $# -gt 0; do
 
     shift
 done
-
-#
-# End of "$Id: cups-config.in 5134 2006-02-19 15:16:08Z mike $".
-#