Load cups into easysw/current.

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

diff --git a/cups-config.in b/cups-config.in
index 2f5ea715c68f101b3f632dd9adfd3bc1c01d3975..0c88b72b929cfddeba62bd99b09637d76848f689 100755 (executable)
--- a/cups-config.in
+++ b/cups-config.in
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# "$Id: cups-config.in 5134 2006-02-19 15:16:08Z mike $"
+# "$Id: cups-config.in 5503 2006-05-10 18:55:39Z mike $"
 # 
 #   CUPS configuration utility.
 #
@@ -24,13 +24,14 @@
 #
 
 VERSION="@CUPS_VERSION@"
-APIVERSION="1.2"
+APIVERSION="1.3"
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 includedir=@includedir@
 libdir=@libdir@
+imagelibdir=@libdir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
 cups_datadir=@CUPS_DATADIR@
@@ -44,14 +45,28 @@ LDFLAGS="@EXPORT_LDFLAGS@"
 LIBS="@EXPORT_SSLLIBS@ @LIBS@"
 IMGLIBS="@EXPORT_LIBTIFF@ @EXPORT_LIBJPEG@ @EXPORT_LIBPNG@ @EXPORT_LIBZ@"
 
-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"
+    if test ! -e "$selfdir/cups/raster.h"; then
+        ln -s ../filter/raster.h "$selfdir/cups"
+    fi
+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"
@@ -106,7 +121,7 @@ while test $# -gt 0; do
                if test $image = no; then
                    echo $libdir/libcups.a $LIBS
                else
-                   echo $libdir/libcupsimage.a $IMGLIBS $libdir/libcups.a $LIBS
+                   echo $imagelibdir/libcupsimage.a $IMGLIBS $libdir/libcups.a $LIBS
                fi
            fi
            ;;
@@ -135,5 +150,5 @@ while test $# -gt 0; do
 done
 
 #
-# End of "$Id: cups-config.in 5134 2006-02-19 15:16:08Z mike $".
+# End of "$Id: cups-config.in 5503 2006-05-10 18:55:39Z mike $".
 #