[Csync2] csync2 without gnutls-openssl?

[Lars Ellenberg]

On Wed, Jul 28, 2010 at 02:48:44PM +0200, Lars Ellenberg wrote:
> On Wed, Jul 28, 2010 at 02:35:41PM +0200, Giampaolo Tomassoni wrote:
> > > That is probably due to gnutls having changed to pkg-config.
> > > Please rather patch configure.ac to use pkg-config than
> > > go back to m4.
> > 
> > Lars, AM_PATH_LIBGNUTLS was completely undefined, so the
> > pkg-config/gnutls-config isn't that much relevant with respect to the
> > autogen.sh failure.
> 
> Yes, it is undefined, because it should be (or used to be) in the dev
> package of libgnutls, but no longer is, because they apparently decided
> they had a better approach.
> It cannot possibly be their intention that any libgnutls user should
> have its own private copy of libgnutls.m4.

And it is not.

Apparently for pkg-config things, the autofoo way is:

- AM_PATH_LIBGNUTLS
+ PKG_CHECK_MODULES

please confirm.

diff --git a/configure.ac b/configure.ac
index a3ef7ee..30f758c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,7 +78,7 @@ AC_ARG_ENABLE([gnutls],
 if test "$enable_gnutls" != no
 then
 	# Check for gnuTLS.
-	AM_PATH_LIBGNUTLS(1.0.0, , [ AC_MSG_ERROR([[gnutls not found; install gnutls, gnutls-openssl and libtasn1 packages for your system or run configure with --disable-gnutls]]) ])
+	PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 2.0.4,,AC_MSG_ERROR([[gnutls not found; install gnutls and libtasn1 packages for your system or run configure with --disable-gnutls]]))
 
 	## This is a bloody hack for fedora core
 	CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"

-- 
: Lars Ellenberg
: LINBIT | Your Way to High Availability
: DRBD/HA support and consulting http://www.linbit.com

DRBD® and LINBIT® are registered trademarks of LINBIT, Austria.