Merge 5bbafa4 into 157cf35

.github/workflows/linux.yml

@@ -0,0 +1,25 @@
+name: linux
+
+on:
+  push:
+    branches: [ master github-actions ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build_linux_autotools_default_args:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install packages
+      run: sudo apt-get install -y autotools-dev autoconf automake libtool m4 make pkg-config check libpcre3-dev libtalloc-dev libsubunit-dev lcov libjson-c-dev liblmdb-dev libyaml-dev
+    - name: create configure
+      run: autoreconf -i
+    - name: configure
+      run: ./configure
+    - name: make
+      run: make
+    - name: make check
+      run: make check
+    - name: make distcheck
+      run: make distcheck

Makefile.am

@@ -8,7 +8,7 @@ if CHECK
 SUBDIRS += tests
 endif
 
-EXTRA_DIST = LICENSE.md LICENSE-AGPL.md LICENSE-GPL.md README.md CHANGELOG.md spec/handlebars/export spec/handlebars/spec spec/mustache/specs vendor build/redhat-hardened-cc1 build/redhat-hardened-ld
+EXTRA_DIST = LICENSE.md LICENSE-AGPL.md LICENSE-GPL.md README.md CHANGELOG.md spec/handlebars/export spec/handlebars/spec spec/mustache/specs vendor
 
 ACLOCAL_AMFLAGS = -I m4 --install
 

configure.ac

@@ -247,15 +247,18 @@ AM_CONDITIONAL([TESTING_EXPORTS], [test "x$enable_testing_exports" == "xyes"])
 
 # handlebars-spec
 AC_ARG_WITH([handlebars-spec],
-	[AS_HELP_STRING([--with-handlebars-spec=SPEC_LOCATION], [location to find handlebars specification @<:@default=./spec/handlebars@>:@])],
-	[], [with_handlebars_spec=`pwd`/spec/handlebars])
+	[AS_HELP_STRING([--with-handlebars-spec=SPEC_LOCATION], [location to find handlebars specification @<:@default=./spec/handlebars@>:@])])
 
 AS_IF([test "x$with_handlebars_spec" != "xno"], [
-  AC_CHECK_FILE([$with_handlebars_spec/spec/basic.json], [
-    AC_SUBST([HANDLEBARS_SPEC_DIR], [$with_handlebars_spec])
-  ], [
-    AC_MSG_FAILURE([handlebars spec missing (--without-handlebars-spec to disable)])
-  ])
+	AS_IF([test "x$with_handlebars_spec" != "x"], [
+		AC_CHECK_FILE([$with_handlebars_spec/spec/basic.json], [
+			AC_SUBST([HANDLEBARS_SPEC_DIR], [$with_handlebars_spec])
+		], [
+			AC_MSG_FAILURE([handlebars spec missing (--without-handlebars-spec to disable)])
+		])
+	], [
+		AC_SUBST([HANDLEBARS_SPEC_DIR], ['$(top_srcdir)/spec/handlebars'])
+	])
 ])
 
 # hardening
@@ -325,15 +328,18 @@ AM_CONDITIONAL([HANDLEBARS_MEMORY], [test x$enable_handlebars_memory = xyes])
 
 # mustache-spec
 AC_ARG_WITH([mustache-spec],
-	[AS_HELP_STRING([--with-mustache-spec=SPEC_LOCATION], [location to find mustache specification @<:@default=./spec/mustache@>:@])],
-	[], [with_mustache_spec=`pwd`/spec/mustache])
+	[AS_HELP_STRING([--with-mustache-spec=SPEC_LOCATION], [location to find mustache specification @<:@default=./spec/mustache@>:@])])
 
 AS_IF([test "x$with_mustache_spec" != "xno"], [
-  AC_CHECK_FILE([$with_mustache_spec/specs/comments.yml], [
-    AC_SUBST([MUSTACHE_SPEC_DIR], [$with_mustache_spec])
-  ], [
-    AC_MSG_FAILURE([mustache spec missing (--without-mustache-spec to disable)])
-  ])
+	AS_IF([test "x$with_mustache_spec" != "x"], [
+		AC_CHECK_FILE([$with_mustache_spec/specs/comments.yml], [
+			AC_SUBST([MUSTACHE_SPEC_DIR], [$with_mustache_spec])
+		], [
+			AC_MSG_FAILURE([mustache spec missing (--without-mustache-spec to disable)])
+		])
+	], [
+		AC_SUBST([MUSTACHE_SPEC_DIR], ['$(top_srcdir)/spec/mustache'])
+	])
 ])
 
 # pcre
@@ -399,12 +405,9 @@ AC_CONFIG_FILES([
   src/Makefile
   Makefile
   bin/Makefile
-])
-AS_IF([test "x$enable_doxygen" == "xyes"], [
-	AC_CONFIG_FILES([doc/Doxyfile doc/Makefile])
-])
-AS_IF([test "x$enable_check" == "xyes"], [
-	AC_CONFIG_FILES([tests/Makefile])
+  doc/Doxyfile
+  doc/Makefile
+  tests/Makefile
 ])
 
 # Generate the "configure" script.

src/Makefile.am

@@ -47,18 +47,14 @@ PTHREADSOURCES =
 endif
 
 if JSON
-JSONHEADERS = handlebars_json.h
 JSONSOURCES = $(JSON_HEADERS) handlebars_json.c
 else
-JSONHEADERS =
 JSONSOURCES =
 endif
 
 if YAML
-YAMLHEADERS = handlebars_yaml.h
 YAMLSOURCES = $(YAML_HEADERS) handlebars_yaml.c
 else
-YAMLHEADERS =
 YAMLSOURCES =
 endif
 
@@ -76,7 +72,7 @@ pkginclude_HEADERS = \
 	handlebars_config.h \
 	handlebars_delimiters.h \
 	handlebars_helpers.h \
-	$(JSONHEADERS) \
+	handlebars_json.h \
 	handlebars_map.h \
 	handlebars_memory.h \
 	handlebars_opcode_printer.h \
@@ -92,16 +88,18 @@ pkginclude_HEADERS = \
 	handlebars_value.h \
 	handlebars_value_handlers.h \
 	handlebars_vm.h \
-	$(YAMLHEADERS)
+	handlebars_yaml.h
 
 # these headers are not (currently) installed because they only contain private symbols:
-# handlebars_ast_helpers.h
-# handlebars_helpers_ht.h
-# handlebars_parser_private.h
-# handlebars_private.h
-# handlebars_scanners.h
-# handlebars_whitespace.h
-# handlebars_value_private.h
+noinst_HEADERS = \
+	handlebars_ast_helpers.h \
+	handlebars_cache_private.h \
+	handlebars_helpers_ht.h \
+	handlebars_parser_private.h \
+	handlebars_private.h \
+	handlebars_scanners.h \
+	handlebars_whitespace.h \
+	handlebars_value_private.h
 
 CLEANFILES = $(GENSOURCE) $(GENSOURCE2)
 BUILT_SOURCES = $(GENSOURCE) $(GENSOURCE2)

tests/Makefile.am

@@ -86,11 +86,11 @@ TESTS = $(check_PROGRAMS)
 AM_TESTS_ENVIRONMENT = \
 	top_srcdir=$(top_srcdir) \
 	top_builddir=$(top_builddir) \
-	handlebars_export_dir=@HANDLEBARS_SPEC_DIR@/export \
-	handlebars_spec_dir=@HANDLEBARS_SPEC_DIR@/spec \
-	handlebars_tokenizer_spec=@HANDLEBARS_SPEC_DIR@/spec/tokenizer.json \
-	handlebars_parser_spec=@HANDLEBARS_SPEC_DIR@/spec/parser.json \
-	mustache_spec_dir=@MUSTACHE_SPEC_DIR@/specs \
+	handlebars_export_dir=$(HANDLEBARS_SPEC_DIR)/export \
+	handlebars_spec_dir=$(HANDLEBARS_SPEC_DIR)/spec \
+	handlebars_tokenizer_spec=$(HANDLEBARS_SPEC_DIR)/spec/tokenizer.json \
+	handlebars_parser_spec=$(HANDLEBARS_SPEC_DIR)/spec/parser.json \
+	mustache_spec_dir=$(MUSTACHE_SPEC_DIR)/specs \
 	CK_VERBOSITY=normal
 
 #if CHECK_HAS_TAP