Skip to content

Commit

Permalink
Don't include both the GNU TLS/OpenSSL libraries and requires in the …
Browse files Browse the repository at this point in the history
…pkg-config file.
  • Loading branch information
michaelrsweet committed Oct 2, 2023
1 parent 6f58c5c commit 00396d1
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 4 deletions.
2 changes: 0 additions & 2 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -5156,7 +5156,6 @@ printf "%s\n" "#define HAVE_OPENSSL 1" >>confdefs.h

CPPFLAGS="$CPPFLAGS $($PKGCONFIG --cflags openssl)"
LIBS="$LIBS $($PKGCONFIG --libs openssl)"
PKGCONFIG_LIBS_PRIVATE="$($PKGCONFIG --libs openssl) $PKGCONFIG_LIBS_PRIVATE"
PKGCONFIG_REQUIRES_PRIVATE="openssl, $PKGCONFIG_REQUIRES"

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

CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags gnutls`"
LIBS="$LIBS `$PKGCONFIG --libs gnutls`"
PKGCONFIG_LIBS_PRIVATE="$($PKGCONFIG --libs gnutls) $PKGCONFIG_LIBS_PRIVATE"
PKGCONFIG_REQUIRES_PRIVATE="gnutls >= 3.0, $PKGCONFIG_REQUIRES_PRIVATE"

else $as_nop
Expand Down
2 changes: 0 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,6 @@ AS_IF([test $with_tls = yes -o $with_tls = libressl -o $with_tls = openssl], [
AC_DEFINE([HAVE_OPENSSL], [1], [Do we have the OpenSSL/LibreSSL library?])
CPPFLAGS="$CPPFLAGS $($PKGCONFIG --cflags openssl)"
LIBS="$LIBS $($PKGCONFIG --libs openssl)"
PKGCONFIG_LIBS_PRIVATE="$($PKGCONFIG --libs openssl) $PKGCONFIG_LIBS_PRIVATE"
PKGCONFIG_REQUIRES_PRIVATE="openssl, $PKGCONFIG_REQUIRES"
], [
AC_MSG_RESULT([no])
Expand All @@ -416,7 +415,6 @@ AS_IF([test $have_tls = 0], [
AC_DEFINE([HAVE_GNUTLS], [1], [Do we have the GNU TLS library?])
CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags gnutls`"
LIBS="$LIBS `$PKGCONFIG --libs gnutls`"
PKGCONFIG_LIBS_PRIVATE="$($PKGCONFIG --libs gnutls) $PKGCONFIG_LIBS_PRIVATE"
PKGCONFIG_REQUIRES_PRIVATE="gnutls >= 3.0, $PKGCONFIG_REQUIRES_PRIVATE"
], [
AC_MSG_RESULT([no])
Expand Down

0 comments on commit 00396d1

Please sign in to comment.