]> git.ipfire.org Git - thirdparty/valgrind.git/commitdiff
define AM_COND_IF if not yet defined (needed to build with automake 1.10)
authorPhilippe Waroquiers <philippe.waroquiers@skynet.be>
Fri, 18 May 2012 16:48:20 +0000 (16:48 +0000)
committerPhilippe Waroquiers <philippe.waroquiers@skynet.be>
Fri, 18 May 2012 16:48:20 +0000 (16:48 +0000)
Patch from Dave Goodell

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12568

configure.in

index 69544b4a5ec5c06be0a7709f2ef4563e77f3d832..5b462444ec0e8c7cea1a8796fb93c96c85199473 100644 (file)
@@ -616,6 +616,19 @@ AM_CONDITIONAL(VGCONF_OS_IS_DARWIN,
 AM_CONDITIONAL(VGCONF_HAVE_PLATFORM_SEC,
                test x$VGCONF_PLATFORM_SEC_CAPS != x)
 
+dnl automake-1.10 does not have AM_COND_IF (added in 1.11), so we supply a
+dnl fallback definition
+dnl The macro is courtesy of Dave Hart:
+dnl   https://lists.gnu.org/archive/html/automake/2010-12/msg00045.html
+m4_ifndef([AM_COND_IF], [AC_DEFUN([AM_COND_IF], [
+if test -z "$$1_TRUE"; then :
+  m4_n([$2])[]dnl
+m4_ifval([$3],
+[else
+  $3
+])dnl
+fi[]dnl
+])])
 
 #----------------------------------------------------------------------------
 # Inner Valgrind?