From d3ca31d64b2e347e29aa00733d6d24bd4b9384d4 Mon Sep 17 00:00:00 2001 From: tromey Date: Wed, 18 Jul 2001 17:06:24 +0000 Subject: 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@44116 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/include/Makefile.in | 1 + libjava/include/config.h.in | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'libjava/include') 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 -- cgit v1.2.3