* elf32-s390.c (elf_s390_size_dynamic_sections): Set relocs to TRUE

[binutils-gdb.git] / intl / aclocal.m4

diff --git a/intl/aclocal.m4 b/intl/aclocal.m4
index 58d61625fb44aedf3edc890f4c1a94a417e9cdb9..225439f21253a18c057d0081f1ddb310c529d7ac 100644 (file)
--- a/intl/aclocal.m4
+++ b/intl/aclocal.m4
@@ -1,4 +1,4 @@
-dnl aclocal.m4 generated automatically by aclocal 1.2e
+dnl aclocal.m4 generated automatically by aclocal 1.3
 
 dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 dnl This Makefile.in is free software; the Free Software Foundation
@@ -121,40 +121,8 @@ AC_DEFUN(CY_WITH_NLS,
            fi
        ])
 
-        if test "$CATOBJEXT" = "NONE"; then
-         AC_MSG_CHECKING([whether catgets can be used])
-         AC_ARG_WITH(catgets,
-           [  --with-catgets          use catgets functions if available],
-           nls_cv_use_catgets=$withval, nls_cv_use_catgets=no)
-         AC_MSG_RESULT($nls_cv_use_catgets)
-
-         if test "$nls_cv_use_catgets" = "yes"; then
-           dnl No gettext in C library.  Try catgets next.
-           AC_CHECK_LIB(i, main)
-           AC_CHECK_FUNC(catgets,
-             [AC_DEFINE(HAVE_CATGETS)
-              INTLOBJS="\$(CATOBJS)"
-              AC_PATH_PROG(GENCAT, gencat, no)dnl
-              if test "$GENCAT" != "no"; then
-                AC_PATH_PROG(GMSGFMT, gmsgfmt, no)
-                if test "$GMSGFMT" = "no"; then
-                  AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
-                   [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
-                fi
-                AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-                  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-                USE_INCLUDED_LIBINTL=yes
-                CATOBJEXT=.cat
-                INSTOBJEXT=.cat
-                DATADIRNAME=lib
-                INTLDEPS='$(top_builddir)/../intl/libintl.a'
-                INTLLIBS=$INTLDEPS
-                LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-                nls_cv_header_intl=intl/libintl.h
-                nls_cv_header_libgt=intl/libgettext.h
-              fi])
-         fi
-        fi
+       dnl In the standard gettext, we would now check for catgets.
+        dnl However, we never want to use catgets for our releases.
 
         if test "$CATOBJEXT" = "NONE"; then
          dnl Neither gettext nor catgets in included in the C library.
@@ -179,8 +147,8 @@ AC_DEFUN(CY_WITH_NLS,
        INTLDEPS='$(top_builddir)/../intl/libintl.a'
        INTLLIBS=$INTLDEPS
        LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-        nls_cv_header_intl=intl/libintl.h
-        nls_cv_header_libgt=intl/libgettext.h
+        nls_cv_header_intl=libintl.h
+        nls_cv_header_libgt=libgettext.h
       fi
 
       dnl Test whether we really found GNU xgettext.
@@ -200,8 +168,8 @@ AC_DEFUN(CY_WITH_NLS,
       POSUB=po
     else
       DATADIRNAME=share
-      nls_cv_header_intl=intl/libintl.h
-      nls_cv_header_libgt=intl/libgettext.h
+      nls_cv_header_intl=libintl.h
+      nls_cv_header_libgt=libgettext.h
     fi
 
     # If this is used in GNU gettext we have to set USE_NLS to `yes'