Re: [PATCH] Extract rm out of shell functions for AC_*_IFELSE

[Eric Blake]

Eric Blake <ebb9 <at> byu.net> writes:

> On closer inspection, the original code before patches 1-4 had the dnl there 
> (in other words, _AC_*_IFELSE did not end in a newline, because all clients 
> always supplied it,

Our emails crossed.  I'm pushing this cleanup:

From: Eric Blake <address@hidden>
Date: Thu, 23 Oct 2008 10:39:27 -0600
Subject: [PATCH] Avoid blank line introduced by recent shell functions.

* lib/autoconf/general.m4 (_AC_PREPROC_IFELSE)
(_AC_COMPILE_IFELSE, _AC_LINK_IFELSE, _AC_RUN_IFELSE): Restore
dnl.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog               |    7 +++++++
 lib/autoconf/general.m4 |   10 ++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 105d486..efdf32a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-23  Eric Blake  <address@hidden>
+
+       Avoid blank line introduced by recent shell functions.
+       * lib/autoconf/general.m4 (_AC_PREPROC_IFELSE)
+       (_AC_COMPILE_IFELSE, _AC_LINK_IFELSE, _AC_RUN_IFELSE): Restore
+       dnl.
+
 2008-10-23  Paolo Bonzini  <address@hidden>
 
        Ensure actions can look at conftest* files.
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 54d0922..de4527c 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -2408,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])
-rm -f conftest.err[]m4_ifval([$1], [ conftest.$ac_ext])
+rm -f conftest.err[]m4_ifval([$1], [ conftest.$ac_ext])[]dnl
 ])# _AC_PREPROC_IFELSE
 
 # AC_PREPROC_IFELSE(PROGRAM, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
@@ -2495,7 +2495,8 @@ 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])
-rm -f core conftest.err conftest.$ac_objext[]m4_ifval([$1], [ 
conftest.$ac_ext])
+rm -f core conftest.err conftest.$ac_objext[]m4_ifval([$1],
+  [ conftest.$ac_ext])[]dnl
 ])# _AC_COMPILE_IFELSE
 
 
@@ -2567,7 +2568,7 @@ AC_DEFUN([_AC_LINK_IFELSE],
 [m4_ifvaln([$1], [AC_LANG_CONFTEST([$1])])]dnl
 [AS_IF([ac_func_[]_AC_LANG_ABBREV[]_try_link "$LINENO"], [$2], [$3])
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext[]m4_ifval([$1], [ conftest.$ac_ext])
+    conftest$ac_exeext[]m4_ifval([$1], [ conftest.$ac_ext])[]dnl
 ])# _AC_LINK_IFELSE
 
 
@@ -2636,7 +2637,8 @@ AC_DEFUN([_AC_RUN_IFELSE],
 [m4_ifvaln([$1], [AC_LANG_CONFTEST([$1])])]dnl
 [AS_IF([ac_func_[]_AC_LANG_ABBREV[]_try_run "$LINENO"], [$2], [$3])
 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])
+  conftest.$ac_objext conftest$ac_exeext[]m4_ifval([$1],
+  [ conftest.$ac_ext])[]dnl
 ])# _AC_RUN_IFELSE
 
 # AC_RUN_IFELSE(PROGRAM,
-- 
1.6.0.2