fix travis build

This commit is contained in:
John Kerl 2018-01-03 22:42:30 -05:00
parent 4ca0a7f30f
commit 8f0921556c
22 changed files with 50 additions and 41 deletions

View file

@ -168,7 +168,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/autotools/ltmain.sh \
$(top_srcdir)/autotools/missing autotools/ar-lib \
autotools/compile autotools/config.guess autotools/config.sub \
autotools/install-sh autotools/ltmain.sh autotools/missing
autotools/depcomp autotools/install-sh autotools/ltmain.sh \
autotools/missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)

View file

@ -429,9 +429,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu c/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu c/Makefile
$(AUTOMAKE) --foreign c/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \

View file

@ -310,9 +310,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu c/auxents/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c/auxents/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu c/auxents/Makefile
$(AUTOMAKE) --foreign c/auxents/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \

View file

@ -294,6 +294,7 @@ noinst_LTLIBRARIES = libcli.la
libcli_la_SOURCES = \
argparse.c \
argparse.h \
comment_handling.h \
json_array_ingest.h \
mlrcli.c \
mlrcli.h \
@ -320,9 +321,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu c/cli/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c/cli/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu c/cli/Makefile
$(AUTOMAKE) --foreign c/cli/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \

View file

@ -371,9 +371,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu c/containers/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c/containers/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu c/containers/Makefile
$(AUTOMAKE) --foreign c/containers/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \

View file

@ -368,9 +368,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu c/dsl/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c/dsl/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu c/dsl/Makefile
$(AUTOMAKE) --foreign c/dsl/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \

View file

@ -309,9 +309,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu c/experimental/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c/experimental/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu c/experimental/Makefile
$(AUTOMAKE) --foreign c/experimental/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \

View file

@ -367,9 +367,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu c/input/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c/input/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu c/input/Makefile
$(AUTOMAKE) --foreign c/input/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \

View file

@ -347,9 +347,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu c/lib/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c/lib/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu c/lib/Makefile
$(AUTOMAKE) --foreign c/lib/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \

View file

@ -375,9 +375,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu c/mapping/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c/mapping/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu c/mapping/Makefile
$(AUTOMAKE) --foreign c/mapping/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \

View file

@ -340,9 +340,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu c/output/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c/output/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu c/output/Makefile
$(AUTOMAKE) --foreign c/output/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \

View file

@ -358,9 +358,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu c/parsing/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c/parsing/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu c/parsing/Makefile
$(AUTOMAKE) --foreign c/parsing/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \

View file

@ -520,9 +520,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu c/reg_test/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c/reg_test/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu c/reg_test/Makefile
$(AUTOMAKE) --foreign c/reg_test/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \

View file

@ -253,9 +253,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu c/reg_test/expected/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c/reg_test/expected/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu c/reg_test/expected/Makefile
$(AUTOMAKE) --foreign c/reg_test/expected/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \

View file

@ -300,7 +300,9 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = rfc-csv
SUBDIRS = rfc-csv \
comments
EXTRA_DIST = \
a.csv \
a.pprint \
@ -321,11 +323,13 @@ EXTRA_DIST = \
b.csv \
b.pprint \
bom.csv \
bom-dquote-header.csv \
braced.csv \
c.csv \
c.pprint \
capture-lengths.dkvp \
capture.dkvp \
comments \
d.csv \
d.pprint \
date1.csv \
@ -489,6 +493,8 @@ EXTRA_DIST = \
utf8-align.dkvp \
utf8-align.nidx \
valgrind.txt \
with-comments.csv \
without-comments.csv \
x0to10.dat \
xy40.dkvp \
xyz345 \
@ -506,9 +512,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu c/reg_test/input/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c/reg_test/input/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu c/reg_test/input/Makefile
$(AUTOMAKE) --foreign c/reg_test/input/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \

View file

@ -263,9 +263,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu c/reg_test/input/rfc-csv/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c/reg_test/input/rfc-csv/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu c/reg_test/input/rfc-csv/Makefile
$(AUTOMAKE) --foreign c/reg_test/input/rfc-csv/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \

View file

@ -6792,7 +6792,7 @@ echo "Differences between $expfile and $outfile:"
# when the diff is long.
set +e
diff -I '^mlr' -C5 $expfile $outfile
diff -I '^mlr' -I '^cat' -C5 $expfile $outfile
status=$?
if [ $status -eq 0 ]; then

View file

@ -310,9 +310,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu c/stream/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c/stream/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu c/stream/Makefile
$(AUTOMAKE) --foreign c/stream/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \

View file

@ -43,7 +43,7 @@ BUGFIXES
* sql-setup doc somewhere .......
* ./configure
* bare ./configure ?
* valgrinds

View file

@ -660,9 +660,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu c/unit_test/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign c/unit_test/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu c/unit_test/Makefile
$(AUTOMAKE) --foreign c/unit_test/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \

3
configure vendored
View file

@ -12182,7 +12182,7 @@ ac_config_links="$ac_config_links c/parsing/lempar.c:c/parsing/lempar.c"
ac_config_links="$ac_config_links c/parsing/mlr_dsl_parse.y:c/parsing/mlr_dsl_parse.y"
ac_config_files="$ac_config_files Makefile c/cli/Makefile c/containers/Makefile c/parsing/Makefile c/dsl/Makefile c/experimental/Makefile c/input/Makefile c/lib/Makefile c/mapping/Makefile c/output/Makefile c/stream/Makefile c/auxents/Makefile c/unit_test/Makefile c/reg_test/Makefile c/reg_test/expected/Makefile c/reg_test/input/Makefile c/reg_test/input/rfc-csv/Makefile c/Makefile doc/Makefile"
ac_config_files="$ac_config_files Makefile c/cli/Makefile c/containers/Makefile c/parsing/Makefile c/dsl/Makefile c/experimental/Makefile c/input/Makefile c/lib/Makefile c/mapping/Makefile c/output/Makefile c/stream/Makefile c/auxents/Makefile c/unit_test/Makefile c/reg_test/Makefile c/reg_test/expected/Makefile c/reg_test/input/Makefile c/reg_test/input/rfc-csv/Makefile c/reg_test/input/comments/Makefile c/Makefile doc/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@ -13218,6 +13218,7 @@ do
"c/reg_test/expected/Makefile") CONFIG_FILES="$CONFIG_FILES c/reg_test/expected/Makefile" ;;
"c/reg_test/input/Makefile") CONFIG_FILES="$CONFIG_FILES c/reg_test/input/Makefile" ;;
"c/reg_test/input/rfc-csv/Makefile") CONFIG_FILES="$CONFIG_FILES c/reg_test/input/rfc-csv/Makefile" ;;
"c/reg_test/input/comments/Makefile") CONFIG_FILES="$CONFIG_FILES c/reg_test/input/comments/Makefile" ;;
"c/Makefile") CONFIG_FILES="$CONFIG_FILES c/Makefile" ;;
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;

View file

@ -285,9 +285,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu doc/Makefile
$(AUTOMAKE) --foreign doc/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \