From 39673f05bf14512879e39ae58e6fbdd521bfd74a Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Tue, 1 Jun 2004 10:22:51 +0000
Subject: *** empty log message ***

---
 configure.in | 10 +++++-----
 libtasn1.m4  |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure.in b/configure.in
index 0992ca9c45..e559ecb217 100644
--- a/configure.in
+++ b/configure.in
@@ -175,7 +175,7 @@ AC_CHECK_HEADERS(errno.h sys/time.h time.h)
 AC_CHECK_HEADERS(math.h limits.h float.h stdarg.h)
 dnl opencdk
 AC_CHECK_HEADERS(netdb.h)
-AC_CHECK_FUNCS(isascii memmove strnstr mmap gmtime_r inet_ntop,,)
+AC_CHECK_FUNCS(vasprintf isascii memmove strnstr mmap gmtime_r inet_ntop,,)
 AC_FUNC_ALLOCA
 
 
@@ -367,17 +367,17 @@ AM_CONDITIONAL(ENABLE_OPENSSL, test "$ac_enable_openssl" = "yes")
 
 AC_ARG_WITH(included-libtasn1,
 	[  --with-included-libtasn1 Use the included libtasn1],
-minitasn1_enabled=$withval, 
+minitasn1_enabled=yes, 
 minitasn1_enabled=no)
 
-dnl We now need libtasn1 0.2.10
-dnl
+if test x$minitasn1_enabled = xno; then
 AM_PATH_LIBTASN1($GNUTLS_LIBTASN1_VERSION,,
  minitasn1_enabled=yes
  AC_MSG_WARN([[
 *** 
-*** LibtASN1 0.2.x was not found. Will use the included one.
+*** LibtASN1 ${GNUTLS_LIBTASN1_VERSION} was not found. Will use the included one.
 ]]))
+fi
 
 
 SAVED_LIBS=$LIBS
diff --git a/libtasn1.m4 b/libtasn1.m4
index 7e3e8a76e3..ea2e10f56d 100644
--- a/libtasn1.m4
+++ b/libtasn1.m4
@@ -9,7 +9,7 @@ dnl $id$
 dnl AM_PATH_LIBTASN1([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
 dnl Test for libtasn1, and define LIBTASN1_CFLAGS and LIBTASN1_LIBS
 dnl
-AC_DEFUN(AM_PATH_LIBTASN1,
+AC_DEFUN([AM_PATH_LIBTASN1],
 [dnl
 dnl Get the cflags and libraries from the libtasn1-config script
 dnl
-- 
cgit v1.2.1