diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2008-03-21 23:46:46 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2008-03-21 23:46:46 +0000 |
| commit | 50fe720154d2af59cdeeaecf05cc868530e16248 (patch) | |
| tree | 509bbfd968bcb7bdf5db241e5eb66a2fb1882633 /cups-config.in | |
| parent | db0bd74adb0b363f586ceb3314c7ebbbe4596e3d (diff) | |
| download | cups-50fe720154d2af59cdeeaecf05cc868530e16248.tar.gz | |
<rdar://problem/5792631> dependency cycle in cups-144 / PrintingCore-250 / ApplicationServices
Merge build system changes to use shared support libraries.
Merge build system changes to separate installation of data, program, header,
and library files.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@668 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cups-config.in')
| -rwxr-xr-x | cups-config.in | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/cups-config.in b/cups-config.in index 66bf14997..7f53c60ba 100755 --- a/cups-config.in +++ b/cups-config.in @@ -15,7 +15,7 @@ # VERSION="@CUPS_VERSION@" -APIVERSION="1.3" +APIVERSION="1.4" prefix=@prefix@ exec_prefix=@exec_prefix@ @@ -66,7 +66,7 @@ usage () echo " cups-config --datadir" echo " cups-config --help" echo " cups-config --ldflags" - echo " cups-config [--image] [--static] --libs" + echo " cups-config [--driver] [--image] [--static] --libs" echo " cups-config --serverbin" echo " cups-config --serverroot" echo " cups-config --version" @@ -81,6 +81,7 @@ fi # Parse command line options static=no image=no +driver=no while test $# -gt 0; do case $1 in @@ -93,6 +94,9 @@ while test $# -gt 0; do --datadir) echo $cups_datadir ;; + --driver) + driver=yes + ;; --help) usage 0 ;; @@ -104,18 +108,23 @@ while test $# -gt 0; do ;; --libs) if test $static = no; then - if test $image = no; then - echo -lcups $LIBS - else - echo -lcupsimage -lcups $IMGLIBS $LIBS - fi + libs="-lcups $LIBS"; + if test $image = yes; then + libs="-lcupsimage $libs" + fi + if test $driver = yes; then + libs="-lcupsdriver $libs" + fi else - if test $image = no; then - echo $libdir/libcups.a $LIBS - else - echo $imagelibdir/libcupsimage.a $libdir/libcups.a $IMGLIBS $LIBS + libs="$libdir/libcups.a $LIBS"; + if test $image = yes; then + libs="$libdir/libcupsimage.a $IMGLIBS $libs" + fi + if test $driver = yes; then + libs="$libdir/libcupsdriver.a $libs" fi fi + echo $libs ;; --serverbin) echo $cups_serverbin |