Don't install charset.alias on glibc-2.1 systems.

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 1d466b56c4a04c0569676996ae103811d2b25f85..5178123d4c8fa3811cd3a0cbf4eb7326459a021a 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-11  Bruno Haible  <haible@clisp.cons.org>
+
+       * gettext.texi (aclocal): Add glibc21.m4 to the list of needed files.
+
 2001-04-19  Bruno Haible  <haible@clisp.cons.org>
 
        * gettext-0.10.37 released.

diff --git a/doc/gettext.texi b/doc/gettext.texi
index ef7d6d2a958ac87fe1722087642629a4426db01f..edc6bb82d990c2149483ccaf993d98827b4fb27c 100644 (file)
--- a/doc/gettext.texi
+++ b/doc/gettext.texi
@@ -5149,7 +5149,7 @@ AC_CONFIG_AUX_DIR([@var{subdir}])
 
 If you do not have an @file{aclocal.m4} file in your distribution,
 the simplest is to concatenate the files @file{codeset.m4},
-@file{gettext.m4}, @file{iconv.m4}, @file{isc-posix.m4},
+@file{gettext.m4}, @file{glibc21.m4}, @file{iconv.m4}, @file{isc-posix.m4},
 @file{lcmessage.m4}, @file{progtest.m4} from GNU @code{gettext}'s
 @file{m4/} directory into a single file.
 

diff --git a/intl/ChangeLog b/intl/ChangeLog
index f8486477089143d314f2da09616547878461438c..cc3f58703c790f3866cf364e779937a23b2ffc30 100644 (file)
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-11  Bruno Haible  <haible@clisp.cons.org>
+
+       * Makefile.in (install-exec): Don't install charset.alias on glibc 2.1
+       systems.
+
 2001-04-30  Bruno Haible  <haible@clisp.cons.org>
 
        * dcigettext.c (getuid, getgid, geteuid, getegid): Provide default

diff --git a/intl/Makefile.in b/intl/Makefile.in
index 4ed0a6a8291b1f2ccfaab7a61ea3d4137d06ac0d..4f1812c0322d25601241302f2fb11a6cf778c778 100644 (file)
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -152,14 +152,21 @@ install-exec: all
        fi
        if test '@USE_INCLUDED_LIBINTL@' = yes; then \
          $(mkinstalldirs) $(DESTDIR)$(libdir); \
-         test -f $(DESTDIR)$(libdir)/charset.alias \
-           && orig=$(DESTDIR)$(libdir)/charset.alias \
-           || orig=charset.alias; \
          temp=$(DESTDIR)$(libdir)/t-charset.alias; \
          dest=$(DESTDIR)$(libdir)/charset.alias; \
-         sed -f ref-add.sed $$orig > $$temp; \
-         $(INSTALL_DATA) $$temp $$dest; \
-         rm -f $$temp; \
+         if test -f $(DESTDIR)$(libdir)/charset.alias; then \
+           orig=$(DESTDIR)$(libdir)/charset.alias; \
+           sed -f ref-add.sed $$orig > $$temp; \
+           $(INSTALL_DATA) $$temp $$dest; \
+           rm -f $$temp; \
+         else \
+           if test @GLIBC21@ = no; then \
+             orig=charset.alias; \
+             sed -f ref-add.sed $$orig > $$temp; \
+             $(INSTALL_DATA) $$temp $$dest; \
+             rm -f $$temp; \
+           fi; \
+         fi; \
          $(mkinstalldirs) $(DESTDIR)$(localedir); \
          test -f $(DESTDIR)$(localedir)/locale.alias \
            && orig=$(DESTDIR)$(localedir)/locale.alias \

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 7a19b95d9366d65f0ed3ab3042e2a8082cef201e..2182dadb976e27dda99cf41586b6a3da85a701a6 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,9 @@
+2001-05-11  Bruno Haible  <haible@clisp.cons.org>
+
+       * glibc21.m4: New file, from fileutils-4.1.
+       * gettext.m4 (AM_GNU_GETTEXT): Require jm_GLIBC21.
+       * Makefile.am (EXTRA_DIST): Add glibc21.m4.
+
 2001-05-04  Bruno Haible  <haible@clisp.cons.org>
 
        * gettext.m4 (AM_WITH_NLS): Let the GNU gettext package install its

diff --git a/m4/Makefile.am b/m4/Makefile.am
index cad7a0017ad1a382b7beb728db742f9d7ecf78b9..d10ca9cfe6ffaf87aced82f46bc2df540bf43d52 100644 (file)
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -7,6 +7,6 @@ aclocal_DATA = codeset.m4 gettext.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest
 # find . -type f -name '*.m4' -printf '%f\n'|sort |fmt |tr '\012' @ \
 #   |sed 's/@$/%/;s/@/ \\@/g' |tr @% '\012\012'
 EXTRA_DIST = README \
-c-bs-a.m4 codeset.m4 getline.m4 gettext.m4 iconv.m4 inttypes_h.m4 \
-isc-posix.m4 lcmessage.m4 libtool.m4 mbrtowc.m4 mbstate_t.m4 mbswidth.m4 \
-progtest.m4 setlocale.m4 signed.m4 uintmax_t.m4 ulonglong.m4
+c-bs-a.m4 codeset.m4 getline.m4 gettext.m4 glibc21.m4 iconv.m4 \
+inttypes_h.m4 isc-posix.m4 lcmessage.m4 libtool.m4 mbrtowc.m4 mbstate_t.m4 \
+mbswidth.m4 progtest.m4 setlocale.m4 signed.m4 uintmax_t.m4 ulonglong.m4

diff --git a/m4/gettext.m4 b/m4/gettext.m4
index a9fce69b5d1b1433f7c34c7474d06e77b33fde00..b744d7774e93dc9e18eada27240e123a7f97e4b9 100644 (file)
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -259,6 +259,7 @@ AC_DEFUN([AM_GNU_GETTEXT],
    AC_REQUIRE([AC_TYPE_SIZE_T])dnl
    AC_REQUIRE([AC_FUNC_ALLOCA])dnl
    AC_REQUIRE([AC_FUNC_MMAP])dnl
+   AC_REQUIRE([jm_GLIBC21])dnl
 
    AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
 stdlib.h string.h unistd.h sys/param.h])

diff --git a/m4/glibc21.m4 b/m4/glibc21.m4
new file mode 100644 (file)
index 0000000..5b88ef2
--- /dev/null
+++ b/m4/glibc21.m4
@@ -0,0 +1,26 @@
+#serial 2
+
+# Test for the GNU C Library, version 2.1 or newer.
+# From Bruno Haible.
+
+AC_DEFUN([jm_GLIBC21],
+  [
+    AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
+      ac_cv_gnu_library_2_1,
+      [AC_EGREP_CPP([Lucky GNU user],
+       [
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
+  Lucky GNU user
+ #endif
+#endif
+       ],
+       ac_cv_gnu_library_2_1=yes,
+       ac_cv_gnu_library_2_1=no)
+      ]
+    )
+    AC_SUBST(GLIBC21)
+    GLIBC21="$ac_cv_gnu_library_2_1"
+  ]
+)

diff --git a/misc/ChangeLog b/misc/ChangeLog
index 21d60e13ae563168ced64c714c9d4d3790d72bd0..a857d0f3d8520dc690c0379b6fb888e54716f643 100644 (file)
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-11  Bruno Haible  <haible@clisp.cons.org>
+
+       * gettextize.in: Tell the user about glibc21.m4.
+
 2001-04-19  Bruno Haible  <haible@clisp.cons.org>
 
        * gettext-0.10.37 released.

diff --git a/misc/gettextize.in b/misc/gettextize.in
index 7e498bc99bda74d6503cd6738b60f49fb00827ff..3f3192b147ac725a1dfbb02b8ce6478bd9b059f0 100644 (file)
--- a/misc/gettextize.in
+++ b/misc/gettextize.in
@@ -200,7 +200,7 @@ rm -f $srcdir/po/ChangeLog.tmp
 
 echo
 echo "Please add the files"
-echo "  codeset.m4 gettext.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4"
+echo "  codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4"
 echo "from the @datadir@/aclocal directory to your autoconf macro directory"
 echo "or directly to your aclocal.m4 file."
 echo "You will also need config.guess and config.sub, which you can get from"