[patch] libjava: Use HAVE_LANGINFO_CODESET instead of HAVE_NL_LANGINFO

Adrian Bunk bunk@fs.tum.de
Sat Feb 23 14:52:00 GMT 2002


Hi,

a patch for another place where HAVE_LANGINFO_CODESET should be used
instead of HAVE_NL_LANGINFO (AM_LANGINFO_CODESET is part of the gettext
autoconf macros).

I couldn't really test it because a configure regenerated using
autoconf-2.52 (which is the version I have currently available) failed to
execute correctly but the code for HAVE_LANGINFO_CODESET seems to be
correct inside configure.

Could someone please test it with the right autoconf version and review
it?

TIA
Adrian

	* configure.in: Add AM_LANGINFO_CODESET.
	* java/lang/natSystem.cc: Use HAVE_LANGINFO_CODESET instead of
	HAVE_NL_LANGINFO.



--- libjava/configure.in.old	Fri Feb 22 09:19:52 2002
+++ libjava/configure.in	Fri Feb 22 09:22:13 2002
@@ -489,6 +489,8 @@
    AM_LC_MESSAGES
    AC_STRUCT_TIMEZONE

+   AM_LANGINFO_CODESET
+
    AC_CHECK_FUNCS(gethostbyname_r, [
      AC_DEFINE(HAVE_GETHOSTBYNAME_R)
      # There are two different kinds of gethostbyname_r.
--- libjava/java/lang/natSystem.cc.old	Fri Feb 22 09:33:05 2002
+++ libjava/java/lang/natSystem.cc	Fri Feb 22 09:34:05 2002
@@ -170,7 +170,7 @@
 }

 #if ! defined (DEFAULT_FILE_ENCODING) && defined (HAVE_ICONV) \
-    && defined (HAVE_NL_LANGINFO)
+    && defined (HAVE_LANGINFO_CODESET)

 static char *
 file_encoding ()




More information about the Java-patches mailing list