[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU Autoconf source repository branch, master, updated. v2.63-90-g
From: |
Paolo Bonzini |
Subject: |
[SCM] GNU Autoconf source repository branch, master, updated. v2.63-90-g1cab7ac |
Date: |
Thu, 23 Oct 2008 16:02:35 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Autoconf source repository".
http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=1cab7acd4abccf8cae7c8b68ff43e33a05d7df29
The branch, master has been updated
via 1cab7acd4abccf8cae7c8b68ff43e33a05d7df29 (commit)
from f6ca9fec69fc0aa2128672bef992f4f836cc78b6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1cab7acd4abccf8cae7c8b68ff43e33a05d7df29
Author: Paolo Bonzini <address@hidden>
Date: Thu Oct 23 17:58:53 2008 +0200
Ensure actions can look at conftest* files.
* lib/autoconf/general.m4 (_AC_PREPROC_IFELSE_BODY,
_AC_COMPILE_IFELSE_BODY, _AC_LINK_IFELSE_BODY, _AC_RUN_IFELSE_BODY):
Move rm commands, except IPA files and Apple debug symbols...
(_AC_PREPROC_IFELSE, __AC_COMPILE_IFELSE, _AC_LINK_IFELSE,
_AC_RUN_IFELSE): ...in here.
* tests/compile.at: Add regression test.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 10 ++++++++++
lib/autoconf/general.m4 | 26 ++++++++++++--------------
tests/compile.at | 46 ++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 68 insertions(+), 14 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index cf280c1..105d486 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-10-23 Paolo Bonzini <address@hidden>
+
+ Ensure actions can look at conftest* files.
+ * lib/autoconf/general.m4 (_AC_PREPROC_IFELSE_BODY,
+ _AC_COMPILE_IFELSE_BODY, _AC_LINK_IFELSE_BODY, _AC_RUN_IFELSE_BODY):
+ Move rm commands, except IPA files and Apple debug symbols...
+ (_AC_PREPROC_IFELSE, __AC_COMPILE_IFELSE, _AC_LINK_IFELSE,
+ _AC_RUN_IFELSE): ...in here.
+ * tests/compile.at: Add regression test.
+
2008-10-23 Eric Blake <address@hidden>
Remove excess dnl from m4sh.
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 21959df..54d0922 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -2390,7 +2390,6 @@ m4_define([_AC_PREPROC_IFELSE_BODY],
[ac_retval=0],
[_AC_MSG_LOG_CONFTEST
ac_retval=1])
- rm -f conftest.err
AS_LINENO_POP
return $ac_retval
])# _AC_PREPROC_IFELSE_BODY
@@ -2409,7 +2408,7 @@ AC_DEFUN([_AC_PREPROC_IFELSE],
[$0_BODY])]dnl
[m4_ifvaln([$1], [AC_LANG_CONFTEST([$1])])]dnl
[AS_IF([ac_func_[]_AC_LANG_ABBREV[]_try_cpp "$LINENO"], [$2], [$3])
-m4_ifvaln([$1], [rm -f conftest.$ac_ext])dnl
+rm -f conftest.err[]m4_ifval([$1], [ conftest.$ac_ext])
])# _AC_PREPROC_IFELSE
# AC_PREPROC_IFELSE(PROGRAM, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
@@ -2480,7 +2479,6 @@ m4_define([_AC_COMPILE_IFELSE_BODY],
[ac_retval=0],
[_AC_MSG_LOG_CONFTEST
ac_retval=1])
- rm -f core conftest.err conftest.$ac_objext
AS_LINENO_POP
return $ac_retval
])# _AC_COMPILE_IFELSE_BODY
@@ -2497,7 +2495,7 @@ AC_DEFUN([_AC_COMPILE_IFELSE],
[$0_BODY])]dnl
[m4_ifvaln([$1], [AC_LANG_CONFTEST([$1])])]dnl
[AS_IF([ac_func_[]_AC_LANG_ABBREV[]_try_compile "$LINENO"], [$2], [$3])
-m4_ifvaln([$1], [rm -f conftest.$ac_ext])dnl
+rm -f core conftest.err conftest.$ac_objext[]m4_ifval([$1], [
conftest.$ac_ext])
])# _AC_COMPILE_IFELSE
@@ -2540,12 +2538,11 @@ m4_define([_AC_LINK_IFELSE_BODY],
[ac_retval=0],
[_AC_MSG_LOG_CONFTEST
ac_retval=1])
- # Delete also the IPA/IPO (Inter Procedural Analysis/Optimization)
- # information created by the PGI compiler (conftest_ipa8_conftest.oo),
- # as it would interfere with the next link command.
- rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext
+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+ # interfere with the next link command; also delete a directory that is
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
AS_LINENO_POP
return $ac_retval
])# _AC_LINK_IFELSE_BODY
@@ -2569,7 +2566,8 @@ AC_DEFUN([_AC_LINK_IFELSE],
[$0_BODY])]dnl
[m4_ifvaln([$1], [AC_LANG_CONFTEST([$1])])]dnl
[AS_IF([ac_func_[]_AC_LANG_ABBREV[]_try_link "$LINENO"], [$2], [$3])
-m4_ifvaln([$1], [rm -f conftest.$ac_ext])dnl
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext[]m4_ifval([$1], [ conftest.$ac_ext])
])# _AC_LINK_IFELSE
@@ -2616,8 +2614,7 @@ m4_define([_AC_RUN_IFELSE_BODY],
[AS_ECHO(["$as_me: program exited with status $ac_status"])
>&AS_MESSAGE_LOG_FD
_AC_MSG_LOG_CONFTEST
ac_retval=$ac_status])
- rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext
conftest.$ac_objext conftest$ac_exeext
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
AS_LINENO_POP
return $ac_retval
])# _AC_RUN_IFELSE_BODY
@@ -2638,7 +2635,8 @@ AC_DEFUN([_AC_RUN_IFELSE],
[$0_BODY])]dnl
[m4_ifvaln([$1], [AC_LANG_CONFTEST([$1])])]dnl
[AS_IF([ac_func_[]_AC_LANG_ABBREV[]_try_run "$LINENO"], [$2], [$3])
-m4_ifvaln([$1], [rm -f conftest.$ac_ext])dnl
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest$ac_exeext[]m4_ifval([$1], [ conftest.$ac_ext])
])# _AC_RUN_IFELSE
# AC_RUN_IFELSE(PROGRAM,
diff --git a/tests/compile.at b/tests/compile.at
index 6ee22ae..ba931fc 100644
--- a/tests/compile.at
+++ b/tests/compile.at
@@ -141,6 +141,52 @@ AT_CHECK_CONFIGURE([-q])
AT_CLEANUP
+## -------------------------- ##
+## Order of `rm' and actions. ##
+## -------------------------- ##
+
+AT_SETUP([Order of user actions and cleanup])
+AT_DATA([configure.ac],
+[[AC_INIT
+AC_PROG_CC
+
+AC_PREPROC_IFELSE([AC_LANG_PROGRAM([int ok;], [])],
+ [test -f conftest.err || AS_EXIT([1])],
+ [AS_EXIT([1])])
+AC_PREPROC_IFELSE([AC_LANG_PROGRAM([#define 12 34], [])],
+ [AS_EXIT([1])],
+ [test -f conftest.err || AS_EXIT([1])])
+
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int ok;], [])],
+ [test -f conftest.$ac_objext || AS_EXIT([1])],
+ [AS_EXIT([1])])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int bad bad;], [])],
+ [AS_EXIT([1])],
+ [test -f conftest.err || AS_EXIT([1])])
+
+AC_LINK_IFELSE([AC_LANG_PROGRAM([int ok;], [])],
+ [test -f conftest$ac_exeext || AS_EXIT([1])],
+ [AS_EXIT([1])])
+AC_LINK_IFELSE([AC_LANG_PROGRAM([int bad bad;], [])],
+ [AS_EXIT([1])],
+ [test -f conftest.err || AS_EXIT([1])])
+
+AC_RUN_IFELSE([AC_LANG_PROGRAM([int ok;], [])],
+ [./conftest$ac_exeext || AS_EXIT([1])],
+ [AS_EXIT([1])])
+
+d@&address@hidden conftest.err not generated by AC_RUN_IFELSE?
+AC_RUN_IFELSE([AC_LANG_PROGRAM([int bad bad;], [])],
+ [AS_EXIT([1])],
+ [])
+]])
+
+AT_CHECK_AUTOCONF
+AT_CHECK_CONFIGURE([-q])
+
+AT_CLEANUP
+
+
## ------------------ ##
## AC_TRY_LINK_FUNC. ##
## ------------------ ##
hooks/post-receive
--
GNU Autoconf source repository
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU Autoconf source repository branch, master, updated. v2.63-90-g1cab7ac,
Paolo Bonzini <=