diff options
Diffstat (limited to 'pcre/configure')
| -rwxr-xr-x | pcre/configure | 62 |
1 files changed, 42 insertions, 20 deletions
diff --git a/pcre/configure b/pcre/configure index de9804f99d7..6b08640e84e 100755 --- a/pcre/configure +++ b/pcre/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for PCRE 8.34. +# Generated by GNU Autoconf 2.69 for PCRE 8.35. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='PCRE' PACKAGE_TARNAME='pcre' -PACKAGE_VERSION='8.34' -PACKAGE_STRING='PCRE 8.34' +PACKAGE_VERSION='8.35' +PACKAGE_STRING='PCRE 8.35' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1415,7 +1415,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 PCRE 8.34 to adapt to many kinds of systems. +\`configure' configures PCRE 8.35 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1485,7 +1485,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of PCRE 8.34:";; + short | recursive ) echo "Configuration of PCRE 8.35:";; esac cat <<\_ACEOF @@ -1553,7 +1553,7 @@ Optional Packages: --with-sysroot=DIR Search for dependent libraries within DIR (or the compiler's sysroot if not specified). --with-pcregrep-bufsize=N - pcregrep buffer size (default=20480) + pcregrep buffer size (default=20480, minimum=8192) --with-posix-malloc-threshold=NBYTES threshold for POSIX malloc usage (default=10) --with-link-size=N internal link size (2, 3, or 4 allowed; default=2) @@ -1654,7 +1654,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -PCRE configure 8.34 +PCRE configure 8.35 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2411,7 +2411,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 PCRE $as_me 8.34, which was +It was created by PCRE $as_me 8.35, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3275,7 +3275,7 @@ fi # Define the identity of the package. PACKAGE='pcre' - VERSION='8.34' + VERSION='8.35' cat >>confdefs.h <<_ACEOF @@ -17022,9 +17022,9 @@ _ACEOF # Versioning PCRE_MAJOR="8" -PCRE_MINOR="34" +PCRE_MINOR="35" PCRE_PRERELEASE="" -PCRE_DATE="2013-12-15" +PCRE_DATE="2014-04-04" if test "$PCRE_MINOR" = "08" -o "$PCRE_MINOR" = "09" then @@ -17561,7 +17561,7 @@ $as_echo "#define STDC_HEADERS 1" >>confdefs.h fi -for ac_header in limits.h sys/types.h sys/stat.h dirent.h windows.h +for ac_header in limits.h sys/types.h sys/stat.h dirent.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -17574,6 +17574,18 @@ fi done +for ac_header in windows.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default" +if test "x$ac_cv_header_windows_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_WINDOWS_H 1 +_ACEOF + HAVE_WINDOWS_H=1 +fi + +done + # The files below are C++ header files. pcre_have_type_traits="0" @@ -18468,7 +18480,10 @@ $as_echo "#define SUPPORT_PCRE32 /**/" >>confdefs.h fi +# Unless running under Windows, JIT support requires pthreads. + if test "$enable_jit" = "yes"; then + if test "$HAVE_WINDOWS_H" != "1"; then ac_ext=c @@ -18865,9 +18880,10 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu - CC="$PTHREAD_CC" - CFLAGS="$PTHREAD_CFLAGS $CFLAGS" - LIBS="$PTHREAD_LIBS $LIBS" + CC="$PTHREAD_CC" + CFLAGS="$PTHREAD_CFLAGS $CFLAGS" + LIBS="$PTHREAD_LIBS $LIBS" + fi $as_echo "#define SUPPORT_JIT /**/" >>confdefs.h @@ -18912,7 +18928,13 @@ $as_echo "#define SUPPORT_LIBBZ2 /**/" >>confdefs.h fi if test $with_pcregrep_bufsize -lt 8192 ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $with_pcregrep_bufsize is too small for --with-pcregrep-bufsize; using 8192" >&5 +$as_echo "$as_me: WARNING: $with_pcregrep_bufsize is too small for --with-pcregrep-bufsize; using 8192" >&2;} with_pcregrep_bufsize="8192" +else + if test $? -gt 1 ; then + as_fn_error $? "Bad value for --with-pcregrep-bufsize" "$LINENO" 5 + fi fi @@ -19024,13 +19046,13 @@ esac # (Note: The libpcre*_version bits are m4 variables, assigned above) EXTRA_LIBPCRE_LDFLAGS="$EXTRA_LIBPCRE_LDFLAGS \ - $NO_UNDEFINED -version-info 3:2:2" + $NO_UNDEFINED -version-info 3:3:2" EXTRA_LIBPCRE16_LDFLAGS="$EXTRA_LIBPCRE16_LDFLAGS \ - $NO_UNDEFINED -version-info 2:2:2" + $NO_UNDEFINED -version-info 2:3:2" EXTRA_LIBPCRE32_LDFLAGS="$EXTRA_LIBPCRE32_LDFLAGS \ - $NO_UNDEFINED -version-info 0:2:0" + $NO_UNDEFINED -version-info 0:3:0" EXTRA_LIBPCREPOSIX_LDFLAGS="$EXTRA_LIBPCREPOSIX_LDFLAGS \ $NO_UNDEFINED -version-info 0:2:0" @@ -20085,7 +20107,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 PCRE $as_me 8.34, which was +This file was extended by PCRE $as_me 8.35, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20151,7 +20173,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="\\ -PCRE config.status 8.34 +PCRE config.status 8.35 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" |