diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2019-05-15 18:35:58 -0400 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2019-05-15 18:35:58 -0400 |
| commit | 3e391a8e76dcaf3859de3a90a398d9e4c9e6a6bb (patch) | |
| tree | 476ab109a15e2a949e455ff18204ea184d04b2b8 /cups-config.in | |
| parent | cb480624d3782dd6428b38bafce64791b4ac3b98 (diff) | |
| download | cups-3e391a8e76dcaf3859de3a90a398d9e4c9e6a6bb.tar.gz | |
Update build system and cups-config script to not add extra libraries to the
"--libs" output (Issue #5261)
Diffstat (limited to 'cups-config.in')
| -rwxr-xr-x | cups-config.in | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cups-config.in b/cups-config.in index 64c893c0d..9dd094d16 100755 --- a/cups-config.in +++ b/cups-config.in @@ -26,10 +26,10 @@ cups_serverbin=@CUPS_SERVERBIN@ cups_serverroot=@CUPS_SERVERROOT@ INSTALLSTATIC=@INSTALLSTATIC@ -# flags for C++ compiler: +# flags for compiler and linker... CFLAGS="" LDFLAGS="@EXPORT_LDFLAGS@" -LIBS="@LIBGSSAPI@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@" +LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@" # Check for local invocation... selfdir=`dirname $0` @@ -71,7 +71,6 @@ fi # Parse command line options static=no -image=no while test $# -gt 0; do case $1 in @@ -98,7 +97,7 @@ while test $# -gt 0; do ;; --libs) if test $static = no; then - libs="@EXTLINKCUPS@ $LIBS"; + libs="@EXTLINKCUPS@"; else libs="$libdir/libcups.a $LIBS"; fi @@ -112,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 |