diff options
| -rw-r--r-- | config.h.win32 | 5 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | xmlstub.h | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/config.h.win32 b/config.h.win32 index 54631924b1..08b4cd7085 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -1,4 +1,4 @@ -/* $Id: config.h.win32,v 1.32 2001/08/21 06:39:14 guy Exp $ */ +/* $Id: config.h.win32,v 1.33 2001/11/02 10:01:00 guy Exp $ */ /* config.h.win32 Generated manually. :-) */ /* config.h. Generated automatically by configure. */ /* config.h.in. Generated automatically from configure.in by autoheader. */ @@ -55,6 +55,9 @@ /* Define if you have the <fcntl.h> header file. */ #define HAVE_FCNTL_H 1 +/* Define if you have the <iconv.h> header file. */ +/* #undef HAVE_ICONV_H */ + /* Define if you have the <netdb.h> header file. */ /* #undef HAVE_NETDB_H */ diff --git a/configure.in b/configure.in index d85934d7ba..dd99440485 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -# $Id: configure.in,v 1.139 2001/10/12 17:17:04 gerald Exp $ +# $Id: configure.in,v 1.140 2001/11/02 10:01:00 guy Exp $ dnl dnl Process this file with autoconf 2.13 or later to produce a dnl configure script; 2.12 doesn't generate a "configure" script that @@ -443,6 +443,7 @@ AC_CHECK_HEADERS(sys/wait.h) AC_CHECK_HEADERS(netinet/in.h) AC_CHECK_HEADERS(stddef.h) AC_CHECK_HEADERS(arpa/inet.h) +AC_CHECK_HEADERS(iconv.h) dnl SSL Check SSL_LIBS='' @@ -97,14 +97,12 @@ extern void xmlCheckVersion(int version); /* * Whether iconv support is available */ -#ifndef WIN32 -#if 1 +#ifdef HAVE_ICONV_H #define LIBXML_ICONV_ENABLED #include <iconv.h> #else #define LIBXML_ICONV_DISABLED #endif -#endif /* * Whether Debugging module is configured in |