mirror/autoconf
2
0
Fork 0
mirror of git://git.sv.gnu.org/autoconf synced 2025-02-05 11:10:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Clean up some bugs caught by preliminary dependency validation.

Browse Source 
* lib/autoconf/headers.m4 (AC_DIR_HEADER): Don't invoke
AC_HEADER_DIRENT, since AC_FUNC_CLOSEDIR_VOID requires it.
* lib/m4sugar/m4sh.m4 (_AS_DETECT_BETTER_SHELL)
(_AS_SHELL_SANITIZE): Fix quoting bugs.

Signed-off-by: Eric Blake <ebb9@byu.net>
This commit is contained in:
Eric Blake 2009-01-20 10:08:11 -07:00
parent 34e2c8d548
commit b1ba5448b6
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2009-01-20 Eric Blake <ebb9@byu.net>
Clean up some bugs caught by preliminary dependency validation.
* lib/autoconf/headers.m4 (AC_DIR_HEADER): Don't invoke
AC_HEADER_DIRENT, since AC_FUNC_CLOSEDIR_VOID requires it.
* lib/m4sugar/m4sh.m4 (_AS_DETECT_BETTER_SHELL)
(_AS_SHELL_SANITIZE): Fix quoting bugs.
2009-01-19 Eric Blake <ebb9@byu.net>
Improve AC_REQUIRE documentation.

15
lib/autoconf/headers.m4
View File

@ -1,8 +1,8 @@
# This file is part of Autoconf. -*- Autoconf -*-
# Checking for headers.
#
# Copyright (C) 1988, 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2008
# Free Software Foundation, Inc.
# Copyright (C) 1988, 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2008,
# 2009 Free Software Foundation, Inc.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -439,11 +439,11 @@ AC_DEFUN([AC_HEADER_ASSERT],
[ac_enable_assert=$enableval
AS_IF(dnl
[test "x$enableval" = xno],
[AC_DEFINE([NDEBUG], [1],
[Define to 1 if assertions should be disabled.])],
[AC_DEFINE([NDEBUG], [1],
[Define to 1 if assertions should be disabled.])],
[test "x$enableval" != xyes],
[AC_MSG_WARN([invalid argument supplied to --enable-assert])
ac_enable_assert=yes])],
[AC_MSG_WARN([invalid argument supplied to --enable-assert])
ac_enable_assert=yes])],
[ac_enable_assert=yes])
AC_MSG_RESULT([$ac_enable_assert])
])
@ -887,8 +887,7 @@ use HAVE_STRING_H and HAVE_MEMORY_H, not NEED_MEMORY_H.])
# defines a different set of C preprocessor macros to indicate which
# header file is found.
AU_DEFUN([AC_DIR_HEADER],
[AC_HEADER_DIRENT
AC_FUNC_CLOSEDIR_VOID
[AC_FUNC_CLOSEDIR_VOID
test ac_cv_header_dirent_dirent_h &&
AC_DEFINE([DIRENT], 1, [Same as `HAVE_DIRENT_H', don't depend on me.])
test ac_cv_header_dirent_sys_ndir_h &&

4
lib/m4sugar/m4sh.m4
View File

@ -217,7 +217,7 @@ m4_define([_AS_DETECT_SUGGESTED_PRUNE],
m4_defun([_AS_DETECT_BETTER_SHELL],
dnl Remove any tests from suggested that are also required
[m4_set_map([_AS_DETECT_SUGGESTED_BODY], [_AS_DETECT_SUGGESTED_PRUNE])]dnl
[m4_pushdef([AS_EXIT], [exit m4_default([$1], 1)])]dnl
[m4_pushdef([AS_EXIT], [exit m4_default(]m4_dquote([$][1])[, 1)])]dnl
[if test "x$CONFIG_SHELL" = x; then
as_bourne_compatible="AS_ESCAPE(_m4_expand([_AS_BOURNE_COMPATIBLE]))"
_AS_DETECT_EXPAND([as_required], [_AS_DETECT_REQUIRED_BODY])
@ -429,7 +429,7 @@ test x$exitcode = x0[]])# _AS_SHELL_FN_WORK
# it is executed prior to shell function definitions, hence the
# temporary redefinition of AS_EXIT.
m4_defun([_AS_SHELL_SANITIZE],
[m4_pushdef([AS_EXIT], [exit m4_default([$1], 1)])]dnl
[m4_pushdef([AS_EXIT], [exit m4_default(]m4_dquote([$][1])[, 1)])]dnl
[m4_text_box([M4sh Initialization.])
AS_BOURNE_COMPATIBLE