--- embedaddon/pcre/configure 2012/02/21 23:50:25 1.1.1.2
+++ embedaddon/pcre/configure 2012/10/09 09:19:17 1.1.1.3
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for PCRE 8.30.
+# Generated by GNU Autoconf 2.68 for PCRE 8.31.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -567,8 +567,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='PCRE'
PACKAGE_TARNAME='pcre'
-PACKAGE_VERSION='8.30'
-PACKAGE_STRING='PCRE 8.30'
+PACKAGE_VERSION='8.31'
+PACKAGE_STRING='PCRE 8.31'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -794,6 +794,7 @@ enable_stack_for_recursion
enable_pcregrep_libz
enable_pcregrep_libbz2
with_pcregrep_bufsize
+enable_pcretest_libedit
enable_pcretest_libreadline
with_posix_malloc_threshold
with_link_size
@@ -1355,7 +1356,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.30 to adapt to many kinds of systems.
+\`configure' configures PCRE 8.31 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1425,7 +1426,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of PCRE 8.30:";;
+ short | recursive ) echo "Configuration of PCRE 8.31:";;
esac
cat <<\_ACEOF
@@ -1472,6 +1473,8 @@ Optional Features:
--enable-pcregrep-libz link pcregrep with libz to handle .gz files
--enable-pcregrep-libbz2
link pcregrep with libbz2 to handle .bz2 files
+ --enable-pcretest-libedit
+ link pcretest with libedit
--enable-pcretest-libreadline
link pcretest with libreadline
@@ -1572,7 +1575,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-PCRE configure 8.30
+PCRE configure 8.31
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2327,7 +2330,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.30, which was
+It was created by PCRE $as_me 8.31, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -3143,7 +3146,7 @@ fi
# Define the identity of the package.
PACKAGE='pcre'
- VERSION='8.30'
+ VERSION='8.31'
cat >>confdefs.h <<_ACEOF
@@ -15705,9 +15708,9 @@ fi
PCRE_MAJOR="8"
-PCRE_MINOR="30"
+PCRE_MINOR="31"
PCRE_PRERELEASE=""
-PCRE_DATE="2012-02-04"
+PCRE_DATE="2012-07-06"
if test "$PCRE_MINOR" = "08" -o "$PCRE_MINOR" = "09"
then
@@ -15900,6 +15903,15 @@ else
fi
+# Handle --enable-pcretest-libedit
+# Check whether --enable-pcretest-libedit was given.
+if test "${enable_pcretest_libedit+set}" = set; then :
+ enableval=$enable_pcretest_libedit;
+else
+ enable_pcretest_libedit=no
+fi
+
+
# Handle --enable-pcretest-libreadline
# Check whether --enable-pcretest-libreadline was given.
if test "${enable_pcretest_libreadline+set}" = set; then :
@@ -16647,7 +16659,8 @@ LIBS="$OLD_LIBS"
# Check for the availabiity of libreadline
-for ac_header in readline/readline.h
+if test "$enable_pcretest_libreadline" = "yes"; then
+ for ac_header in readline/readline.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "readline/readline.h" "ac_cv_header_readline_readline_h" "$ac_includes_default"
if test "x$ac_cv_header_readline_readline_h" = xyes; then :
@@ -16659,7 +16672,7 @@ fi
done
-for ac_header in readline/history.h
+ for ac_header in readline/history.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "readline/history.h" "ac_cv_header_readline_history_h" "$ac_includes_default"
if test "x$ac_cv_header_readline_history_h" = xyes; then :
@@ -16671,7 +16684,7 @@ fi
done
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
$as_echo_n "checking for readline in -lreadline... " >&6; }
if ${ac_cv_lib_readline_readline+:} false; then :
$as_echo_n "(cached) " >&6
@@ -16711,7 +16724,7 @@ if test "x$ac_cv_lib_readline_readline" = xyes; then :
LIBREADLINE="-lreadline"
else
unset ac_cv_lib_readline_readline;
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
$as_echo_n "checking for readline in -lreadline... " >&6; }
if ${ac_cv_lib_readline_readline+:} false; then :
$as_echo_n "(cached) " >&6
@@ -16751,7 +16764,7 @@ if test "x$ac_cv_lib_readline_readline" = xyes; then :
LIBREADLINE="-ltinfo"
else
unset ac_cv_lib_readline_readline;
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
$as_echo_n "checking for readline in -lreadline... " >&6; }
if ${ac_cv_lib_readline_readline+:} false; then :
$as_echo_n "(cached) " >&6
@@ -16791,7 +16804,7 @@ if test "x$ac_cv_lib_readline_readline" = xyes; then :
LIBREADLINE="-lcurses"
else
unset ac_cv_lib_readline_readline;
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
$as_echo_n "checking for readline in -lreadline... " >&6; }
if ${ac_cv_lib_readline_readline+:} false; then :
$as_echo_n "(cached) " >&6
@@ -16831,7 +16844,7 @@ if test "x$ac_cv_lib_readline_readline" = xyes; then :
LIBREADLINE="-lncurses"
else
unset ac_cv_lib_readline_readline;
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
$as_echo_n "checking for readline in -lreadline... " >&6; }
if ${ac_cv_lib_readline_readline+:} false; then :
$as_echo_n "(cached) " >&6
@@ -16871,7 +16884,7 @@ if test "x$ac_cv_lib_readline_readline" = xyes; then :
LIBREADLINE="-lncursesw"
else
unset ac_cv_lib_readline_readline;
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
$as_echo_n "checking for readline in -lreadline... " >&6; }
if ${ac_cv_lib_readline_readline+:} false; then :
$as_echo_n "(cached) " >&6
@@ -16924,13 +16937,99 @@ fi
fi
-if test -n "$LIBREADLINE"; then
- if test "$LIBREADLINE" != "-lreadline"; then
- echo "-lreadline needs $LIBREADLINE"
- LIBREADLINE="-lreadline $LIBREADLINE"
- fi
+ if test -n "$LIBREADLINE"; then
+ if test "$LIBREADLINE" != "-lreadline"; then
+ echo "-lreadline needs $LIBREADLINE"
+ LIBREADLINE="-lreadline $LIBREADLINE"
+ fi
+ fi
fi
+
+# Check for the availability of libedit. Different distributions put its
+# headers in different places. Try to cover the most common ones.
+
+if test "$enable_pcretest_libedit" = "yes"; then
+ for ac_header in editline/readline.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "editline/readline.h" "ac_cv_header_editline_readline_h" "$ac_includes_default"
+if test "x$ac_cv_header_editline_readline_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_EDITLINE_READLINE_H 1
+_ACEOF
+ HAVE_EDITLINE_READLINE_H=1
+else
+ for ac_header in edit/readline/readline.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "edit/readline/readline.h" "ac_cv_header_edit_readline_readline_h" "$ac_includes_default"
+if test "x$ac_cv_header_edit_readline_readline_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_EDIT_READLINE_READLINE_H 1
+_ACEOF
+ HAVE_READLINE_READLINE_H=1
+else
+ for ac_header in readline/readline.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "readline/readline.h" "ac_cv_header_readline_readline_h" "$ac_includes_default"
+if test "x$ac_cv_header_readline_readline_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_READLINE_READLINE_H 1
+_ACEOF
+ HAVE_READLINE_READLINE_H=1
+fi
+
+done
+
+fi
+
+done
+
+fi
+
+done
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -ledit" >&5
+$as_echo_n "checking for readline in -ledit... " >&6; }
+if ${ac_cv_lib_edit_readline+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ledit $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char readline ();
+int
+main ()
+{
+return readline ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_edit_readline=yes
+else
+ ac_cv_lib_edit_readline=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_readline" >&5
+$as_echo "$ac_cv_lib_edit_readline" >&6; }
+if test "x$ac_cv_lib_edit_readline" = xyes; then :
+ LIBEDIT="-ledit"
+fi
+
+fi
+
# This facilitates -ansi builds under Linux
PCRE_STATIC_CFLAG=""
@@ -17010,8 +17109,13 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
-if test "$enable_pcretest_libreadline" = "yes"; then
+if test "$enable_pcretest_libedit" = "yes"; then
+$as_echo "#define SUPPORT_LIBEDIT /**/" >>confdefs.h
+
+ LIBREADLINE="$LIBEDIT"
+elif test "$enable_pcretest_libreadline" = "yes"; then
+
$as_echo "#define SUPPORT_LIBREADLINE /**/" >>confdefs.h
fi
@@ -17086,13 +17190,13 @@ esac
# (Note: The libpcre*_version bits are m4 variables, assigned above)
EXTRA_LIBPCRE_LDFLAGS="$EXTRA_LIBPCRE_LDFLAGS \
- $NO_UNDEFINED -version-info 1:0:0"
+ $NO_UNDEFINED -version-info 1:1:0"
EXTRA_LIBPCRE16_LDFLAGS="$EXTRA_LIBPCRE16_LDFLAGS \
- $NO_UNDEFINED -version-info 0:0:0"
+ $NO_UNDEFINED -version-info 0:1:0"
EXTRA_LIBPCREPOSIX_LDFLAGS="$EXTRA_LIBPCREPOSIX_LDFLAGS \
- $NO_UNDEFINED -version-info 0:0:0"
+ $NO_UNDEFINED -version-info 0:1:0"
EXTRA_LIBPCRECPP_LDFLAGS="$EXTRA_LIBPCRECPP_LDFLAGS \
$NO_UNDEFINED -version-info 0:0:0 \
@@ -17139,6 +17243,23 @@ fi
# Similarly for --enable-pcretest-readline
+if test "$enable_pcretest_libedit" = "yes"; then
+ if test "$enable_pcretest_libreadline" = "yes"; then
+ echo "** Cannot use both --enable-pcretest-libedit and --enable-pcretest-readline"
+ exit 1
+ fi
+ if test "$HAVE_EDITLINE_READLINE_H" != "1" -a \
+ "$HAVE_READLINE_READLINE_H" != "1"; then
+ echo "** Cannot --enable-pcretest-libedit because neither editline/readline.h"
+ echo "** nor readline/readline.h was found."
+ exit 1
+ fi
+ if test -z "$LIBEDIT"; then
+ echo "** Cannot --enable-pcretest-libedit because libedit library was not found."
+ exit 1
+ fi
+fi
+
if test "$enable_pcretest_libreadline" = "yes"; then
if test "$HAVE_READLINE_H" != "1"; then
echo "** Cannot --enable-pcretest-readline because readline/readline.h was not found."
@@ -17729,7 +17850,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.30, which was
+This file was extended by PCRE $as_me 8.31, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17795,7 +17916,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.30
+PCRE config.status 8.31
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
@@ -19893,6 +20014,7 @@ $PACKAGE-$VERSION configuration summary:
Buffer size for pcregrep ........ : ${with_pcregrep_bufsize}
Link pcregrep with libz ......... : ${enable_pcregrep_libz}
Link pcregrep with libbz2 ....... : ${enable_pcregrep_libbz2}
+ Link pcretest with libedit ...... : ${enable_pcretest_libedit}
Link pcretest with libreadline .. : ${enable_pcretest_libreadline}
EOF