--- a/ChangeLog	Tue Jul 29 15:54:03 2003 +0000
+++ b/ChangeLog	Mon Aug 04 20:14:48 2003 +0000
@@ -1,3 +1,10 @@
+2003-08-04  Mikael Hallendal  <micke@imendio.com>
+
+	* configure.in:
+	- Submitted patch for Loudmouth from Mikhail Zabaluev to
+	  make configure.in use the aclocal-stuff from gnutls instead of
+	  selfmade hack. Fixes LM-6. 
+
 2003-07-29  Mikael Hallendal  <micke@imendio.com>
 
 	* loudmouth/lm-message.[ch]:

--- a/configure.in	Tue Jul 29 15:54:03 2003 +0000
+++ b/configure.in	Mon Aug 04 20:14:48 2003 +0000
@@ -94,26 +94,18 @@
 dnl +--------------------------------------------------------+
 dnl | Checking for SSL (through GnuTLS) support              |
 dnl +--------------------------------------------------------+
-AC_MSG_CHECKING([for GnuTLS support])
-
 AC_ARG_WITH(ssl, [  --without-ssl           disable ssl support],
 	    ac_ssl=$withval,
 	    ac_ssl=yes
 	    )
 
 if test x$ac_ssl != xno; then
-  GNUTLS_CFLAGS=`libgnutls-config --cflags`
-  if test "x$GNUTLS_CFLAGS" = "x"; then
-    AC_MSG_RESULT(no)
-  else
-    AC_MSG_RESULT(yes)
-    GNUTLS_LDFLAGS=`libgnutls-config --libs`
-    CFLAGS="$CFLAGS $GNUTLS_CFLAGS"
-    LDFLAGS="$LDFLAGS $GNUTLS_LDFLAGS"
+  AM_PATH_LIBGNUTLS($GNUTLS_REQUIRED, have_libgnutls=yes, have_libgnutls=no)
+  if test $have_libgnutls = yes; then
+    CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
+    LIBS="$LIBS $LIBGNUTLS_LIBS"
     AC_DEFINE(HAVE_GNUTLS, 1, [whether to use GnuTSL support.])
   fi
-else
-  AC_MSG_RESULT(no)
 fi
 
 dnl +-------------+