From 02bad4b298d4d2bc8e29c3f0d744700652cfd832 Mon Sep 17 00:00:00 2001 From: Erik Brinkman Date: Thu, 26 Jan 2017 23:29:00 -0500 Subject: Add local oniguruma submodule Configure should still allow use of prebuilt onigurumas (whether system-installed or in a special prefix). If these are not found, and configure was not called with `--without-oniguruma`, then use the vendored oniguruma module. If configure was called with `--without-oniguruma`, then we do not build regex functionality into jq. --- Makefile.am | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index cf5d74dc..3c3095d1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -48,7 +48,7 @@ AM_YFLAGS = --warnings=all -d lib_LTLIBRARIES = libjq.la libjq_la_SOURCES = ${LIBJQ_SRC} libjq_la_LIBADD = -lm -libjq_la_LDFLAGS = -export-symbols-regex '^j[qv]_' -version-info 1:4:0 +libjq_la_LDFLAGS = $(onig_LDFLAGS) -export-symbols-regex '^j[qv]_' -version-info 1:4:0 if WIN32 libjq_la_LIBADD += -lshlwapi @@ -133,6 +133,15 @@ jq.1: $(srcdir)/jq.1.prebuilt endif +### Build oniguruma + +if BUILD_ONIGURUMA +libjq_la_LIBADD += modules/oniguruma/src/.libs/libonig.la +SUBDIRS = modules/oniguruma +endif + +AM_CFLAGS += $(onig_CFLAGS) + ### Packaging docs/site.yml: configure.ac -- cgit v1.2.3