diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2008-07-15 22:01:27 +0000 |
|---|---|---|
| committer | Ralf Wildenhues <rwild@gcc.gnu.org> | 2008-07-15 22:01:27 +0000 |
| commit | a47ac9746589172d6bfe1398123b49d1b2a814cf (patch) | |
| tree | 14744adda1b6a2c574402552621714a832429e95 /libjava/classpath/m4 | |
| parent | 25ae96c70c27bbbcb463aa03c96606bae4773aa4 (diff) | |
| download | gcc-a47ac9746589172d6bfe1398123b49d1b2a814cf.zip gcc-a47ac9746589172d6bfe1398123b49d1b2a814cf.tar.gz gcc-a47ac9746589172d6bfe1398123b49d1b2a814cf.tar.bz2 | |
acinclude.m4 (CLASSPATH_COND_IF): New macro.
libjava/classpath/
* m4/acinclude.m4 (CLASSPATH_COND_IF): New macro.
* configure.ac: Use it.
* configure: Regenerate.
* tools/Makefile.am (!CREATE_WRAPPERS): Update comment.
From-SVN: r137851
Diffstat (limited to 'libjava/classpath/m4')
| -rw-r--r-- | libjava/classpath/m4/acinclude.m4 | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/libjava/classpath/m4/acinclude.m4 b/libjava/classpath/m4/acinclude.m4 index 6c4eacd..9f98f1c3 100644 --- a/libjava/classpath/m4/acinclude.m4 +++ b/libjava/classpath/m4/acinclude.m4 @@ -246,3 +246,19 @@ EOF rm -f $JAVA_TEST $CLASS_TEST AC_SUBST(JAVAC_MEM_OPT) ]) + +dnl --------------------------------------------------------------- +dnl CLASSPATH_COND_IF(COND, SHELL-CONDITION, [IF-TRUE], [IF-FALSE]) +dnl --------------------------------------------------------------- +dnl Automake 1.11 can emit conditional rules for AC_CONFIG_FILES, +dnl using AM_COND_IF. This wrapper uses it if it is available, +dnl otherwise falls back to code compatible with Automake 1.9.6. +AC_DEFUN([CLASSPATH_COND_IF], +[m4_ifdef([AM_COND_IF], + [AM_COND_IF([$1], [$3], [$4])], + [if $2; then + m4_default([$3], [:]) + else + m4_default([$4], [:]) + fi +])]) |