From: Ben Pfaff Date: Wed, 16 Jul 2008 17:18:35 +0000 (-0700) Subject: Make PSPP_LINK2_IFELSE macro work with Autoconf earlier than 2.62. X-Git-Tag: v0.7.0~16^2 X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26b487c57f0f8e495929dec6e0a25971dbfd76bf;p=pspp-builds.git Make PSPP_LINK2_IFELSE macro work with Autoconf earlier than 2.62. --- diff --git a/acinclude.m4 b/acinclude.m4 index 10ea269b..11154ee3 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -223,7 +223,7 @@ mv conftest.$ac_ext conftest1.$ac_ext m4_ifvaln([$2], [AC_LANG_CONFTEST([$2])])dnl mv conftest.$ac_ext conftest2.$ac_ext rm -f conftest1.$ac_objext conftest2.$ac_objext conftest$ac_exeext -pspp_link2='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest1.$ac_ext conftest2.$ac_ext $LIBS >&AS_MESSAGE_LOG_FD' +pspp_link2='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest1.$ac_ext conftest2.$ac_ext $LIBS >&5' AS_IF([_AC_DO_STDERR($pspp_link2) && { test -z "$ac_[]_AC_LANG_ABBREV[]_werror_flag" || test ! -s conftest.err @@ -232,10 +232,10 @@ AS_IF([_AC_DO_STDERR($pspp_link2) && { AS_TEST_X([conftest$ac_exeext]) }], [$3], - [AS_ECHO(["$as_me: failed source file 1 of 2 was:"]) >&AS_MESSAGE_LOG_FD -sed 's/^/| /' conftest1.$ac_ext >&AS_MESSAGE_LOG_FD -AS_ECHO(["$as_me: failed source file 2 of 2 was:"]) >&AS_MESSAGE_LOG_FD -sed 's/^/| /' conftest2.$ac_ext >&AS_MESSAGE_LOG_FD + [echo "$as_me: failed source file 1 of 2 was:" >&5 +sed 's/^/| /' conftest1.$ac_ext >&5 +echo "$as_me: failed source file 2 of 2 was:" >&5 +sed 's/^/| /' conftest2.$ac_ext >&5 $4]) dnl Delete also the IPA/IPO (Inter Procedural Analysis/Optimization) dnl information created by the PGI compiler (conftest_ipa8_conftest.oo),