On 04/27/2012 10:19 AM, Stefano Lattarini wrote: > From: Peter Breitenlohner <p...@mppmu.mpg.de> > > * t/ext.sh: Enhance by adding a file with the '.mm' suffix in > the 'foo_SOURCES' definition. > * t/nodep2.sh: Likewise. > > Signed-off-by: Peter Breitenlohner <p...@mppmu.mpg.de> > Signed-off-by: Stefano Lattarini <stefano.lattar...@gmail.com> > Oops, this patch breaks the two affected tests when autoconf < 2.65 is used. I've squashed in the diffs below to solve this issue.
Regards, Stefano -*-*-*- diff --git a/t/ext.sh b/t/ext.sh index 08643ac..c62dbd3 100755 --- a/t/ext.sh +++ b/t/ext.sh @@ -22,7 +22,12 @@ cat >> configure.ac << 'END' AC_PROG_F77 AC_PROG_FC AC_PROG_OBJC -AC_PROG_OBJCXX +# FIXME: this is to cater to older autoconf; remove this once we +# FIXME: automake requires Autoconf 2.65 or later. +m4_ifdef([AC_PROG_OBJCXX], [AC_PROG_OBJCXX], [ + AC_SUBST([OBJCXX], [whocares]) + AM_CONDITIONAL([am__fastdepOBJCXX], [whocares]) +]) AM_PROG_UPC END diff --git a/t/nodep2.sh b/t/nodep2.sh index 45e7d5c..cc80058 100755 --- a/t/nodep2.sh +++ b/t/nodep2.sh @@ -30,7 +30,12 @@ AC_CONFIG_FILES([Makefile]) AC_PROG_CC AC_PROG_CXX AC_PROG_OBJC -AC_PROG_OBJCXX +# FIXME: this is to cater to older autoconf; remove this once we +# FIXME: automake requires Autoconf 2.65 or later. +m4_ifdef([AC_PROG_OBJCXX], [AC_PROG_OBJCXX], [ + AC_SUBST([OBJCXX], [whocares]) + AM_CONDITIONAL([am__fastdepOBJCXX], [whocares]) +]) AM_PROG_AS AM_PROG_GCJ AM_PROG_UPC