Regenerated.

diff --git a/aclocal.m4 b/aclocal.m4
index 14e9bb3323deab3679b708975ea4e591be37cde4..ee00375da1eec3113aebc80af1c6749667be2d8d 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -598,6 +598,25 @@ dnl LIBDIR is used to find the intl libraries.  If empty,
 dnl    the value `$(top_builddir)/intl/' is used.
 dnl INCDIR is used to find the include files.  If empty,
 dnl    the value `intl' is used.
+dnl
+dnl The result of the configuration is one of five cases:
+dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
+dnl    and used.
+dnl    Catalog format: GNU --> DATADIRNAME = share
+dnl    Catalog extension: .mo after installation, .gmo in source tree
+dnl 2) GNU gettext has been found in the system's C library.
+dnl    Catalog format: GNU --> DATADIRNAME = share
+dnl    Catalog extension: .mo after installation, .gmo in source tree
+dnl 3) An X/Open gettext has been found in the system's C library.
+dnl    Catalog format: Platform dependent --> DATADIRNAME = lib
+dnl    Catalog extension: .mo
+dnl 4) A catgets has been found in the system's C library.
+dnl    Catalog format: Platform dependent --> DATADIRNAME = lib
+dnl    Catalog extension: .cat
+dnl 5) No internationalization, always use English msgid.
+dnl    Catalog format: none
+dnl    Catalog extension: none
+dnl
 AC_DEFUN(AM_WITH_NLS,
   [AC_MSG_CHECKING([whether NLS is requested])
     dnl Default is enabled NLS
@@ -843,16 +862,12 @@ __argz_count __argz_stringify __argz_next])
    fi
    AC_SUBST(INCLUDE_LOCALE_H)
 
-   dnl Determine which catalog format we have (if any is needed)
-   dnl For now we know about two different formats:
-   dnl   Linux libc-5 and the normal X/Open format
    test -d intl || mkdir intl
    if test "$CATOBJEXT" = ".cat"; then
-     AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
-
+     dnl Only the X/Open catalog format is supported.
      dnl Transform the SED scripts while copying because some dumb SEDs
      dnl cannot handle comments.
-     sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
+     sed -e '/^#/d' $srcdir/intl/po2msg.sin > intl/po2msg.sed
    fi
    dnl po2tbl.sed is always needed.
    sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \

diff --git a/configure b/configure
index 597030dd0daad6bdc7818b951c91b4f9f971fbaa..a760b528331dd6db4f998bd8e28b6ba32e79a90e 100755 (executable)
--- a/configure
+++ b/configure
@@ -4179,44 +4179,9 @@ echo "configure:4159: checking for catalogs to be installed" >&5
    fi
    
 
-            test -d intl || mkdir intl
+   test -d intl || mkdir intl
    if test "$CATOBJEXT" = ".cat"; then
-     ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
-echo "configure:4187: checking for linux/version.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 4192 "configure"
-#include "confdefs.h"
-#include <linux/version.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4197: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  msgformat=linux
-else
-  echo "$ac_t""no" 1>&6
-msgformat=xopen
-fi
-
-
-               sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
+                    sed -e '/^#/d' $srcdir/intl/po2msg.sin > intl/po2msg.sed
    fi
       sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
      $srcdir/intl/po2tbl.sin > intl/po2tbl.sed
@@ -4268,7 +4233,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4272: checking for $ac_word" >&5
+echo "configure:4237: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_EMACS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4306,7 +4271,7 @@ test -n "$EMACS" || EMACS="no"
 
   if test $EMACS != "no"; then
     echo $ac_n "checking where .elc files should go""... $ac_c" 1>&6
-echo "configure:4310: checking where .elc files should go" >&5
+echo "configure:4275: checking where .elc files should go" >&5
         lispdir="\$(datadir)/emacs/site-lisp"
     emacs_flavor=`echo "$EMACS" | sed -e 's,^.*/,,'`
     if test "x$prefix" = "xNONE"; then