From a47ac9746589172d6bfe1398123b49d1b2a814cf Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Tue, 15 Jul 2008 22:01:27 +0000 Subject: 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 --- libjava/classpath/m4/acinclude.m4 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'libjava/classpath/m4') 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 +])]) -- cgit v1.1