From fa5044a6864bd1a5fd7ab76203e2b614e084574e Mon Sep 17 00:00:00 2001 From: rodrigc Date: Fri, 1 Feb 2002 21:16:05 +0000 Subject: 2002-02-01 Craig Rodrigues PR java/4972 * aclocal.m4, acinclude.m4 (AM_ICONV): Put linking flags for libiconv in LIBICONV variable. * configure: Regenerated. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@49411 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/acinclude.m4 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'libjava/acinclude.m4') diff --git a/libjava/acinclude.m4 b/libjava/acinclude.m4 index 3412e62f55a..68f52559014 100644 --- a/libjava/acinclude.m4 +++ b/libjava/acinclude.m4 @@ -131,11 +131,12 @@ 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). + am_cv_lib_iconv_ldpath= 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 + if test -d $dir/lib; then am_cv_lib_iconv_ldpath="-L$dir/lib"; fi done ]) @@ -150,7 +151,7 @@ AC_DEFUN([AM_ICONV], am_cv_func_iconv=yes) if test "$am_cv_func_iconv" != yes; then am_save_LIBS="$LIBS" - LIBS="$LIBS -liconv" + LIBS="$LIBS $am_cv_libiconv_ldpath -liconv" AC_TRY_LINK([#include #include ], [iconv_t cd = iconv_open("",""); @@ -187,7 +188,7 @@ size_t iconv(); fi LIBICONV= if test "$am_cv_lib_iconv" = yes; then - LIBICONV="-liconv" + LIBICONV="$am_cv_lib_iconv_ldpath -liconv" fi AC_SUBST(LIBICONV) ]) -- cgit v1.2.3