Test for presence of bison and flex when building from git
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 10 lines · * Yannick Brosseau ([email protected]) wrote:
Signed-off-by Yannick Brosseau <[email protected]>--- configure.ac | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)configure.ac +0
-0
configure.ac LT_INIT · line 290
Quoted 5 lines
configure.ac +1
-1@@ -287,7 +287,19 @@ LT_INIT AC_PROG_YACC AC_PROG_LEX -AC_DEFUN([AC_PROG_BISON], [AC_CHECK_PROGS(BISON, bison, bison)]) +if test ! -f "src/lib/lttng-ctl/filter/filter-parser.h"; then
This test (and the other for filter-lexer.c) is incorrect for VPATH builds.
If someone grabs the tarball generated by make dist, extracts it in a "source" directory, and calls configure from a different build directory, this check behaves as if it was a git tree (missing .h/.c files).
Thoughts ?
Thanks,
Mathieu
Quoted 23 lines
configure.ac +12
-0+ if test x"$YACC" != "xbison -y"; then + AC_MSG_ERROR([[bison not found and is required when building from git. + Please install bison]]) + fi +fi + +if test ! -f "src/lib/lttng-ctl/filter/filter-lexer.c"; then + if test x"$LEX" != "xflex"; then + AC_MSG_ERROR([[flex not found and is required when building from git. + Please install flex]]) + fi +fi CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing"Signature · 7 lines
1.7.10.4 _______________________________________________ lttng-dev mailing list [email protected] http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
Signature · 3 lines
Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com
A message that is not in the archive (sent off-list or not yet received): 20130717175403.GC25326@Krystal
Quoted 1 line · * Mathieu Desnoyers ([email protected]) wrote:
* Yannick Brosseau ([email protected]) wrote:
[...]
Quoted 7 lines
This test (and the other for
filter-lexer.c) is incorrect for VPATH builds.If someone grabs the tarball generated by make dist, extracts it in a "source" directory, and calls configure from a different build directory, this check behaves as if it was a git tree (missing .h/.c files).
How about this instead ?
---
configure.ac +13 -1
@@ -287,7 +287,19 @@ LT_INIT AC_PROG_YACC AC_PROG_LEX -AC_DEFUN([AC_PROG_BISON], [AC_CHECK_PROGS(BISON, bison, bison)]) +if test ! -f "$srcdir/src/lib/lttng-ctl/filter/filter-parser.h"; then + if test x"$YACC" != "xbison -y"; then + AC_MSG_ERROR([[bison not found and is required when building from git. + Please install bison]]) + fi +fi + +if test ! -f "$srcdir/src/lib/lttng-ctl/filter/filter-lexer.c"; then + if test x"$LEX" != "xflex"; then + AC_MSG_ERROR([[flex not found and is required when building from git. + Please install flex]]) + fi +fi CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing"
Signature · 3 lines
Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com
A message that is not in the archive (sent off-list or not yet received): 20130717180057.GA25533@Krystal
Quoted 11 lines · Mathieu Desnoyers
Quoted 1 line · * Mathieu Desnoyers ([email protected]) wrote:
* Yannick Brosseau ([email protected]) wrote:
[...]
Quoted 7 lines
This test (and the other for
filter-lexer.c) is incorrect for VPATH builds.If someone grabs the tarball generated by make dist, extracts it in a "source" directory, and calls configure from a different build directory, this check behaves as if it was a git tree (missing .h/.c files).
How about this instead ?
I'm not sure if $topdir or $srcdir would be the right one to use, but yes the idea would work.
Quoted 27 lines
---
configure.ac +13
-1@@ -287,7 +287,19 @@ LT_INIT AC_PROG_YACC AC_PROG_LEX -AC_DEFUN([AC_PROG_BISON], [AC_CHECK_PROGS(BISON, bison, bison)]) +if test ! -f "$srcdir/src/lib/lttng-ctl/filter/filter-parser.h"; then + if test x"$YACC" != "xbison -y"; then + AC_MSG_ERROR([[bison not found and is required when building from git. + Please install bison]]) + fi +fi + +if test ! -f "$srcdir/src/lib/lttng-ctl/filter/filter-lexer.c"; then + if test x"$LEX" != "xflex"; then + AC_MSG_ERROR([[flex not found and is required when building from git. + Please install flex]]) + fi +fi CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing"
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 7 lines · * Yannick Brosseau ([email protected]) wrote:
Quoted 6 lines · Mathieu Desnoyers
Quoted 1 line · * Mathieu Desnoyers ([email protected]) wrote:
* Yannick Brosseau ([email protected]) wrote:
[...]
Quoted 3 lines
This test (and the other for
filter-lexer.c) is incorrect for VPATH builds.
Quoted 8 lines
Quoted 5 lines
Quoted 4 lines
If someone grabs the tarball generated by make dist, extracts it in a "source" directory, and calls configure from a different build directory, this check behaves as if it was a git tree (missing .h/.c files).
How about this instead ?
I'm not sure if $topdir or $srcdir would be the right one to use, but yes the idea would work.
$srcdir will specifically test to see if those .c/.h files are in the source tree (not caring about the build tree), and I think this is
correct: we indeed want to check if the files are present in the source tree.
If they happen to be present in the build tree, but not in the source tree, we might want to update them at some point, because we clearly know we're working on a non-distribution-tree (git tree), so in that case we want to ensure bison/flex are there.
Does it make sense ?
Thanks,
Mathieu
Quoted 29 lines
Quoted 28 lines
---
configure.ac +13
-1@@ -287,7 +287,19 @@ LT_INIT AC_PROG_YACC AC_PROG_LEX -AC_DEFUN([AC_PROG_BISON], [AC_CHECK_PROGS(BISON, bison, bison)]) +if test ! -f "$srcdir/src/lib/lttng-ctl/filter/filter-parser.h"; then + if test x"$YACC" != "xbison -y"; then + AC_MSG_ERROR([[bison not found and is required when building from git. + Please install bison]]) + fi +fi + +if test ! -f "$srcdir/src/lib/lttng-ctl/filter/filter-lexer.c"; then + if test x"$LEX" != "xflex"; then + AC_MSG_ERROR([[flex not found and is required when building from git. + Please install flex]]) + fi +fi CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing"
Signature · 3 lines
Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com