diff options
author | Jörg Frings-Fürst <debian@jff.email> | 2020-11-08 10:59:08 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff.email> | 2020-11-08 10:59:08 +0100 |
commit | 22bb4b319b3d722ac7bf041a6374cd40afdc4d53 (patch) | |
tree | a07d7d0764a8488f4b5ebef1561e2f3d8caacc05 /configure.ac | |
parent | 0f259c3073f341c48468e80e93731daa31698030 (diff) | |
parent | b4158caf13bc715096c1df7c040c9d25995d76f2 (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 37 |
1 files changed, 35 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 74c20e3..2efaf19 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(onig, 6.9.5) +AC_INIT(onig, 6.9.6) AC_CONFIG_MACRO_DIR([m4]) @@ -27,6 +27,20 @@ case "${enableval}" in *) AC_MSG_ERROR(bad value for --enable-posix-api) ;; esac], enable_posix_api=no) + +dnl check for Binary compatible POSIX API +AC_ARG_ENABLE([binary-compatible-posix-api], + [AS_HELP_STRING([--enable-binary-compatible-posix-api], + [turn on to Binary compatible POSIX API [default=no]])], +[\ +case "${enableval}" in + yes) enable_binary_compatible_posix_api=yes; enable_posix_api=yes ;; + no) enable_binary_compatible_posix_api=no ;; + *) AC_MSG_ERROR(bad value for --enable-binary-compatible-posix-api) ;; +esac], +enable_binary_compatible_posix_api=no) + +AM_CONDITIONAL(ENABLE_BINARY_COMPATIBLE_POSIX_API, test x"${enable_binary_compatible_posix_api}" = xyes) AM_CONDITIONAL(ENABLE_POSIX_API, test x"${enable_posix_api}" = xyes) @@ -43,7 +57,7 @@ fi dnl Checks for programs. AC_PROG_CC LT_INIT -LTVERSION="5:0:0" +LTVERSION="6:0:1" AC_SUBST(LTVERSION) AC_PROG_INSTALL @@ -65,4 +79,23 @@ AC_FUNC_ALLOCA AC_CONFIG_FILES([Makefile src/Makefile test/Makefile sample/Makefile onig-config]) AC_CONFIG_COMMANDS([default],[chmod +x onig-config],[]) + +# for Issue #220 +LIBONIG_DEF_FILE= +FIX_TO_LDFLAGS= +case $host_os in + cygwin* | mingw* ) + if test X"$enable_shared" = Xyes; then + LIBONIG_DEF_FILE=libonig.def + FIX_TO_LDFLAGS="-no-undefined" + fi + ;; +esac + +EXTRA_LIBONIG_LDFLAGS="$EXTRA_LIBONIG_LDFLAGS $FIX_TO_LDFLAGS" +AC_SUBST(EXTRA_LIBONIG_LDFLAGS) + +AM_CONDITIONAL(USE_LIBONIG_DEF_FILE, test -n "${LIBONIG_DEF_FILE}") +AC_SUBST(LIBONIG_DEF_FILE) + AC_OUTPUT |