One copy of error.m4, in gettext-tools/m4/, is sufficient.

diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog
index 65c6ba92edc796f2490d517c881b7cc794b64ec3..3f4c61de7ff0bb69a8fca8a31111095ebc746c02 100644 (file)
--- a/gettext-runtime/m4/ChangeLog
+++ b/gettext-runtime/m4/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-28  Bruno Haible  <bruno@clisp.org>
+
+       * error.m4: Remove file. Use ../../gettext-tools/m4/error.m4 instead.
+       * Makefile.am (EXTRA_DIST): Remove it.
+
 2003-02-28  Bruno Haible  <bruno@clisp.org>
 
        * gettext.m4 (AM_MKINSTALLDIRS): Fix MKINSTALLDIRS for when AC_AUX_DIR

diff --git a/gettext-runtime/m4/Makefile.am b/gettext-runtime/m4/Makefile.am
index 3df0a60c7e8d6c1fa58bf801ef4fbbe92069039c..df45b955b0a0c69e455fa53a79ff0958a3af769a 100644 (file)
--- a/gettext-runtime/m4/Makefile.am
+++ b/gettext-runtime/m4/Makefile.am
@@ -5,7 +5,6 @@
 EXTRA_DIST = README \
 ansi-c++.m4 \
 codeset.m4 \
-error.m4 \
 gettext.m4 \
 glibc21.m4 \
 iconv.m4 \

diff --git a/gettext-runtime/m4/error.m4 b/gettext-runtime/m4/error.m4
deleted file mode 100644 (file)
index 5849460..0000000
--- a/gettext-runtime/m4/error.m4
+++ /dev/null
@@ -1,21 +0,0 @@
-# error.m4 serial 1 (gettext-0.11)
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-# A modified version of AM_FUNC_ERROR_AT_LINE that triggers HAVE_ERROR_AT_LINE
-# in config.h instead of modifying LIBOBJS.
-AC_DEFUN([gt_FUNC_ERROR_AT_LINE],
-[
-  AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line,
-   [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");],
-                am_cv_lib_error_at_line=yes,
-               am_cv_lib_error_at_line=no)])
-  if test $am_cv_lib_error_at_line = yes; then
-    AC_DEFINE(HAVE_ERROR_AT_LINE, 1,
-      [Define to 1 if you have the functions error() and error_at_line().])
-  fi
-])