Import CUPS 1.4svn-r7356.

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

diff --git a/cups-config.in b/cups-config.in
index 33fe5c41d2656cbc26a9ae7215e4053b2ea5e58d..66bf149979876cd9552f57efd2b2d59e92cf1b21 100755 (executable)
--- a/cups-config.in
+++ b/cups-config.in
@@ -1,30 +1,21 @@
 #! /bin/sh
 #
-# "$Id$"
+# "$Id: cups-config.in 6649 2007-07-11 21:46:42Z mike $"
 # 
 #   CUPS configuration utility.
 #
+#   Copyright 2007 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.3"
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
@@ -32,6 +23,7 @@ bindir=@bindir@
 includedir=@includedir@
 libdir=@libdir@
 imagelibdir=@libdir@
+datarootdir=@datadir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
 cups_datadir=@CUPS_DATADIR@
@@ -42,8 +34,8 @@ 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@ @EXPORT_LIBZ@ @LIBS@"
+IMGLIBS="@EXPORT_LIBTIFF@ @EXPORT_LIBJPEG@ @EXPORT_LIBPNG@"
 
 # Check for local invocation...
 selfdir=`dirname $0`
@@ -53,7 +45,7 @@ if test -f "$selfdir/cups/cups.h"; then
     LDFLAGS="-L$selfdir/cups -L$selfdir/filter $LDFLAGS"
     libdir="$selfdir/cups"
     imagelibdir="$selfdir/filter"
-    if test ! -e "$selfdir/cups/raster.h"; then
+    if test ! -f "$selfdir/cups/raster.h"; then
         ln -s ../filter/raster.h "$selfdir/cups"
     fi
 else
@@ -115,13 +107,13 @@ while test $# -gt 0; do
                if test $image = no; then
                    echo -lcups $LIBS
                else
-                   echo -lcupsimage $IMGLIBS -lcups $LIBS
+                   echo -lcupsimage -lcups $IMGLIBS $LIBS
                fi
            else
                if test $image = no; then
                    echo $libdir/libcups.a $LIBS
                else
-                   echo $imagelibdir/libcupsimage.a $IMGLIBS $libdir/libcups.a $LIBS
+                   echo $imagelibdir/libcupsimage.a $libdir/libcups.a $IMGLIBS $LIBS
                fi
            fi
            ;;
@@ -150,5 +142,5 @@ while test $# -gt 0; do
 done
 
 #
-# End of "$Id$".
+# End of "$Id: cups-config.in 6649 2007-07-11 21:46:42Z mike $".
 #