build: Divide mit-krb5-gssapi link flags between LDFLAGS and LIBS
authorSimon McVittie <smcv@collabora.com>
Tue, 22 Nov 2022 20:43:41 +0000 (20:43 +0000)
committerSamuel Henrique <samueloph@debian.org>
Sun, 1 Oct 2023 14:01:42 +0000 (15:01 +0100)
From the comments nearby about not having --libs-only-L, it looks as
though the intention was to apply a split like this to all dependency
libraries where possible, and the only reason it was not done for
Kerberos is that krb5-config doesn't have that feature and pkg-config
was originally not supported here. For example, zlib, libssh and librtmp
all have their flags from pkg-config split in this way.

Now that pkg-config is supported here, we can do the intended split.

Signed-off-by: Simon McVittie <smcv@collabora.com>
Gbp-Pq: Name build-Divide-mit-krb5-gssapi-link-flags-between-LDFLAGS-a.patch

configure.ac

index 15fbda12adc85ce15ad285331d1947eb15e3df9d..aa59bc8a2ad90c1ba2d41a4250d82d1aaf3cb9f5 100644 (file)
@@ -1978,7 +1978,8 @@ if test x"$want_gss" = xyes; then
            gss_libs=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --libs gssapi`
            LIBS="$gss_libs $LIBS"
         elif test "$PKGCONFIG" != "no" ; then
-           gss_libs=`$PKGCONFIG --libs mit-krb5-gssapi`
+           LDFLAGS="$LDFLAGS `$PKGCONFIG --libs-only-L mit-krb5-gssapi`"
+           gss_libs=`$PKGCONFIG --libs-only-l mit-krb5-gssapi`
            LIBS="$gss_libs $LIBS"
         elif test -f "$KRB5CONFIG"; then
            dnl krb5-config doesn't have --libs-only-L or similar, put everything