[PATCH] Use pkg-config to check for GnuTLS

Pierre Chifflier <[email protected]> Wed, 19 Aug 2009 21:20:01 +0200
Newsgroups gmane.comp.security.ids.prelude.devel
Message-ID <[email protected]>
Recent versions of GnuTLS (>= 2.8.x) do not provide libgnutls-config script
anymore.
Use pkg-config first to check for GnuTLS, and fall back to old method
if not found to keep compatibility with previous versions.

Signed-off-by: Pierre Chifflier <[email protected]>
---
 configure.in |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/configure.in b/configure.in
index 74cffa0..8b61354 100644
--- a/configure.in
+++ b/configure.in
@@ -76,10 +76,11 @@ fi
 dnl **************************************************
 dnl * Check for GnuTLS.                              *
 dnl **************************************************
-AM_PATH_LIBGNUTLS(1.0.17, gnutls=yes, gnutls=no)
-if test x$gnutls != xyes; then
-        AC_MSG_ERROR(libgnutls is required in order to build prelude-manager.)
-fi
+GNUTLS_MIN_VERSION=1.0.17
+
+PKG_CHECK_EXISTS(gnutls,
+                 [PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= $GNUTLS_MIN_VERSION])],
+                 [AM_PATH_LIBGNUTLS($GNUTLS_MIN_VERSION, [], [AC_MSG_ERROR(libgnutls is required in order to build prelude-manager.)])])
 
 old_LIBS=$LIBS
 old_CPPFLAGS=$CPPFLAGS
-- 
1.6.3.3

_______________________________________________
Prelude-devel site list
[email protected]
http://lists.prelude-ids.org/mailman/listinfo/prelude-devel