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 /config-scripts | |
| 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 'config-scripts')
| -rw-r--r-- | config-scripts/cups-sharedlibs.m4 | 36 |
1 files changed, 3 insertions, 33 deletions
diff --git a/config-scripts/cups-sharedlibs.m4 b/config-scripts/cups-sharedlibs.m4 index 914e62135..6070f211e 100644 --- a/config-scripts/cups-sharedlibs.m4 +++ b/config-scripts/cups-sharedlibs.m4 @@ -78,45 +78,20 @@ AC_SUBST(LIBCUPSIMAGE) AC_SUBST(LIBCUPSSTATIC) if test x$enable_shared = xno; then - LINKCUPS="../cups/lib$cupsbase.a" - EXTLINKCUPS="-lcups" - - if test "x$cupsimagebase" != x; then - LINKCUPSIMAGE="../cups/lib$cupsimagebase.a" - EXTLINKCUPSIMAGE="-l$cupsimagebase" - else - LINKCUPSIMAGE="" - EXTLINKCUPSIMAGE="" - fi + LINKCUPS="../cups/lib$cupsbase.a \$(LIBS)" + EXTLINKCUPS="-lcups \$LIBS" else - LINKCUPS="-l${cupsbase}" + LINKCUPS="-L../cups -l${cupsbase}" EXTLINKCUPS="-lcups" - - if test "x$cupsimagebase" != x; then - LINKCUPSIMAGE="-l$cupsimagebase" - EXTLINKCUPSIMAGE="-l$cupsimagebase" - else - LINKCUPSIMAGE="" - EXTLINKCUPSIMAGE="" - fi fi AC_SUBST(EXTLINKCUPS) -AC_SUBST(EXTLINKCUPSIMAGE) AC_SUBST(LINKCUPS) -AC_SUBST(LINKCUPSIMAGE) dnl Update libraries for DSOs... EXPORT_LDFLAGS="" if test "$DSO" != ":"; then - # When using DSOs the image libraries are linked to libcupsimage.so - # rather than to the executables. This makes things smaller if you - # are using any static libraries, and it also allows us to distribute - # a single DSO rather than a bunch... - DSOLIBS="\$(LIBZ)" - IMGLIBS="" - # Tell the run-time linkers where to find a DSO. Some platforms # need this option, even when the library is installed in a # standard location... @@ -146,11 +121,6 @@ if test "$DSO" != ":"; then fi ;; esac -else - DSOLIBS="" - IMGLIBS="\$(LIBZ)" fi -AC_SUBST(DSOLIBS) -AC_SUBST(IMGLIBS) AC_SUBST(EXPORT_LDFLAGS) |