summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Williams <nico@cryptonector.com>2017-02-25 14:02:03 -0600
committerNicolas Williams <nico@cryptonector.com>2017-02-25 14:11:42 -0600
commitc695f2cd9c017822acea6d2373cb3cb66698ed3a (patch)
tree57302a970c7b14b57e5030b31c01ce9e91b02c83
parent27c29aeb7bd286d890bdf2ed875eea1733434ca3 (diff)
When using builtin Oniguruma, set flags correctly
This should fix the Travis-CI build.
-rw-r--r--configure.ac5
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 02c42842..1b115650 100644
--- a/configure.ac
+++ b/configure.ac
@@ -262,8 +262,11 @@ AS_IF([test "x$with_oniguruma" != xno], [
])
AS_IF([test "x$build_oniguruma" = xyes], [
onig_CFLAGS="-I${srcdir}/modules/oniguruma/src"
- onig_LDFLAGS=
+ onig_LDFLAGS="-L${srcdir}/modules/oniguruma/src -Wl,-rpath,${libdir}"
+ CFLAGS="$CFLAGS $onig_CFLAGS"
+ LDFLAGS="$LDFLAGS $onig_LDFLAGS"
AC_CONFIG_SUBDIRS([modules/oniguruma])
+ AC_DEFINE([HAVE_LIBONIG],1,[Define to 1 if the system includes libonig])
])
AC_SUBST(onig_CFLAGS)
AC_SUBST(onig_LDFLAGS)