Fix some errors.

diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog
index 76c44bb3427f2946df67289de5dc72e9ccce8f31..41af4536f4db58ab1cfddb8e0eafc7a458ee99f4 100644 (file)
--- a/gettext-tools/m4/ChangeLog
+++ b/gettext-tools/m4/ChangeLog
@@ -1,3 +1,10 @@
+2003-04-05  Bruno Haible  <bruno@clisp.org>
+
+       * canonicalize.m4 (gl_CANONICALIZE): Use AC_CHECK_FUNCS, so that
+       HAVE_CANONICALIZE_FILE_NAME gets defined.
+       * error.m4 (jm_PREREQ_ERROR): New macro.
+       (gt_FUNC_ERROR_AT_LINE): Invoke it.
+
 2003-04-05  Bruno Haible  <bruno@clisp.org>
 
        * relocatable.m4 (AC_RELOCATABLE_LIBRARY): Use the final value of

diff --git a/gettext-tools/m4/canonicalize.m4 b/gettext-tools/m4/canonicalize.m4
index 48e9836a20fa891d191ffd10e5cffe8c5b9c5ba3..60f880cedccb3be39cf8e81d24a03ab6d5b48d88 100644 (file)
--- a/gettext-tools/m4/canonicalize.m4
+++ b/gettext-tools/m4/canonicalize.m4
@@ -10,12 +10,13 @@ AC_DEFUN([gl_CANONICALIZE],
 [
   dnl Do this replacement check manually because the file name is shorter
   dnl than the function name.
-  AC_CHECK_FUNC(canonicalize_file_name, , [
+  AC_CHECK_FUNCS(canonicalize_file_name)
+  if test $ac_cv_func_canonicalize_file_name = no; then
     AC_LIBOBJ(canonicalize)
     AC_DEFINE([realpath], [rpl_realpath],
       [Define to a replacement function name for realpath().])
     gl_PREREQ_CANONICALIZE
-  ])
+  fi
 ])
 
 # Prerequisites of lib/canonicalize.c.

diff --git a/gettext-tools/m4/error.m4 b/gettext-tools/m4/error.m4
index 5849460bd1d6c4b0f9bd36919e60b83e0e67bbc5..1bd04b1710a0c05ef72fca7d69e63759bf5ffbfd 100644 (file)
--- a/gettext-tools/m4/error.m4
+++ b/gettext-tools/m4/error.m4
@@ -1,5 +1,5 @@
-# error.m4 serial 1 (gettext-0.11)
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# error.m4 serial 2 (gettext-0.12)
+dnl Copyright (C) 2002-2003 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
@@ -17,5 +17,17 @@ AC_DEFUN([gt_FUNC_ERROR_AT_LINE],
   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().])
+  else
+    jm_PREREQ_ERROR
   fi
 ])
+
+# Prerequisites of lib/error.c.
+AC_DEFUN([jm_PREREQ_ERROR],
+[
+  AC_REQUIRE([AC_HEADER_STDC])
+  AC_CHECK_FUNCS_ONCE(doprnt vprintf)
+  AC_CHECK_FUNCS(strerror)
+  AC_CHECK_DECLS([strerror])
+  AC_FUNC_STRERROR_R
+])