|
From: <sv...@va...> - 2012-05-18 16:48:29
|
philippe 2012-05-18 17:48:20 +0100 (Fri, 18 May 2012)
New Revision: 12568
Log:
define AM_COND_IF if not yet defined (needed to build with automake 1.10)
Patch from Dave Goodell
Modified files:
trunk/configure.in
Modified: trunk/configure.in (+13 -0)
===================================================================
--- trunk/configure.in 2012-05-17 16:32:54 +01:00 (rev 12567)
+++ trunk/configure.in 2012-05-18 17:48:20 +01:00 (rev 12568)
@@ -616,6 +616,19 @@
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?
|