From 7a4363a7bab40388e490ebbcff0425f731a3aaa9 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 9 Aug 2003 10:56:40 +0000 Subject: . --- aclocal.m4 | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) (limited to 'aclocal.m4') diff --git a/aclocal.m4 b/aclocal.m4 index 47f8718a6..7e25cbfeb 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -933,7 +933,7 @@ AC_DEFUN([jm_MACROS], AC_REQUIRE([AC_ISC_POSIX])dnl jm_CHECK_ALL_TYPES - jm_INCLUDED_REGEX([lib/regex.c]) + gl_REGEX AC_REQUIRE([UTILS_HOST_OS]) AC_REQUIRE([UTILS_FUNC_MKDIR_TRAILING_SLASH]) @@ -952,7 +952,7 @@ AC_DEFUN([jm_MACROS], AC_REQUIRE([jm_FUNC_LCHOWN]) AC_REQUIRE([fetish_FUNC_RMDIR_NOTEMPTY]) AC_REQUIRE([jm_FUNC_CHOWN]) - AC_REQUIRE([jm_FUNC_MKTIME]) + AC_REQUIRE([gl_FUNC_MKTIME]) AC_REQUIRE([jm_FUNC_LSTAT]) AC_REQUIRE([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK]) AC_REQUIRE([jm_FUNC_STAT]) @@ -963,7 +963,6 @@ AC_DEFUN([jm_MACROS], AC_REQUIRE([jm_FUNC_MEMCMP]) AC_REQUIRE([gl_MEMCOLL]) AC_REQUIRE([jm_FUNC_GLIBC_UNLOCKED_IO]) - AC_REQUIRE([AC_FUNC_FNMATCH_GNU]) AC_REQUIRE([jm_FUNC_GROUP_MEMBER]) AC_REQUIRE([jm_FUNC_PUTENV]) AC_REQUIRE([jm_AFS]) @@ -972,7 +971,6 @@ AC_DEFUN([jm_MACROS], AC_REQUIRE([jm_AC_FUNC_LINK_FOLLOWS_SYMLINK]) AC_REQUIRE([gl_FUNC_FNMATCH_GNU]) AC_REQUIRE([jm_FUNC_GNU_STRFTIME]) - AC_REQUIRE([jm_FUNC_MKTIME]) AC_REQUIRE([jm_FUNC_FPENDING]) # This is for od and stat, and any other program that @@ -982,10 +980,11 @@ AC_DEFUN([jm_MACROS], AC_REQUIRE([jm_FUNC_GETGROUPS]) AC_REQUIRE([AC_FUNC_FSEEKO]) - AC_REQUIRE([AC_FUNC_VPRINTF]) AC_REQUIRE([AC_FUNC_ALLOCA]) AC_REQUIRE([gl_FUNC_ALLOCA]) + AC_REQUIRE([gl_ERROR]) + AC_CONFIG_LIBOBJ_DIR([lib]) AC_FUNC_GETLOADAVG @@ -1269,7 +1268,7 @@ AC_DEFUN([AC_ISC_POSIX], ] ) -#serial 17 +#serial 18 dnl Initially derived from code in GNU grep. dnl Mostly written by Jim Meyering. @@ -1323,7 +1322,7 @@ AC_DEFUN([jm_INCLUDED_REGEX], /* The following example is derived from a problem report against gawk from Jorge Stolfi . */ memset (®ex, 0, sizeof (regex)); - s = re_compile_pattern ("[[an\371]]*n", 7, ®ex); + s = re_compile_pattern ("[[an\201]]*n", 7, ®ex); if (s) exit (1); @@ -3005,23 +3004,6 @@ AC_DEFUN([jm_FUNC_CHOWN], fi ]) -#serial 8 - -dnl From Jim Meyering. -dnl A wrapper around AC_FUNC_MKTIME. - -AC_DEFUN([jm_FUNC_MKTIME], -[AC_REQUIRE([AC_FUNC_MKTIME])dnl - - dnl mktime.c uses localtime_r if it exists. Check for it. - AC_CHECK_FUNCS(localtime_r) - - if test $ac_cv_func_working_mktime = no; then - AC_DEFINE(mktime, rpl_mktime, - [Define to rpl_mktime if the replacement function should be used.]) - fi -]) - # mktime.m4 serial 2 dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU -- cgit v1.2.3-54-g00ecf