mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-11-28 06:14:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

re PR java/4972 (undefined reference to `libiconv')

Browse Source 
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.

From-SVN: r49411
This commit is contained in:
Craig Rodrigues 2002-02-01 21:16:05 +00:00
parent 58fae3f7ae
commit 1c24f830c5
4 changed files with 327 additions and 328 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libjava/ChangeLog
View File

@ -1,3 +1,10 @@
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.
2002-01-31 Tom Tromey <tromey@redhat.com>
* verify.cc (state::enter_subroutine): New method.

7
libjava/acinclude.m4
View File

@ -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)
])

7
libjava/aclocal.m4 vendored
View File

@ -143,11 +143,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
])
@ -162,7 +163,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("","");
@ -199,7 +200,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)
])

634
libjava/configure vendored
View File

File diff suppressed because it is too large Load Diff