From 85cadc4e7738b84cc107b2f7a2adad5a2fa29005 Mon Sep 17 00:00:00 2001 From: Peter Rosin Date: Wed, 1 Feb 2012 15:47:45 +0100 Subject: [PATCH] tests: put AM_PROG_CC_C_O before AC_OUTPUT to help losing compilers When AM_PROG_CC_C_O is after AC_OUTPUT, the compile script is not used even if needed, causing testsuite fails if libtool is not used. * tests/depcomp8a.test: Uncomment the AM_PROG_CC_C_O macro in its correct location, as indicated... (configure.in): ...with this comment. * tests/depcomp8b.test: Sync with tests/depcomp8a.test. --- tests/depcomp8a.test | 4 +++- tests/depcomp8b.test | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/depcomp8a.test b/tests/depcomp8a.test index ea14c3f..b94cf1d 100755 --- a/tests/depcomp8a.test +++ b/tests/depcomp8a.test @@ -25,6 +25,7 @@ set -e cat >> configure.in << 'END' AC_PROG_CC +#x AM_PROG_CC_C_O AC_OUTPUT END @@ -61,7 +62,8 @@ DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' $MAKE distcheck # Try again with subdir-objects option. -echo AM_PROG_CC_C_O >> configure.in +sed 's/#x //' configure.in >configure.int +mv -f configure.int configure.in echo AUTOMAKE_OPTIONS = subdir-objects >> Makefile.am $ACLOCAL diff --git a/tests/depcomp8b.test b/tests/depcomp8b.test index d36e754..715d951 100755 --- a/tests/depcomp8b.test +++ b/tests/depcomp8b.test @@ -26,6 +26,7 @@ set -e cat >> configure.in << 'END' AC_PROG_CC +#x AM_PROG_CC_C_O AC_PROG_LIBTOOL AC_OUTPUT END @@ -56,7 +57,8 @@ DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' $MAKE distcheck # Try again with subdir-objects option. -echo AM_PROG_CC_C_O >> configure.in +sed 's/#x //' configure.in >configure.int +mv -f configure.int configure.in echo AUTOMAKE_OPTIONS = subdir-objects >> Makefile.am $ACLOCAL -- 2.7.4