diff options
| author | Tom Tromey <tromey@redhat.com> | 2008-07-15 15:33:50 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2008-07-15 15:33:50 +0000 |
| commit | 17564e262cb39a88c3f268d8b92bc286c974539d (patch) | |
| tree | 989721a7ff87c98b86a0e281caebe9d32de5009c /m4 | |
| parent | 6b1d2855ed48c2b6f4afe3008238ebb2ab797a22 (diff) | |
| download | classpath-17564e262cb39a88c3f268d8b92bc286c974539d.tar.gz | |
2008-07-15 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>libgcj-import-20080811
* m4/acinclude.m4 (CLASSPATH_COND_IF): New macro.
* configure.ac: Use it.
* tools/Makefile.am (!CREATE_WRAPPERS): Update comment.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/acinclude.m4 | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 index 7990e6360..18af91c51 100644 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -260,3 +260,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 +])]) |