diff options
| author | Akim Demaille <akim@epita.fr> | 2001-03-23 16:23:53 +0000 |
|---|---|---|
| committer | Akim Demaille <akim@epita.fr> | 2001-03-23 16:23:53 +0000 |
| commit | eedc18e1acd96c27225c1aff748b69247557f1b1 (patch) | |
| tree | 5021b18529be6f4a1e5922a761ec6fe696527e1c /m4/cond.m4 | |
| parent | eb13c416c71177a706573543459dd4ebbddf78d1 (diff) | |
| download | automake-eedc18e1acd96c27225c1aff748b69247557f1b1.tar.gz | |
* automake.in (read_am_file): TRUE and FALSE are predefined
conditionals.
(&by_condition): Adjust.
(&conditional_string): Recognize `TRUE' and `FALSE'.
(&make_condition): Use it.
* m4/cond.m4: Reject TRUE and FALSE as conditionals.
* automake.texi (Conditionals): Adjust.
* tests/cond9.test: s/FALSE/WRONG/.
Diffstat (limited to 'm4/cond.m4')
| -rw-r--r-- | m4/cond.m4 | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/m4/cond.m4 b/m4/cond.m4 index 86a562c37..ed09527bc 100644 --- a/m4/cond.m4 +++ b/m4/cond.m4 @@ -1,10 +1,21 @@ -# serial 2 +# serial 3 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. +# +# FIXME: Once using 2.50, use this: +# m4_match([$1], [^TRUE\|FALSE$], [AC_FATAL([$0: invalid condition: $1])])dnl AC_DEFUN([AM_CONDITIONAL], -[AC_SUBST([$1_TRUE]) +[ifelse([$1], [TRUE], + [errprint(__file__:__line__: [$0: invalid condition: $1 +])dnl +m4exit(1)])dnl +ifelse([$1], [FALSE], + [errprint(__file__:__line__: [$0: invalid condition: $1 +])dnl +m4exit(1)])dnl +AC_SUBST([$1_TRUE]) AC_SUBST([$1_FALSE]) if $2; then $1_TRUE= |