|
From: Arnout V. (Essensium/Mind) <ar...@mi...> - 2011-09-28 09:35:10
|
From: "Arnout Vandecappelle (Essensium/Mind)" <ar...@mi...> autoconf 2.68 doesn't produce a newline at the end of AS_IF(). Therefore, the 'done' of the for loop gets concatenated with the 'fi' of AS_IF(). Adding an explicit newline fixes it. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <ar...@mi...> --- config/m4/bs.m4 | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/config/m4/bs.m4 b/config/m4/bs.m4 index 9f767e5..7d98ec4 100644 --- a/config/m4/bs.m4 +++ b/config/m4/bs.m4 @@ -113,6 +113,7 @@ BS_CHECK_KHEADER($ac_header, [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_$ac_header)) $2], [$3], [$4])dnl + done ])# BS_CHECK_KHEADERS -- 1.7.6.3 |
|
From: Arnout V. (Essensium/Mind) <ar...@mi...> - 2011-09-28 11:07:10
|
From: "Arnout Vandecappelle (Essensium/Mind)" <ar...@mi...>
autoconf 2.68 doesn't produce a newline at the end of AS_IF().
Therefore, whatever follows it gets concatenated with the 'fi' of AS_IF().
Removing dnl at the end of AS_IF resolves this.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <ar...@mi...>
---
Changes v2:
* Remove dnl instead of adding extra line.
* It's required in another place too.
* Updated log comment.
---
config/m4/bs.m4 | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/config/m4/bs.m4 b/config/m4/bs.m4
index 9f767e5..6b0af1e 100644
--- a/config/m4/bs.m4
+++ b/config/m4/bs.m4
@@ -71,7 +71,7 @@ rm -f conftest.$bs_kmodext conftest.o
AS_IF([_AC_EVAL_STDERR($bs_kcompile > /dev/null)],
[$2],
[_AC_MSG_LOG_CONFTEST
-m4_ifvaln([$3],[$3])dnl])dnl
+m4_ifvaln([$3],[$3])dnl])
rm -f conftest.err conftest.$bs_kmodext conftest.o .conftest.o.d .conftest.o.cmd .conftest.ko.cmd .conftest.mod.o.cmd .tmp_versions/conftest.mod Makefile m4_ifval([$1], [conftest.$ac_ext]); rmdir .tmp_versions[]dnl
])# BS_KCOMPILE_IFELSE
@@ -96,7 +96,7 @@ AC_CACHE_CHECK([for $1], ac_Header,
@%:@include <$1>])],
[AS_VAR_SET(ac_Header, yes)],
[AS_VAR_SET(ac_Header, no)])])
-AS_IF([test AS_VAR_GET(ac_Header) = yes], [$2], [$3])[]dnl
+AS_IF([test AS_VAR_GET(ac_Header) = yes], [$2], [$3])
AS_VAR_POPDEF([ac_Header])dnl
])# BS_CHECK_HEADER
--
1.7.6.3
|
|
From: Jan K. <jan...@si...> - 2011-10-25 12:33:42
|
On 2011-09-28 13:06, Arnout Vandecappelle (Essensium/Mind) wrote: > From: "Arnout Vandecappelle (Essensium/Mind)" <ar...@mi...> > > autoconf 2.68 doesn't produce a newline at the end of AS_IF(). > Therefore, whatever follows it gets concatenated with the 'fi' of AS_IF(). > > Removing dnl at the end of AS_IF resolves this. > > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <ar...@mi...> Thanks, applied. Jan -- Siemens AG, Corporate Technology, CT T DE IT 1 Corporate Competence Center Embedded Linux |
|
From: Wolfgang G. <wg...@gr...> - 2011-10-25 14:19:00
|
On 09/28/2011 11:34 AM, Arnout Vandecappelle (Essensium/Mind) wrote: > From: "Arnout Vandecappelle (Essensium/Mind)" <ar...@mi...> > > autoconf 2.68 doesn't produce a newline at the end of AS_IF(). > Therefore, the 'done' of the for loop gets concatenated with the > 'fi' of AS_IF(). > > Adding an explicit newline fixes it. > > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <ar...@mi...> With my autoconf and related tools (coming with ubuntu 11.04) I get a strange "fidone" line in "configure" after re-generating it: $ autoconf --version autoconf (GNU Autoconf) 2.67 $ ./scripts/autogen.sh $ grep fidone configure fidone This patch fixes the problem, therefore... Acked-by: Wolfgang Grandegger <wg...@de...> > --- > config/m4/bs.m4 | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/config/m4/bs.m4 b/config/m4/bs.m4 > index 9f767e5..7d98ec4 100644 > --- a/config/m4/bs.m4 > +++ b/config/m4/bs.m4 > @@ -113,6 +113,7 @@ BS_CHECK_KHEADER($ac_header, > [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_$ac_header)) $2], > [$3], > [$4])dnl > + > done > ])# BS_CHECK_KHEADERS > |
|
From: Anders B. <and...@co...> - 2011-10-25 14:44:07
|
On 10/25/2011 03:12 PM, Wolfgang Grandegger wrote: > On 09/28/2011 11:34 AM, Arnout Vandecappelle (Essensium/Mind) wrote: >> From: "Arnout Vandecappelle (Essensium/Mind)"<ar...@mi...> >> >> autoconf 2.68 doesn't produce a newline at the end of AS_IF(). >> Therefore, the 'done' of the for loop gets concatenated with the >> 'fi' of AS_IF(). >> >> Adding an explicit newline fixes it. >> >> Signed-off-by: Arnout Vandecappelle (Essensium/Mind)<ar...@mi...> > > With my autoconf and related tools (coming with ubuntu 11.04) I get a > strange "fidone" line in "configure" after re-generating it: > > $ autoconf --version > autoconf (GNU Autoconf) 2.67 > $ ./scripts/autogen.sh > $ grep fidone configure > fidone > > This patch fixes the problem, therefore... > > Acked-by: Wolfgang Grandegger<wg...@de...> > >> --- >> config/m4/bs.m4 | 1 + >> 1 files changed, 1 insertions(+), 0 deletions(-) >> >> diff --git a/config/m4/bs.m4 b/config/m4/bs.m4 >> index 9f767e5..7d98ec4 100644 >> --- a/config/m4/bs.m4 >> +++ b/config/m4/bs.m4 >> @@ -113,6 +113,7 @@ BS_CHECK_KHEADER($ac_header, >> [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_$ac_header)) $2], >> [$3], >> [$4])dnl Dropping the dnl instead, perhaps? >> + >> done >> ])# BS_CHECK_KHEADERS Regards Anders Blomdell -- Anders Blomdell Email: and...@co... Department of Automatic Control Lund University Phone: +46 46 222 4625 P.O. Box 118 Fax: +46 46 138118 SE-221 00 Lund, Sweden |
|
From: Jan K. <jan...@si...> - 2011-10-25 14:57:19
|
On 2011-10-25 16:20, Anders Blomdell wrote: > On 10/25/2011 03:12 PM, Wolfgang Grandegger wrote: >> On 09/28/2011 11:34 AM, Arnout Vandecappelle (Essensium/Mind) wrote: >>> From: "Arnout Vandecappelle (Essensium/Mind)"<ar...@mi...> >>> >>> autoconf 2.68 doesn't produce a newline at the end of AS_IF(). >>> Therefore, the 'done' of the for loop gets concatenated with the >>> 'fi' of AS_IF(). >>> >>> Adding an explicit newline fixes it. >>> >>> Signed-off-by: Arnout Vandecappelle (Essensium/Mind)<ar...@mi...> >> >> With my autoconf and related tools (coming with ubuntu 11.04) I get a >> strange "fidone" line in "configure" after re-generating it: >> >> $ autoconf --version >> autoconf (GNU Autoconf) 2.67 >> $ ./scripts/autogen.sh >> $ grep fidone configure >> fidone >> >> This patch fixes the problem, therefore... >> >> Acked-by: Wolfgang Grandegger<wg...@de...> >> >>> --- >>> config/m4/bs.m4 | 1 + >>> 1 files changed, 1 insertions(+), 0 deletions(-) >>> >>> diff --git a/config/m4/bs.m4 b/config/m4/bs.m4 >>> index 9f767e5..7d98ec4 100644 >>> --- a/config/m4/bs.m4 >>> +++ b/config/m4/bs.m4 >>> @@ -113,6 +113,7 @@ BS_CHECK_KHEADER($ac_header, >>> [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_$ac_header)) $2], >>> [$3], >>> [$4])dnl > Dropping the dnl instead, perhaps? I've merged v2 (but didn't push it yet). If there is anything which can be done nicer, drop me a note - or a patch. Jan -- Siemens AG, Corporate Technology, CT T DE IT 1 Corporate Competence Center Embedded Linux |
