navigine/jq
1
0 Fork 0
mirror of https://github.com/jqlang/jq.git synced 2026-10-30 10:06:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow ./configure --with-oniguruma=builtin

Browse Source 
This allows one to force the use of jq's builtin copy of Oniguruma
(builtin as a git submodule).

We still need to fix make dist to include that copy of Oniguruma.
This commit is contained in:
Nicolas Williams committed 2017-02-23 00:30:13 -06:00
1 parent 8cde328007
commit c6374b6a1f
1 file changed
+24 -16
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+24 -16
View File
@@ -236,24 +236,32 @@ AS_IF([test "x$with_oniguruma" != xno], [
save_CFLAGS="$CFLAGS" save_CFLAGS="$CFLAGS"
save_LDFLAGS="$LDFLAGS" save_LDFLAGS="$LDFLAGS"
AS_IF([test "x$with_oniguruma" != xyes], [ AS_IF([test "x$with_oniguruma" != xyes], [
onig_CFLAGS="-I${with_oniguruma}/include" AS_IF([test "x$with_oniguruma" = xbuiltin], [
onig_LDFLAGS="-L${with_oniguruma}/lib" build_oniguruma=yes
CFLAGS="$CFLAGS $onig_CFLAGS" ], [
LDFLAGS="$LDFLAGS $onig_LDFLAGS" onig_CFLAGS="-I${with_oniguruma}/include"
onig_LDFLAGS="-L${with_oniguruma}/lib"
CFLAGS="$CFLAGS $onig_CFLAGS"
LDFLAGS="$LDFLAGS $onig_LDFLAGS"
])
]) ])
# check for ONIGURUMA library AS_IF([test "x$build_oniguruma" = xno], [
AC_CHECK_HEADER("oniguruma.h", # check for ONIGURUMA library
AC_CHECK_LIB([onig],[onig_version])) AC_CHECK_HEADER("oniguruma.h",
CFLAGS="$save_CFLAGS" AC_CHECK_LIB([onig],[onig_version]))
LDFLAGS="$save_LDFLAGS" CFLAGS="$save_CFLAGS"
LDFLAGS="$save_LDFLAGS"
# handle check results # handle check results
AS_IF([test "x$ac_cv_lib_onig_onig_version" != "xyes"], [ AS_IF([test "x$ac_cv_lib_onig_onig_version" != "xyes"], [
onig_CFLAGS="-I${srcdir}/modules/oniguruma/src" build_oniguruma=yes
onig_LDFLAGS= AC_MSG_NOTICE([Oniguruma was not found. Will use the packaged oniguruma.])
AC_CONFIG_SUBDIRS([modules/oniguruma]) ])
build_oniguruma=yes ])
AC_MSG_NOTICE([Oniguruma was not found. Will use the packaged oniguruma.]) AS_IF([test "x$build_oniguruma" = xyes], [
onig_CFLAGS="-I${srcdir}/modules/oniguruma/src"
onig_LDFLAGS=
AC_CONFIG_SUBDIRS([modules/oniguruma])
]) ])
AC_SUBST(onig_CFLAGS) AC_SUBST(onig_CFLAGS)
AC_SUBST(onig_LDFLAGS) AC_SUBST(onig_LDFLAGS)