[gyrus] Sanitize the gnutls checking

[Claudio Saavedra <csaavedra src gnome org>]

commit 854bc3d368248bf08191dd4bcf6bfd058e77db4c
Author: Claudio Saavedra <csaavedra igalia com>
Date:   Sun Jan 24 00:59:56 2010 +0200

    Sanitize the gnutls checking
    
    Since it was completely broken, fix it.

 configure.in      |   14 +++++++-------
 src/Makefile.am   |    5 ++---
 tests/Makefile.am |    5 ++---
 3 files changed, 11 insertions(+), 13 deletions(-)
---
diff --git a/configure.in b/configure.in
index 62b0349..0bbf6d6 100644
--- a/configure.in
+++ b/configure.in
@@ -26,6 +26,7 @@ LIBGLADE_REQUIRED=2.0.0
 GNET_REQUIRED=2.0.0
 GCONF_REQUIRED=2.0.0
 GTK_PRINT_REQUIRED=2.10.0
+GNUTLS_REQUIRED=1.0.0
 
 PKG_CHECK_MODULES(GYRUS,
                   gtk+-2.0 >= $GTK_REQUIRED
@@ -39,13 +40,10 @@ AC_ARG_ENABLE(gnutls,
 			     [Build with gnutls support (default=no)]),,
 			     enable_gnutls=no)
 if test "x$enable_gnutls" = "xyes"; then
-  AM_PATH_LIBGNUTLS(1.0.0,[AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
-			      have_gnutls=true],
-			      AC_MSG_ERROR([*** GNUTLS was not found]))
+  PKG_CHECK_MODULES(GNUTLS, gnutls >= $GNUTLS_REQUIRED)
+  AC_DEFINE(HAVE_GNUTLS, [], [Defined if we have gnutls])
 fi
 
-AM_CONDITIONAL(HAVE_GNUTLS, test x$have_gnutls = xtrue)
-
 dnl --enable-tests=(yes|no)
 AC_ARG_ENABLE(tests,
               AC_HELP_STRING([--enable-tests],
@@ -53,11 +51,13 @@ AC_ARG_ENABLE(tests,
               enable_tests=no)
 AM_CONDITIONAL(GYRUS_ENABLE_TESTS, test "x$enable_tests" = "xyes")
 
+
+GYRUS_CFLAGS="$GYRUS_CFLAGS $GNUTLS_CFLAGS -Wall"
+GYRUS_LIBS="$GYRUS_LIBS $GNUTLS_LIBS"
+
 AC_SUBST(GYRUS_CFLAGS)
 AC_SUBST(GYRUS_LIBS)
 
-GYRUS_CFLAGS="$GYRUS_CFLAGS $LIBGNUTLS_CFLAGS -Wall"
-
 dnl Internacionalization macros
 GETTEXT_PACKAGE=gyrus
 AC_SUBST(GETTEXT_PACKAGE)
diff --git a/src/Makefile.am b/src/Makefile.am
index 0e238cd..3caac74 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,8 +12,7 @@ INCLUDES = \
 	-DGYRUS_GLADE_DIR=\""$(gladedir)"\" \
 	-DGYRUS_PIXMAPS_DIR=\""$(pixmapsdir)"\" \
 	-DGNOME_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-	@GYRUS_CFLAGS@ \
-	@LIBGNUTLS_CFLAGS@
+	$(GYRUS_CFLAGS)
 
 bin_PROGRAMS = gyrus
 
@@ -43,7 +42,7 @@ gyrus_SOURCES = \
 	gyrus-session.c gyrus-session.h
 
 
-gyrus_LDADD = @GYRUS_LIBS@ @LIBGNUTLS_LIBS@
+gyrus_LDADD = $(GYRUS_LIBS)
 
 gyrus-marshal.h: gyrus-marshal.list $(GLIB_GENMARSHAL)
 	$(GLIB_GENMARSHAL) $< --header --prefix=gyrus > $@
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 118210b..d1bbb64 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -6,8 +6,7 @@ EXTRA_DIST =	\
 INCLUDES = \
 	-DGYRUS_DATA_DIR=\""$(datadir)"\" \
 	-DGNOME_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-	@GYRUS_CFLAGS@ \
-	@LIBGNUTLS_CFLAGS@ \
+	$(GYRUS_CFLAGS) \
 	-I$(top_srcdir)/src/
 
 noinst_PROGRAMS = 	\
@@ -18,6 +17,6 @@ gyrus_talk_LDFLAGS = -export-dynamic
 gyrus_talk_SOURCES = \
 	gyrus-talk.c
 
-gyrus_talk_LDADD = @GYRUS_LIBS@ @LIBGNUTLS_LIBS@ \
+gyrus_talk_LDADD = $(GYRUS_LIBS) \
 	$(top_builddir)/src/gyrus-connection.o   \
 	$(top_builddir)/src/gyrus-marshal.o