jerenkrantz 2002/07/20 01:06:33
Modified: build apu-iconv.m4
Log:
Correct detection of iconv library.
- Check for the presence of iconv() first.
- If no iconv() found, check for -liconv.
- If -liconv found, set the appropriate macros so that apu-config can report
it.
- Add checks for langinfo.h, nl_langinfo, and CODESET, so that apr-util can
try to get out of the business of reporting the local charset when asked.
Suggested by: Ben Collins-Sussman, Branko (whose last name I can't read),
Blair Zajac
Revision Changes Path
1.4 +17 -4 apr-util/build/apu-iconv.m4
Index: apu-iconv.m4
===================================================================
RCS file: /home/cvs/apr-util/build/apu-iconv.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- apu-iconv.m4 19 Jul 2002 17:08:40 -0000 1.3
+++ apu-iconv.m4 20 Jul 2002 08:06:33 -0000 1.4
@@ -12,14 +12,27 @@
dnl apr-iconv sources or an installed apr-iconv ...
dnl
-AC_CHECK_LIB(iconv, iconv)
-AC_CHECK_FUNCS(iconv, [ have_iconv="1" ], [ have_iconv="0" ])
+AC_CHECK_FUNCS(iconv, [
+ have_iconv="1"
+], [
+ AC_CHECK_LIB(iconv, iconv, [
+ APR_ADDTO(APRUTIL_LIBS,[-liconv])
+ APR_ADDTO(APRUTIL_EXPORT_LIBS,[-liconv])
+ have_iconv="1"
+ ], [
+ have_iconv="0"
+ ])
+])
+
if test "$have_iconv" = "1"; then
APU_CHECK_ICONV_INBUF
fi
-AC_SUBST(have_iconv)
-APR_FLAG_HEADERS(iconv.h)
+APR_FLAG_HEADERS(iconv.h langinfo.h)
+APR_FLAG_FUNCS(nl_langinfo)
+APR_CHECK_DEFINE(CODESET, langinfo.h, [CODESET defined in langinfo.h])
+
+AC_SUBST(have_iconv)
])dnl
