Skip to content

Commit 00396d1

Browse files
committed
Don't include both the GNU TLS/OpenSSL libraries and requires in the pkg-config file.
1 parent 6f58c5c commit 00396d1

2 files changed

Lines changed: 0 additions & 4 deletions

File tree

configure

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5156,7 +5156,6 @@ printf "%s\n" "#define HAVE_OPENSSL 1" >>confdefs.h
51565156

51575157
CPPFLAGS="$CPPFLAGS $($PKGCONFIG --cflags openssl)"
51585158
LIBS="$LIBS $($PKGCONFIG --libs openssl)"
5159-
PKGCONFIG_LIBS_PRIVATE="$($PKGCONFIG --libs openssl) $PKGCONFIG_LIBS_PRIVATE"
51605159
PKGCONFIG_REQUIRES_PRIVATE="openssl, $PKGCONFIG_REQUIRES"
51615160

51625161
else $as_nop
@@ -5192,7 +5191,6 @@ printf "%s\n" "#define HAVE_GNUTLS 1" >>confdefs.h
51925191

51935192
CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags gnutls`"
51945193
LIBS="$LIBS `$PKGCONFIG --libs gnutls`"
5195-
PKGCONFIG_LIBS_PRIVATE="$($PKGCONFIG --libs gnutls) $PKGCONFIG_LIBS_PRIVATE"
51965194
PKGCONFIG_REQUIRES_PRIVATE="gnutls >= 3.0, $PKGCONFIG_REQUIRES_PRIVATE"
51975195

51985196
else $as_nop

configure.ac

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,6 @@ AS_IF([test $with_tls = yes -o $with_tls = libressl -o $with_tls = openssl], [
398398
AC_DEFINE([HAVE_OPENSSL], [1], [Do we have the OpenSSL/LibreSSL library?])
399399
CPPFLAGS="$CPPFLAGS $($PKGCONFIG --cflags openssl)"
400400
LIBS="$LIBS $($PKGCONFIG --libs openssl)"
401-
PKGCONFIG_LIBS_PRIVATE="$($PKGCONFIG --libs openssl) $PKGCONFIG_LIBS_PRIVATE"
402401
PKGCONFIG_REQUIRES_PRIVATE="openssl, $PKGCONFIG_REQUIRES"
403402
], [
404403
AC_MSG_RESULT([no])
@@ -416,7 +415,6 @@ AS_IF([test $have_tls = 0], [
416415
AC_DEFINE([HAVE_GNUTLS], [1], [Do we have the GNU TLS library?])
417416
CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags gnutls`"
418417
LIBS="$LIBS `$PKGCONFIG --libs gnutls`"
419-
PKGCONFIG_LIBS_PRIVATE="$($PKGCONFIG --libs gnutls) $PKGCONFIG_LIBS_PRIVATE"
420418
PKGCONFIG_REQUIRES_PRIVATE="gnutls >= 3.0, $PKGCONFIG_REQUIRES_PRIVATE"
421419
], [
422420
AC_MSG_RESULT([no])

0 commit comments

Comments
 (0)