[PATCH] Use pkg-config to detect GnuTLS, for compatibility with gnutls >= 2.7.0

84 views
Skip to first unread message

Ingmar Vanhassel

unread,
May 31, 2009, 2:30:50 PM5/31/09
to Loudmouth Development group, Saleem Abdulrasool, Ingmar Vanhassel
---
configure.ac | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 465a502..f4ce5de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -172,10 +172,12 @@ AC_ARG_WITH(openssl-libs,
enable_ssl=no
if test "x$ac_ssl" = "xgnutls"; then
dnl Look for GnuTLS
- AM_PATH_LM_LIBGNUTLS($GNUTLS_REQUIRED, have_libgnutls=yes, have_libgnutls=no)
- if test "x$have_libgnutls" = "xyes"; then
- CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
- LIBS="$LIBS $LIBGNUTLS_LIBS"
+ PKG_CHECK_MODULES(GNUTLS, gnutls >= $GNUTLS_REQUIRED, have_gnutls=yes, have_gnutls=no)
+ if test "x$have_gnutls" = "xyes"; then
+ AC_SUBST(ASYNCNS_CFLAGS)
+ AC_SUBST(ASYNCNS_LIBS)
+ CFLAGS="$CFLAGS $GNUTLS_CFLAGS"
+ LIBS="$LIBS $GNUTLS_LIBS"
AC_DEFINE(HAVE_GNUTLS, 1, [whether to use GnuTSL support.])
enable_ssl=GnuTLS
else
--
1.6.3.1

Ingmar Vanhassel

unread,
Jun 30, 2009, 6:28:45 AM6/30/09
to Loudmouth Development group, Saleem Abdulrasool
Is there any reason not to commit this patch?

--
Exherbo KDE, X.org maintainer

Reply all
Reply to author
Forward
0 new messages