--- gnutls-1.0.2/lib/libgnutls.m4.orig	2003-11-13 07:47:47.000000000 +0100
+++ gnutls-1.0.2/lib/libgnutls.m4	2003-12-18 22:05:39.092608264 +0100
@@ -9,7 +9,7 @@
 dnl AM_PATH_LIBGNUTLS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
 dnl Test for libgnutls, and define LIBGNUTLS_CFLAGS and LIBGNUTLS_LIBS
 dnl
-AC_DEFUN(AM_PATH_LIBGNUTLS,
+AC_DEFUN([AM_PATH_LIBGNUTLS],
 [dnl
 dnl Get the cflags and libraries from the libgnutls-config script
 dnl
--- gnutls-1.0.2/libextra/libgnutls-extra.m4.orig	2003-11-13 07:48:00.000000000 +0100
+++ gnutls-1.0.2/libextra/libgnutls-extra.m4	2003-12-18 22:05:51.162773320 +0100
@@ -9,7 +9,7 @@
 dnl AM_PATH_LIBGNUTLS_EXTRA([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
 dnl Test for libgnutls-extra, and define LIBGNUTLS_EXTRA_CFLAGS and LIBGNUTLS_EXTRA_LIBS
 dnl
-AC_DEFUN(AM_PATH_LIBGNUTLS_EXTRA,
+AC_DEFUN([AM_PATH_LIBGNUTLS_EXTRA],
 [dnl
 dnl Get the cflags and libraries from the libgnutls-extra-config script
 dnl
--- gnutls-1.0.2/libextra/Makefile.am.orig	2003-12-05 15:15:43.000000000 +0100
+++ gnutls-1.0.2/libextra/Makefile.am	2003-12-18 22:36:46.039789152 +0100
@@ -18,7 +18,12 @@
 
 
 if ENABLE_OPENSSL
-lib_LTLIBRARIES = libgnutls-extra.la libgnutls-openssl.la
+gnutls_openssl = libgnutls-openssl.la
+else
+gnutls_openssl =
+endif
+
+lib_LTLIBRARIES = libgnutls-extra.la $(gnutls_openssl)
 
 libgnutls_openssl_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
@@ -26,9 +31,6 @@
 
 libgnutls_openssl_la_LIBADD = \
 	../lib/libgnutls.la
-else
-lib_LTLIBRARIES = libgnutls-extra.la
-endif
 
 COBJECTS_EXTRA = ext_srp.c \
 	gnutls_srp.c auth_srp.c auth_srp_passwd.c auth_srp_sb64.c \