X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=libjava%2Fclasspath%2Fm4%2Facinclude.m4;h=9f98f1c37f6c817979648ca0123bc6732b297d16;hp=6c4eacda48669aa51c339761f917d77b144c742a;hb=f7d82ad4c1dc8a31bdaa6e43338309f8fcd7ac84;hpb=218627165fcb5acbc2e90f3afa3ffc2bc3445cf4;ds=sidebyside

diff --git a/libjava/classpath/m4/acinclude.m4 b/libjava/classpath/m4/acinclude.m4
index 6c4eacda486..9f98f1c37f6 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
+])])