When using builtin Oniguruma, set flags correctly

This should fix the Travis-CI build.

diff --git a/configure.ac b/configure.ac
index 02c42842246d585a73a34114070282531aff9a5b..1b115650c2ed21f43f5c2487cede43fcef1d9c3c 100644 (file)
--- 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)