use configure-provided awk variable for portability; add loadlibes variable to c...

diff --git a/NEWS b/NEWS
index 003d572f9d147616cf6fcfb9fae7366cbb70f025..78622625222953664e2c351dfce100cbfcf14219 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ changes between releases of flex.
 See the file COPYING for copying conditions.
 
 * after version 2.5.33
+** portability fixes to some unit tests
 
 ** new ca,  vi, ga, nl translations from the translation project
 

diff --git a/tests/test-c++-basic/Makefile.am b/tests/test-c++-basic/Makefile.am
index 1fc579df05e2d56c83082fd4df561028721f44a5..a90e75a55cce6d360fab6baf8d3885a4a71e154a 100644 (file)
--- a/tests/test-c++-basic/Makefile.am
+++ b/tests/test-c++-basic/Makefile.am
@@ -36,7 +36,7 @@ scanner.cpp: $(srcdir)/scanner.l
        $(FLEX) $(LFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-       $(CXX) -o $@ $(LDFLAGS) $(OBJS)
+       $(CXX) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
        ./$(testname)$(EXEEXT) < $(srcdir)/test.input

diff --git a/tests/test-linedir-r/Makefile.am b/tests/test-linedir-r/Makefile.am
index 746f5ab14828bd1dccaa5e3dd52082dba45c79be..f2ea16d3a3a7cedd85ea0067b7848ee4cbd55772 100644 (file)
--- a/tests/test-linedir-r/Makefile.am
+++ b/tests/test-linedir-r/Makefile.am
@@ -46,8 +46,8 @@ $(testname)$(EXEEXT): $(OBJS)
 
 test: $(testname)$(EXEEXT)
        ./$(testname)$(EXEEXT) < $(srcdir)/test.input
-       cat -n scanner.c | grep '#line' | grep scanner.c | awk -f $(srcdir)/check-lines.awk
-       cat -n scanner.h | grep '#line' | grep scanner.h | awk -f $(srcdir)/check-lines.awk
+       cat -n scanner.c | grep '#line' | grep scanner.c | $(AWK) -f $(srcdir)/check-lines.awk
+       cat -n scanner.h | grep '#line' | grep scanner.h | $(AWK) -f $(srcdir)/check-lines.awk
 
 .c.o:
        $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $<