summaryrefslogtreecommitdiff
path: root/macros/neon.m4
diff options
context:
space:
mode:
Diffstat (limited to 'macros/neon.m4')
-rw-r--r--macros/neon.m413
1 files changed, 9 insertions, 4 deletions
diff --git a/macros/neon.m4 b/macros/neon.m4
index 325d8a2..4a11916 100644
--- a/macros/neon.m4
+++ b/macros/neon.m4
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2006 Joe Orton <joe@manyfish.co.uk> -*- autoconf -*-
+# Copyright (C) 1998-2007 Joe Orton <joe@manyfish.co.uk> -*- autoconf -*-
# Copyright (C) 2004 Aleix Conchillo Flaque <aleix@member.fsf.org>
#
# This file is free software; you may copy and/or distribute it with
@@ -576,7 +576,7 @@ AC_REQUIRE([AC_FUNC_STRERROR_R])
AC_CHECK_HEADERS([sys/time.h limits.h sys/select.h arpa/inet.h libintl.h \
signal.h sys/socket.h netinet/in.h netinet/tcp.h netdb.h sys/poll.h \
- sys/limits.h fcntl.h],,,
+ sys/limits.h fcntl.h iconv.h],,,
[AC_INCLUDES_DEFAULT
/* netinet/tcp.h requires netinet/in.h on some platforms. */
#ifdef HAVE_NETINET_IN_H
@@ -944,8 +944,13 @@ gnutls)
NEON_LIBS="$NEON_LIBS `$GNUTLS_CONFIG --libs`"
AC_DEFINE([HAVE_GNUTLS], 1, [Define if GnuTLS support is enabled])
- # Check for functions in later releases.
- NE_CHECK_FUNCS(gnutls_session_get_data2)
+ # Check for functions in later releases
+ NE_CHECK_FUNCS(gnutls_session_get_data2 gnutls_x509_dn_get_rdn_ava)
+
+ # Check for iconv support if using the new RDN access functions:
+ if test ${ac_cv_func_gnutls_x509_dn_get_rdn_ava}X${ac_cv_header_iconv_h} = yesXyes; then
+ AC_CHECK_FUNCS(iconv)
+ fi
;;
*) # Default to off; only create crypto-enabled binaries if requested.
NE_DISABLE_SUPPORT(SSL, [SSL support is not enabled])