diff options
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 98 |
1 files changed, 67 insertions, 31 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index c457a5de3..1100dd5ab 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.7.8 -*- Autoconf -*- +# generated automatically by aclocal 1.7.9a -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. @@ -163,7 +163,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"]) # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.7.8])]) + [AM_AUTOMAKE_VERSION([1.7.9a])]) # Helper functions for option handling. -*- Autoconf -*- @@ -905,31 +905,13 @@ WARNING: You don't seem to have perl5.003 or newer installed, or you lack ] ) ]) -#serial 69 -*- autoconf -*- - -m4_undefine([AC_LANG_SOURCE(C)]) -dnl The following is identical to the definition in c.m4 -dnl from the autoconf cvs repository on 2003-03-07. -dnl FIXME: remove this code once we upgrade to autoconf-2.58. - -# We can't use '#line $LINENO "configure"' here, since -# Sun c89 (Sun WorkShop 6 update 2 C 5.3 Patch 111679-08 2002/05/09) -# rejects $LINENO greater than 32767, and some configure scripts -# are longer than 32767 lines. -m4_define([AC_LANG_SOURCE(C)], -[/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$1]) - +#serial 70 -*- autoconf -*- dnl Misc type-related macros for fileutils, sh-utils, textutils. AC_DEFUN([jm_MACROS], [ - AC_PREREQ(2.57) + AC_PREREQ(2.58) GNU_PACKAGE="GNU $PACKAGE" AC_DEFINE_UNQUOTED(GNU_PACKAGE, "$GNU_PACKAGE", @@ -1073,6 +1055,8 @@ AC_DEFUN([jm_MACROS], # use the corresponding stub. AC_CHECK_FUNC([fchdir], , [AC_LIBOBJ(fchdir-stub)]) AC_CHECK_FUNC([fchown], , [AC_LIBOBJ(fchown-stub)]) + + AC_REQUIRE([gl_FUNC_FREE]) ]) # These tests must be run before any use of AC_CHECK_TYPE, @@ -1163,7 +1147,8 @@ AC_DEFUN([jm_CHECK_ALL_TYPES], AC_REQUIRE([AC_TYPE_SIGNAL]) AC_REQUIRE([AC_TYPE_SIZE_T]) AC_REQUIRE([AC_TYPE_UID_T]) - AC_CHECK_TYPE(ino_t, unsigned long) + AC_CHECK_TYPE(ino_t, unsigned long int) + AC_CHECK_TYPE(uintptr_t, size_t) gt_TYPE_SSIZE_T @@ -2393,7 +2378,7 @@ AC_DEFUN([gl_EXCLUDE], AC_CHECK_FUNCS_ONCE(isascii) ]) -# exitfail.m4 serial 2 +# exitfail.m4 serial 3 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 @@ -2401,8 +2386,11 @@ 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. -dnl Prerequisites of lib/exitfail.c. -AC_DEFUN([gl_EXITFAIL], [:]) +AC_DEFUN([gl_EXITFAIL], +[ + dnl No prerequisites of lib/exitfail.c. + : +]) # fileblocks.m4 serial 1 dnl Copyright (C) 2002 Free Software Foundation, Inc. @@ -3592,8 +3580,8 @@ AC_DEFUN([gl_PREREQ_STRDUP], [ ]) -# strndup.m4 serial 1 -dnl Copyright (C) 2002 Free Software Foundation, Inc. +# strndup.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 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 @@ -3613,7 +3601,6 @@ AC_DEFUN([gl_FUNC_STRNDUP], # Prerequisites of lib/strndup.c. AC_DEFUN([gl_PREREQ_STRNDUP], [ - AC_REQUIRE([AC_HEADER_STDC]) AC_CHECK_DECLS(strnlen) ]) @@ -6088,8 +6075,10 @@ AC_DEFUN([jm_FUNC_NANOSLEEP], # Solaris 2.5.1 needs -lposix4 to get the nanosleep function. # Solaris 7 prefers the library name -lrt to the obsolescent name -lposix4. - AC_SEARCH_LIBS(nanosleep, [rt posix4], [LIB_NANOSLEEP=$ac_cv_search_nanosleep]) - AC_SUBST(LIB_NANOSLEEP) + AC_SEARCH_LIBS([nanosleep], [rt posix4], + [test "$ac_cv_search_nanosleep" = "none required" || + LIB_NANOSLEEP=$ac_cv_search_nanosleep]) + AC_SUBST([LIB_NANOSLEEP]) AC_CACHE_CHECK([whether nanosleep works], jm_cv_func_nanosleep_works, @@ -8165,6 +8154,53 @@ AC_DEFUN([AC_FUNC_CANONICALIZE_FILE_NAME], AC_CHECK_FUNC([canonicalize_file_name], , [AC_LIBOBJ(canonicalize)]) ]) +# Check whether free (NULL) is supposed to work. + +# Copyright (C) 2003 Free Software Foundation, Inc. + +# This file is free software, distributed under the terms of the GNU +# General Public License. As a special exception to the GNU General +# Public License, this file may be distributed as part of a program +# that contains a configuration script generated by Autoconf, under +# the same distribution terms as the rest of that program. + +# Written by Paul Eggert. + +# We can't test for free (NULL) even at runtime, since it might +# happen to "work" for our test program, but not in general. So, be +# conservative and use feature tests for relatively modern hosts, +# where free (NULL) is known to work. This costs a bit of +# performance on some older hosts, but we can fix that later if +# needed. + +AC_DEFUN([gl_FUNC_FREE], +[ + AC_CHECK_HEADERS_ONCE(unistd.h) + AC_CACHE_CHECK([whether free (NULL) is known to work], + [gl_cv_func_free], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[@%:@if HAVE_UNISTD_H + @%:@include <unistd.h> + @%:@endif]], + [[@%:@if _POSIX_VERSION < 199009L && \ + (defined unix || defined _unix || defined _unix_ \ + || defined __unix || defined __unix__) + @%:@error "'free (NULL)' is not known to work" + @%:@endif]])], + [gl_cv_func_free=yes], + [gl_cv_func_free=no])]) + + if test $gl_cv_func_free = yes; then + AC_LIBOBJ(free) + AC_DEFINE(free, rpl_free, + [Define to rpl_free if the replacement function should be used.]) + fi +]) + +# Prerequisites of lib/free.c. +AC_DEFUN([gl_PREREQ_FREE], [:]) + # Copyright 1996, 1997, 1998, 2000, 2001, 2002 Free Software Foundation, Inc. |