diff options
| author | Nicolas Williams <nico@cryptonector.com> | 2017-02-25 21:49:38 -0600 |
|---|---|---|
| committer | Nicolas Williams <nico@cryptonector.com> | 2017-02-25 21:49:38 -0600 |
| commit | 441b066dd8c3427b5bd9e71be2463841f28251af (patch) | |
| tree | 86bb7ffbcaa6293062fdeae2523a18a1a52f05c7 /configure.ac | |
| parent | ef8701005969fb9ed44c3bf746b1b6f72babffb9 (diff) | |
Preserve precious vars in configure.ac (fix #795)
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 06eca332..871900f3 100644 --- a/configure.ac +++ b/configure.ac @@ -230,6 +230,8 @@ AC_ARG_WITH([oniguruma], [try this for a non-standard install prefix of the oniguruma library])], , [with_oniguruma=yes]) +onig_CFLAGS= +onig_LDFLAGS= build_oniguruma=no AS_IF([test "x$with_oniguruma" != xno], [ save_CFLAGS="$CFLAGS" @@ -240,17 +242,14 @@ AS_IF([test "x$with_oniguruma" != xno], [ ], [ onig_CFLAGS="-I${with_oniguruma}/include" onig_LDFLAGS="-L${with_oniguruma}/lib" - CFLAGS="$CFLAGS $onig_CFLAGS" - LDFLAGS="$LDFLAGS $onig_LDFLAGS" ]) ]) AS_IF([test "x$build_oniguruma" = xno], [ - # check for ONIGURUMA library + # check for ONIGURUMA library, either in /usr or where requested + CFLAGS="$CFLAGS $onig_CFLAGS" + LDFLAGS="$LDFLAGS $onig_LDFLAGS" AC_CHECK_HEADER("oniguruma.h", AC_CHECK_LIB([onig],[onig_version])) - CFLAGS="$save_CFLAGS" - LDFLAGS="$save_LDFLAGS" - # handle check results AS_IF([test "x$ac_cv_lib_onig_onig_version" != "xyes"], [ build_oniguruma=yes @@ -260,14 +259,14 @@ AS_IF([test "x$with_oniguruma" != xno], [ AS_IF([test "x$build_oniguruma" = xyes], [ onig_CFLAGS="-I${srcdir}/modules/oniguruma/src" 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) + CFLAGS="$save_CFLAGS" + LDFLAGS="$save_LDFLAGS" ]) +AC_SUBST(onig_CFLAGS) +AC_SUBST(onig_LDFLAGS) AM_CONDITIONAL([BUILD_ONIGURUMA], [test "x$build_oniguruma" = xyes]) AC_SUBST([BUNDLER], ["$bundle_cmd"]) |