Index: configure.in
===================================================================
RCS file: /home/cvspublic/apr/configure.in,v
retrieving revision 1.464
diff -u -p -r1.464 configure.in
--- configure.in	17 Jul 2002 06:17:24 -0000	1.464
+++ configure.in	19 Jul 2002 11:44:36 -0000
@@ -456,7 +456,6 @@ AC_SEARCH_LIBS(gethostname, nsl)
 AC_CHECK_LIB(socket, socket)
 AC_SEARCH_LIBS(crypt, crypt ufc)
 AC_CHECK_LIB(truerand, main)
-AC_CHECK_LIB(iconv, iconv)
 AC_CHECK_LIB(m, modf)
 
 dnl #----------------------------- Checking for Threads
@@ -851,10 +850,6 @@ AC_CHECK_FUNCS(crypt_r, [ crypt_r="1" ],
 if test "$crypt_r" = "1"; then
   APR_CHECK_CRYPT_R_STYLE
 fi
-AC_CHECK_FUNCS(iconv, [ have_iconv="1" ], [ have_iconv="0" ])
-if test "$iconv" = "1"; then
-  APR_CHECK_ICONV_INBUF
-fi
 AC_CHECK_FUNCS(mmap, [ mmap="1" ], [ mmap="0" ])
 if test "$native_mmap_emul" = "1"; then
     mmap="1"
@@ -871,7 +866,6 @@ AC_SUBST(have_inet_network)
 AC_SUBST(have_sigaction)
 AC_SUBST(have_setrlimit)
 AC_SUBST(have_getrlimit)
-AC_SUBST(have_iconv)
 AC_SUBST(mmap)
 AC_SUBST(have_memmove)
 
@@ -892,7 +886,6 @@ APR_FLAG_HEADERS(
     errno.h		\
     fcntl.h		\
     grp.h		\
-    iconv.h		\
     io.h		\
     langinfo.h		\
     limits.h		\
Index: build/apr_common.m4
===================================================================
RCS file: /home/cvspublic/apr/build/apr_common.m4,v
retrieving revision 1.33
diff -u -p -r1.33 apr_common.m4
--- build/apr_common.m4	19 Jun 2002 20:06:58 -0000	1.33
+++ build/apr_common.m4	19 Jul 2002 11:44:36 -0000
@@ -534,37 +534,6 @@ if test "$ac_cv_crypt_r_style" = "struct
 fi
 ])
 
-dnl
-dnl APR_CHECK_ICONV_INBUF
-dnl
-dnl  Decide whether or not the inbuf parameter to iconv() is const.
-dnl
-dnl  We try to compile something without const.  If it fails to 
-dnl  compile, we assume that the system's iconv() has const.  
-dnl  Unfortunately, we won't realize when there was a compile
-dnl  warning, so we allow a variable -- apr_iconv_inbuf_const -- to
-dnl  be set in hints.m4 to specify whether or not iconv() has const
-dnl  on this parameter.
-dnl
-AC_DEFUN(APR_CHECK_ICONV_INBUF,[
-AC_MSG_CHECKING(for type of inbuf parameter to iconv)
-if test "x$apr_iconv_inbuf_const" = "x"; then
-    APR_TRY_COMPILE_NO_WARNING([
-    #include <stddef.h>
-    #include <iconv.h>
-    ],[
-    iconv(0,(char **)0,(size_t *)0,(char **)0,(size_t *)0);
-    ], apr_iconv_inbuf_const="0", apr_iconv_inbuf_const="1")
-fi
-if test "$apr_iconv_inbuf_const" = "1"; then
-    AC_DEFINE(APR_ICONV_INBUF_CONST, 1, [Define if the inbuf parm to iconv() is const char **])
-    msg="const char **"
-else
-    msg="char **"
-fi
-AC_MSG_RESULT([$msg])
-])dnl
-
 
 dnl the following is a newline, a space, a tab, and a backslash (the
 dnl backslash is used by the shell to skip newlines, but m4 sees it;
Index: include/apr.h.in
===================================================================
RCS file: /home/cvspublic/apr/include/apr.h.in,v
retrieving revision 1.112
diff -u -p -r1.112 apr.h.in
--- include/apr.h.in	17 Jul 2002 05:15:17 -0000	1.112
+++ include/apr.h.in	19 Jul 2002 11:44:36 -0000
@@ -99,7 +99,6 @@
 
 #define APR_HAVE_CORKABLE_TCP   @have_corkable_tcp@ 
 #define APR_HAVE_GETRLIMIT      @have_getrlimit@
-#define APR_HAVE_ICONV          @have_iconv@
 #define APR_HAVE_IN_ADDR        @have_in_addr@
 #define APR_HAVE_INET_ADDR      @have_inet_addr@
 #define APR_HAVE_INET_NETWORK   @have_inet_network@