Update libjava for gettext macros [3/3]

[Kelley Cook <kcook at gcc dot gnu dot org>]

The other followup patch for the included gettext macros

OK?
2004-09-04  Kelley Cook  <kcook@gcc.gnu.org>

	* Makefile.am: Run aclocal with -I ../config
	* acinclude.m4: Delete macros picked up from ../config and tidy.
	(AM_ICONV,AM_LC_MESSAGES): Delete.
	* configure.ac (AC_CONFIG_MACRO_DIR): New.
	* aclocal.m4, configure, Makefile.in, gcj/Makefile.in,
	include/Makefile.in, libltdl/Makefile.in, 
	testsuite/Makefile.in: Regenerate.

diff -pud gcc-orig/libjava/Makefile.am gcc-snapshot/libjava/Makefile.am
--- gcc-orig/libjava/Makefile.am	2004-08-25 11:12:23.000000000 -0400
+++ gcc-snapshot/libjava/Makefile.am	2004-09-03 13:05:21.004703500 -0400
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = foreign subdir-objects
 
-ACLOCAL_AMFLAGS = -I .
+ACLOCAL_AMFLAGS = -I ../config
 
 ## Garbage collector conditionals.
 if USING_BOEHMGC
diff -pud gcc-orig/libjava/acinclude.m4 gcc-snapshot/libjava/acinclude.m4
--- gcc-orig/libjava/acinclude.m4	2004-08-04 15:30:12.000000000 -0400
+++ gcc-snapshot/libjava/acinclude.m4	2004-09-03 11:04:19.250923700 -0400
@@ -1,11 +1,9 @@
-sinclude(../config/accross.m4)
-sinclude(../config/acx.m4)
-sinclude(../config/no-executables.m4)
+m4_include(../config/no-executables.m4)
 
-sinclude(../libtool.m4)
 dnl The lines below arrange for aclocal not to bring libtool.m4
 dnl AM_PROG_LIBTOOL into aclocal.m4, while still arranging for automake
 dnl to add a definition of LIBTOOL to Makefile.in.
+m4_include(../libtool.m4)
 ifelse(yes,no,[
 AC_DEFUN([AM_PROG_LIBTOOL],)
 AC_DEFUN([AC_LIBTOOL_DLOPEN],)
@@ -14,104 +12,6 @@ AC_DEFUN([LT_AC_PROG_GCJ],)
 AC_SUBST(GCJ)
 AC_SUBST(LIBTOOL)
 ])
-
-#serial AM2
-
-dnl From Bruno Haible.
-
-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 am_cv_lib_iconv_ldpath="-L$dir/lib"; fi
-    done
-   ])
-
-  AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
-    am_cv_func_iconv="no, consider installing GNU libiconv"
-    am_cv_lib_iconv=no
-    AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
-      [iconv_t cd = iconv_open("","");
-       iconv(cd,NULL,NULL,NULL,NULL);
-       iconv_close(cd);],
-      am_cv_func_iconv=yes)
-    if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
-      LIBS="$LIBS $am_cv_libiconv_ldpath -liconv"
-      AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
-        [iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);],
-        am_cv_lib_iconv=yes
-        am_cv_func_iconv=yes)
-      LIBS="$am_save_LIBS"
-    fi
-  ])
-  if test "$am_cv_func_iconv" = yes; then
-    AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
-    AC_MSG_CHECKING([for iconv declaration])
-    AC_CACHE_VAL(am_cv_proto_iconv, [
-      AC_TRY_COMPILE([
-#include <stdlib.h>
-#include <iconv.h>
-extern
-#ifdef __cplusplus
-"C"
-#endif
-#if defined(__STDC__) || defined(__cplusplus)
-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
-#else
-size_t iconv();
-#endif
-], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
-      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
-    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    AC_MSG_RESULT([$]{ac_t:-
-         }[$]am_cv_proto_iconv)
-    AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
-      [Define as const if the declaration of iconv() needs const.])
-  fi
-  LIBICONV=
-  if test "$am_cv_lib_iconv" = yes; then
-    LIBICONV="$am_cv_lib_iconv_ldpath -liconv"
-  fi
-  AC_SUBST(LIBICONV)
-])
-
-# Check whether LC_MESSAGES is available in <locale.h>.
-# Ulrich Drepper <drepper@cygnus.com>, 1995.
-#
-# This file can be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU General Public
-# License or the GNU Library General Public License but which still want
-# to provide support for the GNU gettext functionality.
-# Please note that the actual code of the GNU gettext library is covered
-# by the GNU Library General Public License, and the rest of the GNU
-# gettext package package is covered by the GNU General Public License.
-# They are *not* in the public domain.
-
-# serial 2
-
-AC_DEFUN([AM_LC_MESSAGES],
-  [AC_CHECK_HEADERS(locale.h)
-  if test $ac_cv_header_locale_h = yes; then
-    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-    if test $am_cv_val_LC_MESSAGES = yes; then
-      AC_DEFINE(HAVE_LC_MESSAGES, 1,
-        [Define if your <locale.h> file defines LC_MESSAGES.])
-    fi
-  fi])
-
 AC_DEFUN([CHECK_FOR_BROKEN_MINGW_LD],
 [
 AC_MSG_CHECKING(whether 'ld' is at least 2.13)
diff -pud gcc-orig/libjava/configure.ac gcc-snapshot/libjava/configure.ac
--- gcc-orig/libjava/configure.ac	2004-08-27 20:45:41.000000000 -0400
+++ gcc-snapshot/libjava/configure.ac	2004-09-03 11:13:56.330723700 -0400
@@ -4,6 +4,7 @@ AC_PREREQ(2.59)
 AC_INIT([libjava], [version-unused],, [libjava])
 
 AC_CONFIG_SRCDIR(java/lang/System.java)
+AC_CONFIG_MACRO_DIR(../config)
 
 # We use these options to decide which functions to include.
 AC_ARG_WITH(target-subdir,