diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-04-28 11:07:34 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-04-28 11:07:34 +0200 |
| commit | ad5c2a2891320be4071a92ed8a5cf7bfd0ef08a5 (patch) | |
| tree | feec4cc69bc750e30469b809ebcf8a6faf1805f6 /t/lex-libobj.sh | |
| parent | 9500eebfbe5b5fc58e59e78b537b6a713decc9d0 (diff) | |
| parent | 83249bd36c0cd76d80addc8bc0ab5db565635316 (diff) | |
| download | automake-ad5c2a2891320be4071a92ed8a5cf7bfd0ef08a5.tar.gz | |
Merge branch 'master' into ng/master
* master:
fixup: avoid unconditional re-bootstrapping on "make dist"
build: ensure release year in copyright notice is up-to-date
cosmetics: fix spacing in THANKS
readme: explicitly state we use ranges in copyright years
aclocal: remove the --acdir option
bootstrap: add convenience make target
m4: delete several obsolete macros
automake, aclocal: update copyright year in output
maint: don't use "union" merge driver for NEWS anymore
build: avoid too greedy rebuilds in the testsuite
tests: avoid yet another spurious environment influence
tests: fix a failure in Lex/C++ tests on Mac OS X
tests: fix a spurious failure due to truncated timestamps
build: require autoconf 2.69
build: don't require minimal automake version in AM_INIT_AUTOMAKE
post-release: major version bump
post-release: minor version bump
release: stable major release 1.12
tests: cater to systems installing libs in /lib64
tests: fix spurious failure on Mac OS X
Diffstat (limited to 't/lex-libobj.sh')
| -rwxr-xr-x | t/lex-libobj.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/t/lex-libobj.sh b/t/lex-libobj.sh index 930bb92b3..3e583cc8a 100755 --- a/t/lex-libobj.sh +++ b/t/lex-libobj.sh @@ -67,8 +67,13 @@ grep LIBOBJS Makefile # For debugging. $MAKE $MAKE distclean -# Force "no system lex library". -./configure LEXLIB='-L /lib' +# Force "no system lex library". Setting LEXLIB to a non-empty value +# ensures that configure won't search for a "lex library", and simply +# rely on the LEXLIB to provide it, if needed. So, by setting LEXLIB +# to a blank but non-empty value we can fool configure into thinking +# that no system-level library providing a 'yywrap' function is +# available. See also discussion on automake bug#11306. +./configure LEXLIB=' ' grep LIBOBJS Makefile # For debugging. grep '^LIBOBJS *=.*yywrap.*\.o' Makefile # Sanity check. $MAKE |