* acfunctions.m4 (AC_FUNC_ERROR_AT_LINE): New macro, from

Automake.
* doc/autoconf.texi (Particular Functions): Adjust.

diff --git a/ChangeLog b/ChangeLog
index 466ca934ad0bb797ff7a57bc2556e21178b7ea81..15e3af8ad3c566f3dc482d750c56eb32786b0cf9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-08-01  Akim Demaille  <akim@epita.fr>
+
+       * acfunctions.m4 (AC_FUNC_ERROR_AT_LINE): New macro, from
+       Automake.
+       * doc/autoconf.texi (Particular Functions): Adjust.
+
 2000-08-01  Akim Demaille  <akim@epita.fr>
 
        Create acfunctions.m4, in charge of the macros related to

diff --git a/NEWS b/NEWS
index 05b915ff69e3c3fdc3eb0b5ed6d3bfadc1398472..5c8d2f21c3a9701565edffa8133239656ee1205f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -189,7 +189,8 @@ test cases in this new frame work.
 
 ** Specific Macros
 - AC_FUNC_CHOWN, AC_FUNC_MALLOC, AC_FUNC_STRERROR_R,
-  AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK, AC_FUNC_STAT, AC_FUNC_LSTAT.
+  AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK, AC_FUNC_STAT, AC_FUNC_LSTAT,
+  AC_FUNC_ERROR_AT_LINE.
   New.
 
 - AC_FUNC_GETGROUPS

diff --git a/acfunctions b/acfunctions
index fc96257b234bb7213383feb9de1eb6041ae6ce22..c0a3b608b173c9a11e1ac583dcc4a8377ed818d7 100644 (file)
--- a/acfunctions
+++ b/acfunctions
@@ -4,6 +4,8 @@ bcmp            AC_HEADER_STDC
 bcopy          AC_HEADER_STDC
 bzero          AC_HEADER_STDC
 chown          AC_FUNC_CHOWN
+error          AC_FUNC_ERROR_AT_LINE
+error_at_line  AC_FUNC_ERROR_AT_LINE
 fnmatch                AC_FUNC_FNMATCH
 getgroups      AC_FUNC_GETGROUPS
 getloadavg     AC_FUNC_GETLOADAVG

diff --git a/acfunctions.m4 b/acfunctions.m4
index 84eeb5ecbd13c5ddde17c205b0faf0d2d49e1075..d6ac63ec56066c35a19508f62b196c8ba3435b9e 100644 (file)
--- a/acfunctions.m4
+++ b/acfunctions.m4
@@ -318,6 +318,24 @@ fi
 ])
 
 
+# AC_FUNC_ERROR_AT_LINE
+# ---------------------
+AC_DEFUN([AC_FUNC_ERROR_AT_LINE],
+[AC_CACHE_CHECK([for error_at_line], ac_cv_lib_error_at_line,
+[AC_TRY_LINK([],[error_at_line (0, 0, "", 0, "");],
+              ac_cv_lib_error_at_line=yes,
+              ac_cv_lib_error_at_line=no)])
+if test $ac_cv_lib_error_at_line = no; then
+  AC_LIBOBJ(error)
+fi
+])
+
+
+# AU::AM_FUNC_ERROR_AT_LINE
+# -------------------------
+AU_ALIAS([AM_FUNC_ERROR_AT_LINE], [AC_FUNC_ERROR_AT_LINE])
+
+
 # AC_FUNC_FNMATCH
 # ---------------
 # We look for fnmatch.h to avoid that the test fails in C++.

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 6b5f94f44f77fbefed0235816d3df785aa2b75dd..6bbb0b9ca6e7fca5f7d55f678b472c590541cbf1 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -2938,6 +2938,12 @@ define @code{CLOSEDIR_VOID}.  Otherwise, callers ought to check its
 return value for an error indicator.
 @end defmac
 
+@defmac AC_FUNC_ERROR_AT_LINE
+@maindex FUNC_ERROR_AT_LINE
+If the @code{error_at_line} function is not found, require an
+@code{AC_LIBOBJ} replacement of @samp{error}.
+@end defmac
+
 @defmac AC_FUNC_FNMATCH
 @maindex FUNC_FNMATCH
 If the @code{fnmatch} function is available and works (unlike the one on

diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4
index 84eeb5ecbd13c5ddde17c205b0faf0d2d49e1075..d6ac63ec56066c35a19508f62b196c8ba3435b9e 100644 (file)
--- a/lib/autoconf/functions.m4
+++ b/lib/autoconf/functions.m4
@@ -318,6 +318,24 @@ fi
 ])
 
 
+# AC_FUNC_ERROR_AT_LINE
+# ---------------------
+AC_DEFUN([AC_FUNC_ERROR_AT_LINE],
+[AC_CACHE_CHECK([for error_at_line], ac_cv_lib_error_at_line,
+[AC_TRY_LINK([],[error_at_line (0, 0, "", 0, "");],
+              ac_cv_lib_error_at_line=yes,
+              ac_cv_lib_error_at_line=no)])
+if test $ac_cv_lib_error_at_line = no; then
+  AC_LIBOBJ(error)
+fi
+])
+
+
+# AU::AM_FUNC_ERROR_AT_LINE
+# -------------------------
+AU_ALIAS([AM_FUNC_ERROR_AT_LINE], [AC_FUNC_ERROR_AT_LINE])
+
+
 # AC_FUNC_FNMATCH
 # ---------------
 # We look for fnmatch.h to avoid that the test fails in C++.

diff --git a/lib/autoscan/functions b/lib/autoscan/functions
index fc96257b234bb7213383feb9de1eb6041ae6ce22..c0a3b608b173c9a11e1ac583dcc4a8377ed818d7 100644 (file)
--- a/lib/autoscan/functions
+++ b/lib/autoscan/functions
@@ -4,6 +4,8 @@ bcmp            AC_HEADER_STDC
 bcopy          AC_HEADER_STDC
 bzero          AC_HEADER_STDC
 chown          AC_FUNC_CHOWN
+error          AC_FUNC_ERROR_AT_LINE
+error_at_line  AC_FUNC_ERROR_AT_LINE
 fnmatch                AC_FUNC_FNMATCH
 getgroups      AC_FUNC_GETGROUPS
 getloadavg     AC_FUNC_GETLOADAVG