? build/apu-iconv.m4
Index: configure.in
===================================================================
RCS file: /home/cvspublic/apr-util/configure.in,v
retrieving revision 1.51
diff -u -p -r1.51 configure.in
--- configure.in	17 Jul 2002 06:22:08 -0000	1.51
+++ configure.in	19 Jul 2002 11:44:51 -0000
@@ -9,6 +9,7 @@ AC_CONFIG_HEADER(include/private/apu_con
 AC_CONFIG_AUX_DIR(../apr/build)
 
 sinclude(build/apu-conf.m4)
+sinclude(build/apu-iconv.m4)
 sinclude(../apr/build/apr_common.m4)
 sinclude(../apr/build/find_apr.m4)
 
@@ -52,11 +53,13 @@ dnl
 dnl 1. Find the APR includes directory and (possibly) the source (base) dir.
 dnl 2. Determine what DBM backend type to use.
 dnl 3. Find Expat
+dnl 4. Find an iconv library
 dnl
 APU_FIND_APR
 APU_FIND_LDAP
 APU_CHECK_DBM
 APU_FIND_EXPAT
+APU_FIND_ICONV
 
 so_ext=$APR_SO_EXT
 lib_target=$APR_LIB_TARGET
Index: include/apu.h.in
===================================================================
RCS file: /home/cvspublic/apr-util/include/apu.h.in,v
retrieving revision 1.13
diff -u -p -r1.13 apu.h.in
--- include/apu.h.in	19 Jul 2002 08:32:56 -0000	1.13
+++ include/apu.h.in	19 Jul 2002 11:44:52 -0000
@@ -55,10 +55,6 @@
 /*
  * apu.h is generated from apu.h.in by configure -- do not edit apu.h
  */
-/* 
- * Note: This is a Windows specific version of apu.h. It is renamed to
- * apu.h at the start of a Windows build.
- */
 /* @file apu.h
  * @brief APR-Utility main file
  */
@@ -124,7 +120,8 @@
 #endif
 
 #define APU_HAVE_APR_ICONV     0
-#define APR_HAS_XLATE          APR_HAVE_ICONV
+#define APU_HAVE_ICONV         @have_iconv@
+#define APR_HAS_XLATE          (APU_HAVE_APR_ICONV || APU_HAVE_ICONV)
 
 #endif /* APU_H */
 /** @} */