diff options
| author | rodrigc <rodrigc@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-02-01 21:16:05 +0000 |
|---|---|---|
| committer | rodrigc <rodrigc@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-02-01 21:16:05 +0000 |
| commit | fa5044a6864bd1a5fd7ab76203e2b614e084574e (patch) | |
| tree | 86b244843bfa6814830d2a506fb9c2963a2077f9 /libjava/acinclude.m4 | |
| parent | acc11af04fcd43b9f7273342eec4da009802072e (diff) | |
| download | ppe42-gcc-fa5044a6864bd1a5fd7ab76203e2b614e084574e.tar.gz ppe42-gcc-fa5044a6864bd1a5fd7ab76203e2b614e084574e.zip | |
2002-02-01 Craig Rodrigues <rodrigc@gcc.gnu.org>
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
Diffstat (limited to 'libjava/acinclude.m4')
| -rw-r--r-- | libjava/acinclude.m4 | 7 |
1 files changed, 4 insertions, 3 deletions
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 <stdlib.h> #include <iconv.h>], [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) ]) |
