diff options
| author | rodrigc <rodrigc@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-01-22 22:48:45 +0000 |
|---|---|---|
| committer | rodrigc <rodrigc@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-01-22 22:48:45 +0000 |
| commit | a63f70188a0486e7d015b6b96093db0b749b85d2 (patch) | |
| tree | 1681fda7bdab55f18b48c6b1a7b3bfb3597754b5 /gcc/aclocal.m4 | |
| parent | a2e92895297cb50e65de61c835f4fb729c9fdaf5 (diff) | |
| download | gcc-a63f70188a0486e7d015b6b96093db0b749b85d2.tar.gz | |
2002-01-22 Craig Rodrigues <rodrigc@gcc.gnu.org>
PR java/4972
* aclocal.m4 (AM_ICONV): Put linking flags for libiconv
in LIBICONV variable.
* configure: Regenerated.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@49105 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/aclocal.m4')
| -rw-r--r-- | gcc/aclocal.m4 | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gcc/aclocal.m4 b/gcc/aclocal.m4 index 2fd6095af7c..0c4b5c638d0 100644 --- a/gcc/aclocal.m4 +++ b/gcc/aclocal.m4 @@ -1101,11 +1101,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 ]) @@ -1120,7 +1121,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("",""); @@ -1157,7 +1158,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) ]) |