diff options
| -rw-r--r-- | m4/ChangeLog | 4 | ||||
| -rw-r--r-- | m4/iconv.m4 | 11 |
2 files changed, 14 insertions, 1 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog index e75ebd1..3004f2a 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,7 @@ +2001-05-23 Bruno Haible <haible@clisp.cons.org> + + * iconv.m4 (AM_ICONV): Accept --with-libiconv-prefix option. + 2001-05-17 Bruno Haible <haible@clisp.cons.org> * gettext.m4 (AM_WITH_NLS): Fix dcgettext test. Always add $LIBICONV diff --git a/m4/iconv.m4 b/m4/iconv.m4 index 4a01420..1723734 100644 --- a/m4/iconv.m4 +++ b/m4/iconv.m4 @@ -1,4 +1,4 @@ -#serial AM1 +#serial AM2 dnl From Bruno Haible. @@ -6,6 +6,15 @@ AC_DEFUN([AM_ICONV], [ dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and dnl those with the standalone portable GNU libiconv installed). + + AC_ARG_WITH([libiconv-prefix], +[ --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib], [ + for dir in `echo "$withval" | tr : ' '`; do + if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi + if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi + done + ]) + AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no |