# HG changeset patch
# User mikael
# Date 1114798221 0
# Node ID 417880d6eea234691fa052f8aa9afb5ec211685a
# Parent  204225d03bb26fcb6127d8ab38ae4605982310bc
[/trunk] Changeset 157 by mikael

* Can compile with libgnutls now.  However, it does not seem to work :-(


diff -r 204225d03bb2 -r 417880d6eea2 mcabber/configure.ac
--- a/mcabber/configure.ac	Fri Apr 29 14:50:01 2005 +0000
+++ b/mcabber/configure.ac	Fri Apr 29 18:10:21 2005 +0000
@@ -5,7 +5,7 @@
 AC_INIT([mcabber],[0.6.0-dev],[bmikael@lists.lilotux.net])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([src])
-AC_CONFIG_HEADERS(config.h)
+AM_CONFIG_HEADER(config.h)
 
 AC_PROG_RANLIB
 
@@ -83,7 +83,7 @@
 
 	AM_PATH_LIBGNUTLS_EXTRA(0.0.1, [
 	    CXXFLAGS="$CXXFLAGS $LIBGNUTLS_CFLAGS"
-	    LIBS="$LIBS $LIBGNUTLS_LIBS -lgnutls-extra"
+	    LIBS="$LIBS $LIBGNUTLS_LIBS -lgnutls-extra -lgnutls-openssl"
 	    AC_DEFINE([HAVE_GNUTLS], [], [GNU TLS])
 	])
     fi
diff -r 204225d03bb2 -r 417880d6eea2 mcabber/src/Makefile.am
--- a/mcabber/src/Makefile.am	Fri Apr 29 14:50:01 2005 +0000
+++ b/mcabber/src/Makefile.am	Fri Apr 29 18:10:21 2005 +0000
@@ -6,7 +6,7 @@
 		  hooks.c hooks.h histolog.c histolog.h \
 		  utils.c utils.h list.h harddefines.h
 
-LDADD = -lglib-2.0 -lncurses -lpanel -lssl \
+LDADD = -lglib-2.0 -lncurses -lpanel \
 	../libjabber/liblibjabber.a ../connwrap/libconnwrap.a
 
 INCLUDES = $(GLIB_CFLAGS)