diff options
| author | Tom Tromey <tromey@redhat.com> | 2001-07-18 17:06:24 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2001-07-18 17:06:24 +0000 |
| commit | 860a15368d564787c79e76fefb37cecd57ee8c12 (patch) | |
| tree | 39257978d9d699480386ada433ec3ac1e37054d3 /libjava/include | |
| parent | f06fbeea0d00173bf64cda5eb6b96f1df55d5fd8 (diff) | |
| download | gcc-860a15368d564787c79e76fefb37cecd57ee8c12.tar.gz | |
For PR java/2812:
* libgcj.spec.in (*lib): Added LIBICONV.
* configure: Rebuilt.
* configure.in: Call AM_ICONV. Don't check for iconv function.
Add parameters to JV_HASH_SYNCHRONIZATION define.
* acinclude.m4 (AM_ICONV): New macro, from Bruno Haible.
From-SVN: r44116
Diffstat (limited to 'libjava/include')
| -rw-r--r-- | libjava/include/Makefile.in | 1 | ||||
| -rw-r--r-- | libjava/include/config.h.in | 12 |
2 files changed, 10 insertions, 3 deletions
diff --git a/libjava/include/Makefile.in b/libjava/include/Makefile.in index 6144b327582..85e8f97cd1f 100644 --- a/libjava/include/Makefile.in +++ b/libjava/include/Makefile.in @@ -95,6 +95,7 @@ LIBGCJTESTSPEC = @LIBGCJTESTSPEC@ LIBGCJ_CFLAGS = @LIBGCJ_CFLAGS@ LIBGCJ_CXXFLAGS = @LIBGCJ_CXXFLAGS@ LIBGCJ_JAVAFLAGS = @LIBGCJ_JAVAFLAGS@ +LIBICONV = @LIBICONV@ LIBLTDL = @LIBLTDL@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ diff --git a/libjava/include/config.h.in b/libjava/include/config.h.in index 8b95f014855..f23c881d91e 100644 --- a/libjava/include/config.h.in +++ b/libjava/include/config.h.in @@ -206,9 +206,6 @@ /* Define if you have the gmtime_r function. */ #undef HAVE_GMTIME_R -/* Define if you have the iconv function. */ -#undef HAVE_ICONV - /* Define if you have the inet_addr function. */ #undef HAVE_INET_ADDR @@ -377,6 +374,15 @@ /* Required define if using POSIX threads */ #undef _POSIX_PTHREAD_SEMANTICS +/* Define if hash synchronization is in use */ +#undef JV_HASH_SYNCHRONIZATION + +/* Define if you have the iconv() function. */ +#undef HAVE_ICONV + +/* Define as const if the declaration of iconv() needs const. */ +#undef ICONV_CONST + /* Required define if using POSIX threads */ #undef _REENTRANT |