diff options
| author | jlovell <jlovell@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2006-05-22 21:33:05 +0000 |
|---|---|---|
| committer | jlovell <jlovell@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2006-05-22 21:33:05 +0000 |
| commit | f301802fc285c5ec9effadfbf13de653822dddd8 (patch) | |
| tree | 6d627f9da77fa964c6797d263dc9a7bc58249f02 /cups-config.in | |
| parent | a9252913e79774ff099dcc33283c1fb1ae3cb61f (diff) | |
| download | cups-f301802fc285c5ec9effadfbf13de653822dddd8.tar.gz | |
Load cups into easysw/current.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@158 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cups-config.in')
| -rwxr-xr-x | cups-config.in | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/cups-config.in b/cups-config.in index 2f5ea715c..0c88b72b9 100755 --- 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 $". # |