diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 79 |
1 files changed, 63 insertions, 16 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for PCRE2 10.21. +# Generated by GNU Autoconf 2.69 for PCRE2 10.22. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='PCRE2' PACKAGE_TARNAME='pcre2' -PACKAGE_VERSION='10.21' -PACKAGE_STRING='PCRE2 10.21' +PACKAGE_VERSION='10.22' +PACKAGE_STRING='PCRE2 10.22' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -821,6 +821,7 @@ enable_pcre2_32 enable_debug enable_jit enable_pcre2grep_jit +enable_pcre2grep_callout enable_rebuild_chartables enable_unicode enable_newline_is_cr @@ -1402,7 +1403,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures PCRE2 10.21 to adapt to many kinds of systems. +\`configure' configures PCRE2 10.22 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1472,7 +1473,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of PCRE2 10.21:";; + short | recursive ) echo "Configuration of PCRE2 10.22:";; esac cat <<\_ACEOF @@ -1498,6 +1499,8 @@ Optional Features: --enable-debug enable debugging code --enable-jit enable Just-In-Time compiling support --disable-pcre2grep-jit disable JIT support in pcre2grep + --disable-pcre2grep-callout + disable callout script support in pcre2grep --enable-rebuild-chartables rebuild character tables in current locale --disable-unicode disable Unicode support @@ -1638,7 +1641,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -PCRE2 configure 10.21 +PCRE2 configure 10.22 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2133,7 +2136,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by PCRE2 $as_me 10.21, which was +It was created by PCRE2 $as_me 10.22, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2997,7 +3000,7 @@ fi # Define the identity of the package. PACKAGE='pcre2' - VERSION='10.21' + VERSION='10.22' cat >>confdefs.h <<_ACEOF @@ -13593,9 +13596,9 @@ _ACEOF # Versioning PCRE2_MAJOR="10" -PCRE2_MINOR="21" +PCRE2_MINOR="22" PCRE2_PRERELEASE="" -PCRE2_DATE="2016-01-12" +PCRE2_DATE="2016-07-29" if test "$PCRE2_MINOR" = "08" -o "$PCRE2_MINOR" = "09" then @@ -13703,6 +13706,20 @@ else fi +# Handle --disable-pcre2grep-callout (enabled by default) but not supported +# for Windows. +if test "$HAVE_WINDOWS_H" != "1"; then + # Check whether --enable-pcre2grep-callout was given. +if test "${enable_pcre2grep_callout+set}" = set; then : + enableval=$enable_pcre2grep_callout; +else + enable_pcre2grep_callout=yes +fi + +else + enable_pcre2grep_callout=no +fi + # Handle --enable-rebuild-chartables # Check whether --enable-rebuild-chartables was given. if test "${enable_rebuild_chartables+set}" = set; then : @@ -14119,6 +14136,18 @@ fi done +for ac_header in sys/wait.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "sys/wait.h" "ac_cv_header_sys_wait_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_wait_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SYS_WAIT_H 1 +_ACEOF + HAVE_SYS_WAIT_H=1 +fi + +done + # Conditional compilation if test "x$enable_pcre2_8" = "xyes"; then @@ -15240,6 +15269,23 @@ $as_echo "#define SUPPORT_PCRE2GREP_JIT /**/" >>confdefs.h fi +# Currently pcre2grep callout string is not supported under Windows. + +if test "$enable_pcre2grep_callout" = "yes"; then + if test "$HAVE_WINDOWS_H" != "1"; then + if test "$HAVE_SYS_WAIT_H" != "1"; then + as_fn_error $? "Callout script support needs sys/wait.h." "$LINENO" 5 + fi + +$as_echo "#define SUPPORT_PCRE2GREP_CALLOUT /**/" >>confdefs.h + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Callout script support is not available for Windows: disabled" >&5 +$as_echo "$as_me: WARNING: Callout script support is not available for Windows: disabled" >&2;} + enable_pcre2grep_callout=no + fi +fi + if test "$enable_unicode" = "yes"; then $as_echo "#define SUPPORT_UNICODE /**/" >>confdefs.h @@ -15383,16 +15429,16 @@ esac # are m4 variables, assigned above. EXTRA_LIBPCRE2_8_LDFLAGS="$EXTRA_LIBPCRE2_8_LDFLAGS \ - $NO_UNDEFINED -version-info 3:0:3" + $NO_UNDEFINED -version-info 4:0:4" EXTRA_LIBPCRE2_16_LDFLAGS="$EXTRA_LIBPCRE2_16_LDFLAGS \ - $NO_UNDEFINED -version-info 3:0:3" + $NO_UNDEFINED -version-info 4:0:4" EXTRA_LIBPCRE2_32_LDFLAGS="$EXTRA_LIBPCRE2_32_LDFLAGS \ - $NO_UNDEFINED -version-info 3:0:3" + $NO_UNDEFINED -version-info 4:0:4" EXTRA_LIBPCRE2_POSIX_LDFLAGS="$EXTRA_LIBPCRE2_POSIX_LDFLAGS \ - $NO_UNDEFINED -version-info 0:1:0" + $NO_UNDEFINED -version-info 1:0:0" @@ -16435,7 +16481,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by PCRE2 $as_me 10.21, which was +This file was extended by PCRE2 $as_me 10.22, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16501,7 +16547,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -PCRE2 config.status 10.21 +PCRE2 config.status 10.22 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -18245,6 +18291,7 @@ $PACKAGE-$VERSION configuration summary: Build shared libs ............... : ${enable_shared} Build static libs ............... : ${enable_static} Use JIT in pcre2grep ............ : ${enable_pcre2grep_jit} + Enable callouts in pcre2grep .... : ${enable_pcre2grep_callout} Buffer size for pcre2grep ....... : ${with_pcre2grep_bufsize} Link pcre2grep with libz ........ : ${enable_pcre2grep_libz} Link pcre2grep with libbz2 ...... : ${enable_pcre2grep_libbz2} |