diff options
author | Alexandre Duret-Lutz <adl@gnu.org> | 2006-04-09 07:46:56 +0000 |
---|---|---|
committer | Alexandre Duret-Lutz <adl@gnu.org> | 2006-04-09 07:46:56 +0000 |
commit | d2e347928cea947cfcf19eefea2bc975ecb6e092 (patch) | |
tree | 2c70a2a22fdf7ad6120d97995068eda5a2e4962d /m4/cond.m4 | |
parent | f207e1361964855562080cb4db70afe14776a629 (diff) | |
download | automake-d2e347928cea947cfcf19eefea2bc975ecb6e092.tar.gz |
* automake.in (%ignored_configure_vars): New variable.
(scan_autoconf_traces): Trace for _AM_SUBST_NOTMAKE and fill
%ignored_configure_vars.
(define_configure_variable): Declare ignored configure variables
as VAR_SILENT. Do not special-case AMDEPBACKSLASH and ANSI2KNR
w.r.t. VAR_SILENT.
* m4/substign.m4: New file.
* m4/Makefile.am (dist_m4data_DATA): Add substign.m4.
* m4/cond.m4: _AM_SUBST_IGNORE $1_TRUE and $1_FALSE (PR automake/477).
* m4/depend.m4: _AM_SUBST_IGNORE AMDEPBACKSLASH.
* m4/protos.m4: _AM_SUBST_IGNORE ANSI2KNR.
* tests/cond.test: Make sure TEST_FALSE and TEST_TRUE are not defined.
* tests/amsubst.test: New file.
* tests/Makefile.am (TESTS): Add it.
Diffstat (limited to 'm4/cond.m4')
-rw-r--r-- | m4/cond.m4 | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/m4/cond.m4 b/m4/cond.m4 index a8131aeea..d9a58d2f3 100644 --- a/m4/cond.m4 +++ b/m4/cond.m4 @@ -1,13 +1,13 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 7 +# serial 8 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- @@ -16,8 +16,10 @@ AC_DEFUN([AM_CONDITIONAL], [AC_PREREQ(2.52)dnl ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE]) -AC_SUBST([$1_FALSE]) +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl if $2; then $1_TRUE= $1_FALSE='#' |