diff -Naur php-5.3.15-patch1/Makefile.global php-5.3.15/Makefile.global
--- php-5.3.15-patch1/Makefile.global 2012-07-27 15:24:23.000000000 -0700
+++ php-5.3.15/Makefile.global 2012-07-27 15:25:00.000000000 -0700
@@ -13,6 +13,8 @@
build-modules: $(PHP_MODULES) $(PHP_ZEND_EX)
+build-binaries: $(PHP_BINARIES)
+
libphp$(PHP_MAJOR_VERSION).la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
-@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1
@@ -35,6 +37,8 @@
fi
@$(INSTALL_IT)
+install-binaries: build-binaries $(install_binary_targets)
+
install-modules: build-modules
@test -d modules && \
$(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR)
diff -Naur php-5.3.15-patch1/acinclude.m4 php-5.3.15/acinclude.m4
--- php-5.3.15-patch1/acinclude.m4 2012-07-27 15:23:59.000000000 -0700
+++ php-5.3.15/acinclude.m4 2012-07-27 15:25:00.000000000 -0700
@@ -194,7 +194,7 @@
dnl
dnl which array to append to?
AC_DEFUN([PHP_ADD_SOURCES],[
- PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,PHP_GLOBAL_OBJS)))
+ PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,sapi,PHP_SAPI_OBJS,PHP_GLOBAL_OBJS))
])
dnl
@@ -772,7 +772,7 @@
AC_DEFUN([PHP_BUILD_SHARED],[
PHP_BUILD_PROGRAM
OVERALL_TARGET=libphp[]$PHP_MAJOR_VERSION[.la]
- php_build_target=shared
+ php_sapi_module=shared
php_c_pre=$shared_c_pre
php_c_meta=$shared_c_meta
@@ -789,7 +789,7 @@
AC_DEFUN([PHP_BUILD_STATIC],[
PHP_BUILD_PROGRAM
OVERALL_TARGET=libphp[]$PHP_MAJOR_VERSION[.la]
- php_build_target=static
+ php_sapi_module=static
])
dnl
@@ -798,14 +798,13 @@
AC_DEFUN([PHP_BUILD_BUNDLE],[
PHP_BUILD_PROGRAM
OVERALL_TARGET=libs/libphp[]$PHP_MAJOR_VERSION[.bundle]
- php_build_target=static
+ php_sapi_module=static
])
dnl
dnl PHP_BUILD_PROGRAM
dnl
AC_DEFUN([PHP_BUILD_PROGRAM],[
- OVERALL_TARGET=[]ifelse($1,,php,$1)
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -826,8 +825,6 @@
shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
shared_cxx_post=
shared_lo=lo
-
- php_build_target=program
])
dnl
@@ -873,32 +870,45 @@
dnl
dnl PHP_SELECT_SAPI(name, type[, sources [, extra-cflags [, build-target]]])
dnl
-dnl Selects the SAPI name and type (static, shared, programm)
+dnl Selects the SAPI name and type (static, shared, bundle, program)
dnl and optionally also the source-files for the SAPI-specific
dnl objects.
dnl
AC_DEFUN([PHP_SELECT_SAPI],[
- if test "$PHP_SAPI" != "default"; then
-AC_MSG_ERROR([
+ if test "$2" = "program"; then
+ PHP_BINARIES="$PHP_BINARIES $1"
+ elif test "$PHP_SAPI" != "none"; then
+ AC_MSG_ERROR([
+--------------------------------------------------------------------+
| *** ATTENTION *** |
| |
| You've configured multiple SAPIs to be build. You can build only |
-| one SAPI module and CLI binary at the same time. |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time. |
+--------------------------------------------------------------------+
])
- fi
+ else
+ PHP_SAPI=$1
+ fi
- PHP_SAPI=$1
-
- case "$2" in
- static[)] PHP_BUILD_STATIC;;
- shared[)] PHP_BUILD_SHARED;;
- bundle[)] PHP_BUILD_BUNDLE;;
- program[)] PHP_BUILD_PROGRAM($5);;
- esac
-
- ifelse($3,,,[PHP_ADD_SOURCES([sapi/$1],[$3],[$4],[sapi])])
+ PHP_ADD_BUILD_DIR([sapi/$1])
+
+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS $1"
+
+ ifelse($2,program,[
+ PHP_BUILD_PROGRAM
+ install_binaries="install-binaries"
+ install_binary_targets="$install_binary_targets install-$1"
+ PHP_SUBST(PHP_[]translit($1,a-z0-9-,A-Z0-9_)[]_OBJS)
+ ifelse($3,,,[PHP_ADD_SOURCES_X([sapi/$1],[$3],[$4],PHP_[]translit($1,a-z0-9-,A-Z0-9_)[]_OBJS)])
+ ],[
+ case "$2" in
+ static[)] PHP_BUILD_STATIC;;
+ shared[)] PHP_BUILD_SHARED;;
+ bundle[)] PHP_BUILD_BUNDLE;;
+ esac
+ install_sapi="install-sapi"
+ ifelse($3,,,[PHP_ADD_SOURCES([sapi/$1],[$3],[$4],[sapi])])
+ ])
])
dnl deprecated
diff -Naur php-5.3.15-patch1/aclocal.m4 php-5.3.15/aclocal.m4
--- php-5.3.15-patch1/aclocal.m4 2012-07-27 15:23:59.000000000 -0700
+++ php-5.3.15/aclocal.m4 2012-07-27 16:21:08.000000000 -0700
@@ -194,7 +194,7 @@
dnl
dnl which array to append to?
AC_DEFUN([PHP_ADD_SOURCES],[
- PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,PHP_GLOBAL_OBJS)))
+ PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,sapi,PHP_SAPI_OBJS,PHP_GLOBAL_OBJS))
])
dnl
@@ -772,7 +772,7 @@
AC_DEFUN([PHP_BUILD_SHARED],[
PHP_BUILD_PROGRAM
OVERALL_TARGET=libphp[]$PHP_MAJOR_VERSION[.la]
- php_build_target=shared
+ php_sapi_module=shared
php_c_pre=$shared_c_pre
php_c_meta=$shared_c_meta
@@ -789,7 +789,7 @@
AC_DEFUN([PHP_BUILD_STATIC],[
PHP_BUILD_PROGRAM
OVERALL_TARGET=libphp[]$PHP_MAJOR_VERSION[.la]
- php_build_target=static
+ php_sapi_module=static
])
dnl
@@ -798,14 +798,13 @@
AC_DEFUN([PHP_BUILD_BUNDLE],[
PHP_BUILD_PROGRAM
OVERALL_TARGET=libs/libphp[]$PHP_MAJOR_VERSION[.bundle]
- php_build_target=static
+ php_sapi_module=static
])
dnl
dnl PHP_BUILD_PROGRAM
dnl
AC_DEFUN([PHP_BUILD_PROGRAM],[
- OVERALL_TARGET=[]ifelse($1,,php,$1)
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -826,8 +825,6 @@
shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
shared_cxx_post=
shared_lo=lo
-
- php_build_target=program
])
dnl
@@ -873,32 +870,45 @@
dnl
dnl PHP_SELECT_SAPI(name, type[, sources [, extra-cflags [, build-target]]])
dnl
-dnl Selects the SAPI name and type (static, shared, programm)
+dnl Selects the SAPI name and type (static, shared, bundle, program)
dnl and optionally also the source-files for the SAPI-specific
dnl objects.
dnl
AC_DEFUN([PHP_SELECT_SAPI],[
- if test "$PHP_SAPI" != "default"; then
-AC_MSG_ERROR([
+ if test "$2" = "program"; then
+ PHP_BINARIES="$PHP_BINARIES $1"
+ elif test "$PHP_SAPI" != "none"; then
+ AC_MSG_ERROR([
+--------------------------------------------------------------------+
| *** ATTENTION *** |
| |
| You've configured multiple SAPIs to be build. You can build only |
-| one SAPI module and CLI binary at the same time. |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time. |
+--------------------------------------------------------------------+
])
- fi
+ else
+ PHP_SAPI=$1
+ fi
- PHP_SAPI=$1
-
- case "$2" in
- static[)] PHP_BUILD_STATIC;;
- shared[)] PHP_BUILD_SHARED;;
- bundle[)] PHP_BUILD_BUNDLE;;
- program[)] PHP_BUILD_PROGRAM($5);;
- esac
-
- ifelse($3,,,[PHP_ADD_SOURCES([sapi/$1],[$3],[$4],[sapi])])
+ PHP_ADD_BUILD_DIR([sapi/$1])
+
+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS $1"
+
+ ifelse($2,program,[
+ PHP_BUILD_PROGRAM
+ install_binaries="install-binaries"
+ install_binary_targets="$install_binary_targets install-$1"
+ PHP_SUBST(PHP_[]translit($1,a-z0-9-,A-Z0-9_)[]_OBJS)
+ ifelse($3,,,[PHP_ADD_SOURCES_X([sapi/$1],[$3],[$4],PHP_[]translit($1,a-z0-9-,A-Z0-9_)[]_OBJS)])
+ ],[
+ case "$2" in
+ static[)] PHP_BUILD_STATIC;;
+ shared[)] PHP_BUILD_SHARED;;
+ bundle[)] PHP_BUILD_BUNDLE;;
+ esac
+ install_sapi="install-sapi"
+ ifelse($3,,,[PHP_ADD_SOURCES([sapi/$1],[$3],[$4],[sapi])])
+ ])
])
dnl deprecated
diff -Naur php-5.3.15-patch1/configure php-5.3.15/configure
--- php-5.3.15-patch1/configure 2012-07-27 15:23:59.000000000 -0700
+++ php-5.3.15/configure 2012-07-27 16:21:10.000000000 -0700
@@ -3268,7 +3268,6 @@
;;
*netware*)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -3290,8 +3289,6 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
case /main in
@@ -3424,7 +3421,7 @@
# Disable PIC mode by default where it is known to be safe to do so,
# to avoid the performance hit from the lost register
echo $ac_n "checking whether to force non-PIC code in shared modules""... $ac_c" 1>&6
-echo "configure:3428: checking whether to force non-PIC code in shared modules" >&5
+echo "configure:3425: checking whether to force non-PIC code in shared modules" >&5
case $host_alias in
i?86-*-linux*|i?86-*-freebsd*)
if test "${with_pic+set}" != "set" || test "$with_pic" = "no"; then
@@ -3454,7 +3451,7 @@
echo $ac_n "checking whether /dev/urandom exists""... $ac_c" 1>&6
-echo "configure:3458: checking whether /dev/urandom exists" >&5
+echo "configure:3455: checking whether /dev/urandom exists" >&5
if test -r "/dev/urandom" && test -c "/dev/urandom"; then
cat >> confdefs.h <<\EOF
#define HAVE_DEV_URANDOM 1
@@ -3486,6 +3483,13 @@
+cat >> confdefs.h <<\EOF
+#define SUHOSIN_PATCH 1
+EOF
+
+
+
+
if test "$beos_threads" = "1"; then
@@ -3515,7 +3519,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 3519 "configure"
+#line 3523 "configure"
#include "confdefs.h"
#include <pthread.h>
@@ -3533,7 +3537,7 @@
return pthread_create(&thd, NULL, thread_routine, &data);
}
EOF
-if { (eval echo configure:3537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
pthreads_working=yes
@@ -3553,7 +3557,7 @@
CFLAGS=$save_CFLAGS
echo $ac_n "checking for pthreads_cflags""... $ac_c" 1>&6
-echo "configure:3557: checking for pthreads_cflags" >&5
+echo "configure:3561: checking for pthreads_cflags" >&5
if eval "test \"`echo '$''{'ac_cv_pthreads_cflags'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3575,7 +3579,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 3579 "configure"
+#line 3583 "configure"
#include "confdefs.h"
#include <pthread.h>
@@ -3593,7 +3597,7 @@
return pthread_create(&thd, NULL, thread_routine, &data);
}
EOF
-if { (eval echo configure:3597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
pthreads_working=yes
@@ -3623,7 +3627,7 @@
echo "$ac_t""$ac_cv_pthreads_cflags" 1>&6
echo $ac_n "checking for pthreads_lib""... $ac_c" 1>&6
-echo "configure:3627: checking for pthreads_lib" >&5
+echo "configure:3631: checking for pthreads_lib" >&5
if eval "test \"`echo '$''{'ac_cv_pthreads_lib'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3645,7 +3649,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 3649 "configure"
+#line 3653 "configure"
#include "confdefs.h"
#include <pthread.h>
@@ -3663,7 +3667,7 @@
return pthread_create(&thd, NULL, thread_routine, &data);
}
EOF
-if { (eval echo configure:3667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
pthreads_working=yes
@@ -3731,9 +3735,7 @@
;;
esac
-PHP_SAPI=default
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -3755,8 +3757,7 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
+PHP_SAPI=none
@@ -3794,7 +3795,7 @@
echo $ac_n "checking for AOLserver support""... $ac_c" 1>&6
-echo "configure:3798: checking for AOLserver support" >&5
+echo "configure:3799: checking for AOLserver support" >&5
if test "$PHP_AOLSERVER" != "no"; then
if test -d "$PHP_AOLSERVER/include"; then
@@ -3848,23 +3849,33 @@
EOF
- if test "$PHP_SAPI" != "default"; then
-{ echo "configure: error:
+ if test "shared" = "program"; then
+ PHP_BINARIES="$PHP_BINARIES aolserver"
+ elif test "$PHP_SAPI" != "none"; then
+ { echo "configure: error:
+--------------------------------------------------------------------+
| *** ATTENTION *** |
| |
| You've configured multiple SAPIs to be build. You can build only |
-| one SAPI module and CLI binary at the same time. |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time. |
+--------------------------------------------------------------------+
" 1>&2; exit 1; }
- fi
+ else
+ PHP_SAPI=aolserver
+ fi
+
+
+
+ BUILD_DIR="$BUILD_DIR sapi/aolserver"
+
+
+
+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS aolserver"
- PHP_SAPI=aolserver
- case "shared" in
- static)
+ case "shared" in
+ static)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -3886,14 +3897,11 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=static
+ php_sapi_module=static
;;
- shared)
+ shared)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -3915,10 +3923,8 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=shared
+ php_sapi_module=shared
php_c_pre=$shared_c_pre
php_c_meta=$shared_c_meta
@@ -3928,9 +3934,8 @@
php_cxx_post=$shared_cxx_post
php_lo=$shared_lo
;;
- bundle)
+ bundle)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -3952,40 +3957,13 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
- php_build_target=static
-;;
- program)
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
-
- php_build_target=program
+ php_sapi_module=static
;;
- esac
+ esac
+ install_sapi="install-sapi"
-
case sapi/aolserver in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
/*) ac_srcdir=`echo "sapi/aolserver"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
@@ -4027,6 +4005,7 @@
done
+
INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PHP_AOLSERVER/bin/"
fi
@@ -4059,7 +4038,7 @@
echo $ac_n "checking for Apache 1.x module support via DSO through APXS""... $ac_c" 1>&6
-echo "configure:4063: checking for Apache 1.x module support via DSO through APXS" >&5
+echo "configure:4042: checking for Apache 1.x module support via DSO through APXS" >&5
if test "$PHP_APXS" != "no"; then
if test "$PHP_APXS" = "yes"; then
@@ -4144,23 +4123,33 @@
esac
- if test "$PHP_SAPI" != "default"; then
-{ echo "configure: error:
+ if test "$build_type" = "program"; then
+ PHP_BINARIES="$PHP_BINARIES apache"
+ elif test "$PHP_SAPI" != "none"; then
+ { echo "configure: error:
+--------------------------------------------------------------------+
| *** ATTENTION *** |
| |
| You've configured multiple SAPIs to be build. You can build only |
-| one SAPI module and CLI binary at the same time. |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time. |
+--------------------------------------------------------------------+
" 1>&2; exit 1; }
- fi
+ else
+ PHP_SAPI=apache
+ fi
+
+
+
+ BUILD_DIR="$BUILD_DIR sapi/apache"
+
+
+
+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache"
- PHP_SAPI=apache
- case "$build_type" in
- static)
+ case "$build_type" in
+ static)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -4182,14 +4171,11 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=static
+ php_sapi_module=static
;;
- shared)
+ shared)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -4211,10 +4197,8 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=shared
+ php_sapi_module=shared
php_c_pre=$shared_c_pre
php_c_meta=$shared_c_meta
@@ -4224,9 +4208,8 @@
php_cxx_post=$shared_cxx_post
php_lo=$shared_lo
;;
- bundle)
+ bundle)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -4248,40 +4231,13 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
- php_build_target=static
-;;
- program)
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
-
- php_build_target=program
+ php_sapi_module=static
;;
- esac
+ esac
+ install_sapi="install-sapi"
-
case sapi/apache in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
/*) ac_srcdir=`echo "sapi/apache"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
@@ -4323,6 +4279,7 @@
done
+
# Test whether apxs support -S option
@@ -4390,7 +4347,7 @@
echo $ac_n "checking for Apache 1.x module support""... $ac_c" 1>&6
-echo "configure:4394: checking for Apache 1.x module support" >&5
+echo "configure:4351: checking for Apache 1.x module support" >&5
if test "$PHP_SAPI" != "apache" && test "$PHP_APACHE" != "no"; then
@@ -4422,23 +4379,33 @@
APACHE_INCLUDE=-I$PHP_APACHE/src
APACHE_TARGET=$PHP_APACHE/src
- if test "$PHP_SAPI" != "default"; then
-{ echo "configure: error:
+ if test "static" = "program"; then
+ PHP_BINARIES="$PHP_BINARIES apache"
+ elif test "$PHP_SAPI" != "none"; then
+ { echo "configure: error:
+--------------------------------------------------------------------+
| *** ATTENTION *** |
| |
| You've configured multiple SAPIs to be build. You can build only |
-| one SAPI module and CLI binary at the same time. |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time. |
+--------------------------------------------------------------------+
" 1>&2; exit 1; }
- fi
+ else
+ PHP_SAPI=apache
+ fi
+
+
+
+ BUILD_DIR="$BUILD_DIR sapi/apache"
+
+
+
+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache"
- PHP_SAPI=apache
- case "static" in
- static)
+ case "static" in
+ static)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -4460,14 +4427,11 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=static
+ php_sapi_module=static
;;
- shared)
+ shared)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -4489,10 +4453,8 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=shared
+ php_sapi_module=shared
php_c_pre=$shared_c_pre
php_c_meta=$shared_c_meta
@@ -4502,9 +4464,8 @@
php_cxx_post=$shared_cxx_post
php_lo=$shared_lo
;;
- bundle)
+ bundle)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -4526,40 +4487,13 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
- php_build_target=static
-;;
- program)
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
-
- php_build_target=program
+ php_sapi_module=static
;;
- esac
+ esac
+ install_sapi="install-sapi"
-
case sapi/apache in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
/*) ac_srcdir=`echo "sapi/apache"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
@@ -4601,6 +4535,7 @@
done
+
APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_INSTALL_FILES $APACHE_TARGET"
PHP_LIBS="-L. -lphp3"
@@ -4624,23 +4559,33 @@
mkdir $APACHE_TARGET
fi
- if test "$PHP_SAPI" != "default"; then
-{ echo "configure: error:
+ if test "static" = "program"; then
+ PHP_BINARIES="$PHP_BINARIES apache"
+ elif test "$PHP_SAPI" != "none"; then
+ { echo "configure: error:
+--------------------------------------------------------------------+
| *** ATTENTION *** |
| |
| You've configured multiple SAPIs to be build. You can build only |
-| one SAPI module and CLI binary at the same time. |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time. |
+--------------------------------------------------------------------+
" 1>&2; exit 1; }
- fi
+ else
+ PHP_SAPI=apache
+ fi
+
+
+
+ BUILD_DIR="$BUILD_DIR sapi/apache"
+
+
+
+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache"
- PHP_SAPI=apache
- case "static" in
- static)
+ case "static" in
+ static)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -4662,14 +4607,11 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=static
+ php_sapi_module=static
;;
- shared)
+ shared)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -4691,10 +4633,8 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=shared
+ php_sapi_module=shared
php_c_pre=$shared_c_pre
php_c_meta=$shared_c_meta
@@ -4704,9 +4644,8 @@
php_cxx_post=$shared_cxx_post
php_lo=$shared_lo
;;
- bundle)
+ bundle)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -4728,40 +4667,13 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
- php_build_target=static
-;;
- program)
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
-
- php_build_target=program
+ php_sapi_module=static
;;
- esac
+ esac
+ install_sapi="install-sapi"
-
case sapi/apache in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
/*) ac_srcdir=`echo "sapi/apache"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
@@ -4803,6 +4715,7 @@
done
+
APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5"
@@ -4837,23 +4750,33 @@
mkdir $APACHE_TARGET
fi
- if test "$PHP_SAPI" != "default"; then
-{ echo "configure: error:
+ if test "static" = "program"; then
+ PHP_BINARIES="$PHP_BINARIES apache"
+ elif test "$PHP_SAPI" != "none"; then
+ { echo "configure: error:
+--------------------------------------------------------------------+
| *** ATTENTION *** |
| |
| You've configured multiple SAPIs to be build. You can build only |
-| one SAPI module and CLI binary at the same time. |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time. |
+--------------------------------------------------------------------+
" 1>&2; exit 1; }
- fi
+ else
+ PHP_SAPI=apache
+ fi
+
+
+
+ BUILD_DIR="$BUILD_DIR sapi/apache"
+
+
+
+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache"
- PHP_SAPI=apache
- case "static" in
- static)
+ case "static" in
+ static)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -4875,14 +4798,11 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=static
+ php_sapi_module=static
;;
- shared)
+ shared)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -4904,10 +4824,8 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=shared
+ php_sapi_module=shared
php_c_pre=$shared_c_pre
php_c_meta=$shared_c_meta
@@ -4917,9 +4835,8 @@
php_cxx_post=$shared_cxx_post
php_lo=$shared_lo
;;
- bundle)
+ bundle)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -4941,40 +4858,13 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
- php_build_target=static
-;;
- program)
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
-
- php_build_target=program
+ php_sapi_module=static
;;
- esac
+ esac
+ install_sapi="install-sapi"
-
case sapi/apache in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
/*) ac_srcdir=`echo "sapi/apache"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
@@ -5016,6 +4906,7 @@
done
+
PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5"
APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
@@ -5046,23 +4937,33 @@
APACHE_INCLUDE="-I$PHP_APACHE/apache -I$PHP_APACHE/ssl/include"
APACHE_TARGET=$PHP_APACHE/apache
- if test "$PHP_SAPI" != "default"; then
-{ echo "configure: error:
+ if test "static" = "program"; then
+ PHP_BINARIES="$PHP_BINARIES apache"
+ elif test "$PHP_SAPI" != "none"; then
+ { echo "configure: error:
+--------------------------------------------------------------------+
| *** ATTENTION *** |
| |
| You've configured multiple SAPIs to be build. You can build only |
-| one SAPI module and CLI binary at the same time. |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time. |
+--------------------------------------------------------------------+
" 1>&2; exit 1; }
- fi
+ else
+ PHP_SAPI=apache
+ fi
- PHP_SAPI=apache
- case "static" in
- static)
- OVERALL_TARGET=php
+ BUILD_DIR="$BUILD_DIR sapi/apache"
+
+
+
+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache"
+
+
+ case "static" in
+ static)
+
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -5084,14 +4985,11 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=static
+ php_sapi_module=static
;;
- shared)
+ shared)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -5113,10 +5011,8 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=shared
+ php_sapi_module=shared
php_c_pre=$shared_c_pre
php_c_meta=$shared_c_meta
@@ -5126,9 +5022,8 @@
php_cxx_post=$shared_cxx_post
php_lo=$shared_lo
;;
- bundle)
+ bundle)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -5150,40 +5045,13 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
- php_build_target=static
-;;
- program)
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
-
- php_build_target=program
+ php_sapi_module=static
;;
- esac
+ esac
+ install_sapi="install-sapi"
-
case sapi/apache in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
/*) ac_srcdir=`echo "sapi/apache"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
@@ -5225,6 +5093,7 @@
done
+
PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5"
APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET"
@@ -5267,7 +5136,7 @@
php_enable_mod_charset=no
echo $ac_n "checking whether to enable Apache charset compatibility option""... $ac_c" 1>&6
-echo "configure:5271: checking whether to enable Apache charset compatibility option" >&5
+echo "configure:5140: checking whether to enable Apache charset compatibility option" >&5
# Check whether --enable-mod-charset or --disable-mod-charset was given.
if test "${enable_mod_charset+set}" = set; then
enableval="$enable_mod_charset"
@@ -5299,7 +5168,7 @@
gcc_arg_name=ac_cv_gcc_arg_rdynamic
echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6
-echo "configure:5303: checking whether $CC supports -rdynamic" >&5
+echo "configure:5172: checking whether $CC supports -rdynamic" >&5
if eval "test \"`echo '$''{'ac_cv_gcc_arg_rdynamic'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5342,7 +5211,7 @@
echo $ac_n "checking for member fd in BUFF *""... $ac_c" 1>&6
-echo "configure:5346: checking for member fd in BUFF *" >&5
+echo "configure:5215: checking for member fd in BUFF *" >&5
if eval "test \"`echo '$''{'ac_cv_php_fd_in_buff'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5354,14 +5223,14 @@
CPPFLAGS="$CPPFLAGS $APACHE_INCLUDE"
fi
cat > conftest.$ac_ext <<EOF
-#line 5358 "configure"
+#line 5227 "configure"
#include "confdefs.h"
#include <httpd.h>
int main() {
conn_rec *c; int fd = c->client->fd;
; return 0; }
EOF
-if { (eval echo configure:5365: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5234: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_php_fd_in_buff=yes
@@ -5434,7 +5303,7 @@
echo $ac_n "checking for Apache 2.0 filter-module support via DSO through APXS""... $ac_c" 1>&6
-echo "configure:5438: checking for Apache 2.0 filter-module support via DSO through APXS" >&5
+echo "configure:5307: checking for Apache 2.0 filter-module support via DSO through APXS" >&5
if test "$PHP_APXS2FILTER" != "no"; then
if test "$PHP_APXS2FILTER" = "yes"; then
@@ -5531,23 +5400,33 @@
*aix*)
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp"
- if test "$PHP_SAPI" != "default"; then
-{ echo "configure: error:
+ if test "shared" = "program"; then
+ PHP_BINARIES="$PHP_BINARIES apache2filter"
+ elif test "$PHP_SAPI" != "none"; then
+ { echo "configure: error:
+--------------------------------------------------------------------+
| *** ATTENTION *** |
| |
| You've configured multiple SAPIs to be build. You can build only |
-| one SAPI module and CLI binary at the same time. |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time. |
+--------------------------------------------------------------------+
" 1>&2; exit 1; }
- fi
+ else
+ PHP_SAPI=apache2filter
+ fi
+
+
+
+ BUILD_DIR="$BUILD_DIR sapi/apache2filter"
+
+
+
+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache2filter"
- PHP_SAPI=apache2filter
- case "shared" in
- static)
+ case "shared" in
+ static)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -5569,14 +5448,11 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=static
+ php_sapi_module=static
;;
- shared)
+ shared)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -5598,10 +5474,8 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=shared
+ php_sapi_module=shared
php_c_pre=$shared_c_pre
php_c_meta=$shared_c_meta
@@ -5611,9 +5485,8 @@
php_cxx_post=$shared_cxx_post
php_lo=$shared_lo
;;
- bundle)
+ bundle)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -5635,40 +5508,13 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
- php_build_target=static
+ php_sapi_module=static
;;
- program)
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
-
- php_build_target=program
-;;
- esac
+ esac
+ install_sapi="install-sapi"
-
case sapi/apache2filter in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
/*) ac_srcdir=`echo "sapi/apache2filter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
@@ -5710,6 +5556,7 @@
done
+
INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
;;
@@ -5725,23 +5572,33 @@
PHP_VAR_SUBST="$PHP_VAR_SUBST MH_BUNDLE_FLAGS"
- if test "$PHP_SAPI" != "default"; then
-{ echo "configure: error:
+ if test "bundle" = "program"; then
+ PHP_BINARIES="$PHP_BINARIES apache2filter"
+ elif test "$PHP_SAPI" != "none"; then
+ { echo "configure: error:
+--------------------------------------------------------------------+
| *** ATTENTION *** |
| |
| You've configured multiple SAPIs to be build. You can build only |
-| one SAPI module and CLI binary at the same time. |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time. |
+--------------------------------------------------------------------+
" 1>&2; exit 1; }
- fi
+ else
+ PHP_SAPI=apache2filter
+ fi
+
+
+
+ BUILD_DIR="$BUILD_DIR sapi/apache2filter"
+
+
+
+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache2filter"
- PHP_SAPI=apache2filter
- case "bundle" in
- static)
+ case "bundle" in
+ static)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -5763,14 +5620,11 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=static
+ php_sapi_module=static
;;
- shared)
+ shared)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -5792,10 +5646,8 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=shared
+ php_sapi_module=shared
php_c_pre=$shared_c_pre
php_c_meta=$shared_c_meta
@@ -5805,9 +5657,8 @@
php_cxx_post=$shared_cxx_post
php_lo=$shared_lo
;;
- bundle)
+ bundle)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -5829,40 +5680,13 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
- php_build_target=static
-;;
- program)
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
-
- php_build_target=program
+ php_sapi_module=static
;;
- esac
+ esac
+ install_sapi="install-sapi"
-
case sapi/apache2filter in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
/*) ac_srcdir=`echo "sapi/apache2filter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
@@ -5904,6 +5728,7 @@
done
+
SAPI_SHARED=libs/libphp5.so
INSTALL_IT="$INSTALL_IT $SAPI_SHARED"
@@ -5913,23 +5738,33 @@
`ln -s $APXS_BINDIR/httpd _APP_`
EXTRA_LIBS="$EXTRA_LIBS _APP_"
- if test "$PHP_SAPI" != "default"; then
-{ echo "configure: error:
+ if test "shared" = "program"; then
+ PHP_BINARIES="$PHP_BINARIES apache2filter"
+ elif test "$PHP_SAPI" != "none"; then
+ { echo "configure: error:
+--------------------------------------------------------------------+
| *** ATTENTION *** |
| |
| You've configured multiple SAPIs to be build. You can build only |
-| one SAPI module and CLI binary at the same time. |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time. |
+--------------------------------------------------------------------+
" 1>&2; exit 1; }
- fi
+ else
+ PHP_SAPI=apache2filter
+ fi
+
+
+
+ BUILD_DIR="$BUILD_DIR sapi/apache2filter"
+
+
+
+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache2filter"
- PHP_SAPI=apache2filter
- case "shared" in
- static)
+ case "shared" in
+ static)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -5951,14 +5786,11 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=static
+ php_sapi_module=static
;;
- shared)
+ shared)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -5980,10 +5812,8 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=shared
+ php_sapi_module=shared
php_c_pre=$shared_c_pre
php_c_meta=$shared_c_meta
@@ -5993,9 +5823,8 @@
php_cxx_post=$shared_cxx_post
php_lo=$shared_lo
;;
- bundle)
+ bundle)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -6017,40 +5846,13 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
- php_build_target=static
-;;
- program)
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
-
- php_build_target=program
+ php_sapi_module=static
;;
- esac
+ esac
+ install_sapi="install-sapi"
-
case sapi/apache2filter in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
/*) ac_srcdir=`echo "sapi/apache2filter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
@@ -6092,28 +5894,39 @@
done
+
INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
;;
*)
- if test "$PHP_SAPI" != "default"; then
-{ echo "configure: error:
+ if test "shared" = "program"; then
+ PHP_BINARIES="$PHP_BINARIES apache2filter"
+ elif test "$PHP_SAPI" != "none"; then
+ { echo "configure: error:
+--------------------------------------------------------------------+
| *** ATTENTION *** |
| |
| You've configured multiple SAPIs to be build. You can build only |
-| one SAPI module and CLI binary at the same time. |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time. |
+--------------------------------------------------------------------+
" 1>&2; exit 1; }
- fi
+ else
+ PHP_SAPI=apache2filter
+ fi
+
+
+
+ BUILD_DIR="$BUILD_DIR sapi/apache2filter"
+
+
+
+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache2filter"
- PHP_SAPI=apache2filter
- case "shared" in
- static)
+ case "shared" in
+ static)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -6135,14 +5948,11 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=static
+ php_sapi_module=static
;;
- shared)
+ shared)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -6164,10 +5974,8 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=shared
+ php_sapi_module=shared
php_c_pre=$shared_c_pre
php_c_meta=$shared_c_meta
@@ -6177,9 +5985,8 @@
php_cxx_post=$shared_cxx_post
php_lo=$shared_lo
;;
- bundle)
+ bundle)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -6201,40 +6008,13 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
- php_build_target=static
-;;
- program)
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
-
- php_build_target=program
+ php_sapi_module=static
;;
- esac
+ esac
+ install_sapi="install-sapi"
-
case sapi/apache2filter in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
/*) ac_srcdir=`echo "sapi/apache2filter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
@@ -6276,6 +6056,7 @@
done
+
INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
;;
@@ -6335,7 +6116,7 @@
echo $ac_n "checking for Apache 2.0 handler-module support via DSO through APXS""... $ac_c" 1>&6
-echo "configure:6339: checking for Apache 2.0 handler-module support via DSO through APXS" >&5
+echo "configure:6120: checking for Apache 2.0 handler-module support via DSO through APXS" >&5
if test "$PHP_APXS2" != "no"; then
if test "$PHP_APXS2" = "yes"; then
@@ -6432,23 +6213,33 @@
*aix*)
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp"
- if test "$PHP_SAPI" != "default"; then
-{ echo "configure: error:
+ if test "shared" = "program"; then
+ PHP_BINARIES="$PHP_BINARIES apache2handler"
+ elif test "$PHP_SAPI" != "none"; then
+ { echo "configure: error:
+--------------------------------------------------------------------+
| *** ATTENTION *** |
| |
| You've configured multiple SAPIs to be build. You can build only |
-| one SAPI module and CLI binary at the same time. |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time. |
+--------------------------------------------------------------------+
" 1>&2; exit 1; }
- fi
+ else
+ PHP_SAPI=apache2handler
+ fi
+
+
+
+ BUILD_DIR="$BUILD_DIR sapi/apache2handler"
+
+
+
+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache2handler"
- PHP_SAPI=apache2handler
- case "shared" in
- static)
+ case "shared" in
+ static)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -6470,14 +6261,11 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=static
+ php_sapi_module=static
;;
- shared)
+ shared)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -6499,10 +6287,8 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=shared
+ php_sapi_module=shared
php_c_pre=$shared_c_pre
php_c_meta=$shared_c_meta
@@ -6512,9 +6298,8 @@
php_cxx_post=$shared_cxx_post
php_lo=$shared_lo
;;
- bundle)
+ bundle)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -6536,40 +6321,13 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
- php_build_target=static
-;;
- program)
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
-
- php_build_target=program
+ php_sapi_module=static
;;
- esac
+ esac
+ install_sapi="install-sapi"
-
case sapi/apache2handler in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
/*) ac_srcdir=`echo "sapi/apache2handler"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
@@ -6611,6 +6369,7 @@
done
+
INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
;;
@@ -6626,23 +6385,33 @@
PHP_VAR_SUBST="$PHP_VAR_SUBST MH_BUNDLE_FLAGS"
- if test "$PHP_SAPI" != "default"; then
-{ echo "configure: error:
+ if test "bundle" = "program"; then
+ PHP_BINARIES="$PHP_BINARIES apache2handler"
+ elif test "$PHP_SAPI" != "none"; then
+ { echo "configure: error:
+--------------------------------------------------------------------+
| *** ATTENTION *** |
| |
| You've configured multiple SAPIs to be build. You can build only |
-| one SAPI module and CLI binary at the same time. |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time. |
+--------------------------------------------------------------------+
" 1>&2; exit 1; }
- fi
+ else
+ PHP_SAPI=apache2handler
+ fi
+
+
+
+ BUILD_DIR="$BUILD_DIR sapi/apache2handler"
+
+
+
+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache2handler"
- PHP_SAPI=apache2handler
- case "bundle" in
- static)
+ case "bundle" in
+ static)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -6664,14 +6433,11 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=static
+ php_sapi_module=static
;;
- shared)
+ shared)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -6693,10 +6459,8 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=shared
+ php_sapi_module=shared
php_c_pre=$shared_c_pre
php_c_meta=$shared_c_meta
@@ -6706,9 +6470,8 @@
php_cxx_post=$shared_cxx_post
php_lo=$shared_lo
;;
- bundle)
+ bundle)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -6730,40 +6493,13 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
- php_build_target=static
-;;
- program)
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
-
- php_build_target=program
+ php_sapi_module=static
;;
- esac
+ esac
+ install_sapi="install-sapi"
-
case sapi/apache2handler in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
/*) ac_srcdir=`echo "sapi/apache2handler"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
@@ -6805,6 +6541,7 @@
done
+
SAPI_SHARED=libs/libphp5.so
INSTALL_IT="$INSTALL_IT $SAPI_SHARED"
@@ -6814,23 +6551,33 @@
`ln -s $APXS_BINDIR/httpd _APP_`
EXTRA_LIBS="$EXTRA_LIBS _APP_"
- if test "$PHP_SAPI" != "default"; then
-{ echo "configure: error:
+ if test "shared" = "program"; then
+ PHP_BINARIES="$PHP_BINARIES apache2handler"
+ elif test "$PHP_SAPI" != "none"; then
+ { echo "configure: error:
+--------------------------------------------------------------------+
| *** ATTENTION *** |
| |
| You've configured multiple SAPIs to be build. You can build only |
-| one SAPI module and CLI binary at the same time. |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time. |
+--------------------------------------------------------------------+
" 1>&2; exit 1; }
- fi
+ else
+ PHP_SAPI=apache2handler
+ fi
+
+
+
+ BUILD_DIR="$BUILD_DIR sapi/apache2handler"
+
+
+
+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache2handler"
- PHP_SAPI=apache2handler
- case "shared" in
- static)
+ case "shared" in
+ static)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -6852,14 +6599,11 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=static
+ php_sapi_module=static
;;
- shared)
+ shared)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -6881,10 +6625,8 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=shared
+ php_sapi_module=shared
php_c_pre=$shared_c_pre
php_c_meta=$shared_c_meta
@@ -6894,9 +6636,8 @@
php_cxx_post=$shared_cxx_post
php_lo=$shared_lo
;;
- bundle)
+ bundle)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -6918,47 +6659,20 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
- php_build_target=static
+ php_sapi_module=static
;;
- program)
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
+ esac
+ install_sapi="install-sapi"
+
+
+ case sapi/apache2handler in
+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
+ /*) ac_srcdir=`echo "sapi/apache2handler"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
+ *) ac_srcdir="$abs_srcdir/sapi/apache2handler/"; ac_bdir="sapi/apache2handler/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
-
- php_build_target=program
-;;
- esac
-
-
-
- case sapi/apache2handler in
- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
- /*) ac_srcdir=`echo "sapi/apache2handler"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
- *) ac_srcdir="$abs_srcdir/sapi/apache2handler/"; ac_bdir="sapi/apache2handler/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
- esac
-
-
+
+
b_c_pre=$php_c_pre
b_cxx_pre=$php_cxx_pre
@@ -6993,28 +6707,39 @@
done
+
INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
;;
*)
- if test "$PHP_SAPI" != "default"; then
-{ echo "configure: error:
+ if test "shared" = "program"; then
+ PHP_BINARIES="$PHP_BINARIES apache2handler"
+ elif test "$PHP_SAPI" != "none"; then
+ { echo "configure: error:
+--------------------------------------------------------------------+
| *** ATTENTION *** |
| |
| You've configured multiple SAPIs to be build. You can build only |
-| one SAPI module and CLI binary at the same time. |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time. |
+--------------------------------------------------------------------+
" 1>&2; exit 1; }
- fi
+ else
+ PHP_SAPI=apache2handler
+ fi
- PHP_SAPI=apache2handler
- case "shared" in
- static)
- OVERALL_TARGET=php
+ BUILD_DIR="$BUILD_DIR sapi/apache2handler"
+
+
+
+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache2handler"
+
+
+ case "shared" in
+ static)
+
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -7036,14 +6761,11 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=static
+ php_sapi_module=static
;;
- shared)
+ shared)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -7065,10 +6787,8 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=shared
+ php_sapi_module=shared
php_c_pre=$shared_c_pre
php_c_meta=$shared_c_meta
@@ -7078,9 +6798,8 @@
php_cxx_post=$shared_cxx_post
php_lo=$shared_lo
;;
- bundle)
+ bundle)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -7102,40 +6821,13 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
- php_build_target=static
+ php_sapi_module=static
;;
- program)
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
-
- php_build_target=program
-;;
- esac
+ esac
+ install_sapi="install-sapi"
-
case sapi/apache2handler in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
/*) ac_srcdir=`echo "sapi/apache2handler"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
@@ -7177,6 +6869,7 @@
done
+
INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
;;
@@ -7237,7 +6930,7 @@
echo $ac_n "checking for Apache 1.x (hooks) module support via DSO through APXS""... $ac_c" 1>&6
-echo "configure:7241: checking for Apache 1.x (hooks) module support via DSO through APXS" >&5
+echo "configure:6934: checking for Apache 1.x (hooks) module support via DSO through APXS" >&5
if test "$PHP_APACHE_HOOKS" != "no"; then
if test "$PHP_APACHE_HOOKS" = "yes"; then
@@ -7322,23 +7015,33 @@
esac
- if test "$PHP_SAPI" != "default"; then
-{ echo "configure: error:
+ if test "$build_type" = "program"; then
+ PHP_BINARIES="$PHP_BINARIES apache_hooks"
+ elif test "$PHP_SAPI" != "none"; then
+ { echo "configure: error:
+--------------------------------------------------------------------+
| *** ATTENTION *** |
| |
| You've configured multiple SAPIs to be build. You can build only |
-| one SAPI module and CLI binary at the same time. |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time. |
+--------------------------------------------------------------------+
" 1>&2; exit 1; }
- fi
+ else
+ PHP_SAPI=apache_hooks
+ fi
- PHP_SAPI=apache_hooks
- case "$build_type" in
- static)
- OVERALL_TARGET=php
+ BUILD_DIR="$BUILD_DIR sapi/apache_hooks"
+
+
+
+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache_hooks"
+
+
+ case "$build_type" in
+ static)
+
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -7360,14 +7063,11 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=static
+ php_sapi_module=static
;;
- shared)
+ shared)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -7389,10 +7089,8 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=shared
+ php_sapi_module=shared
php_c_pre=$shared_c_pre
php_c_meta=$shared_c_meta
@@ -7402,9 +7100,8 @@
php_cxx_post=$shared_cxx_post
php_lo=$shared_lo
;;
- bundle)
+ bundle)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -7426,40 +7123,13 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
- php_build_target=static
-;;
- program)
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
-
- php_build_target=program
+ php_sapi_module=static
;;
- esac
+ esac
+ install_sapi="install-sapi"
-
case sapi/apache_hooks in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
/*) ac_srcdir=`echo "sapi/apache_hooks"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
@@ -7501,6 +7171,7 @@
done
+
# Test whether apxs support -S option
@@ -7568,7 +7239,7 @@
echo $ac_n "checking for Apache 1.x (hooks) module support""... $ac_c" 1>&6
-echo "configure:7572: checking for Apache 1.x (hooks) module support" >&5
+echo "configure:7243: checking for Apache 1.x (hooks) module support" >&5
if test "$PHP_SAPI" != "apache" && test "$PHP_SAPI" != "apache_hooks" && test "$PHP_APACHE_HOOKS_STATIC" != "no"; then
@@ -7600,23 +7271,33 @@
APACHE_INCLUDE=-I$PHP_APACHE_HOOKS_STATIC/src
APACHE_TARGET=$PHP_APACHE_HOOKS_STATIC/src
- if test "$PHP_SAPI" != "default"; then
-{ echo "configure: error:
+ if test "static" = "program"; then
+ PHP_BINARIES="$PHP_BINARIES apache_hooks"
+ elif test "$PHP_SAPI" != "none"; then
+ { echo "configure: error:
+--------------------------------------------------------------------+
| *** ATTENTION *** |
| |
| You've configured multiple SAPIs to be build. You can build only |
-| one SAPI module and CLI binary at the same time. |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time. |
+--------------------------------------------------------------------+
" 1>&2; exit 1; }
- fi
+ else
+ PHP_SAPI=apache_hooks
+ fi
+
+
+
+ BUILD_DIR="$BUILD_DIR sapi/apache_hooks"
+
+
+
+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache_hooks"
- PHP_SAPI=apache_hooks
- case "static" in
- static)
+ case "static" in
+ static)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -7638,14 +7319,11 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=static
+ php_sapi_module=static
;;
- shared)
+ shared)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -7667,10 +7345,8 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=shared
+ php_sapi_module=shared
php_c_pre=$shared_c_pre
php_c_meta=$shared_c_meta
@@ -7680,9 +7356,8 @@
php_cxx_post=$shared_cxx_post
php_lo=$shared_lo
;;
- bundle)
+ bundle)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -7704,40 +7379,13 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
- php_build_target=static
-;;
- program)
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
-
- php_build_target=program
+ php_sapi_module=static
;;
- esac
+ esac
+ install_sapi="install-sapi"
-
case sapi/apache_hooks in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
/*) ac_srcdir=`echo "sapi/apache_hooks"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
@@ -7779,6 +7427,7 @@
done
+
APACHE_HOOKS_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_HOOKS_INSTALL_FILES $APACHE_TARGET"
PHP_LIBS="-L. -lphp3"
@@ -7802,23 +7451,33 @@
mkdir $APACHE_TARGET
fi
- if test "$PHP_SAPI" != "default"; then
-{ echo "configure: error:
+ if test "static" = "program"; then
+ PHP_BINARIES="$PHP_BINARIES apache_hooks"
+ elif test "$PHP_SAPI" != "none"; then
+ { echo "configure: error:
+--------------------------------------------------------------------+
| *** ATTENTION *** |
| |
| You've configured multiple SAPIs to be build. You can build only |
-| one SAPI module and CLI binary at the same time. |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time. |
+--------------------------------------------------------------------+
" 1>&2; exit 1; }
- fi
+ else
+ PHP_SAPI=apache_hooks
+ fi
+
+
+
+ BUILD_DIR="$BUILD_DIR sapi/apache_hooks"
+
+
+
+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache_hooks"
- PHP_SAPI=apache_hooks
- case "static" in
- static)
+ case "static" in
+ static)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -7840,14 +7499,11 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=static
+ php_sapi_module=static
;;
- shared)
+ shared)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -7869,10 +7525,8 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=shared
+ php_sapi_module=shared
php_c_pre=$shared_c_pre
php_c_meta=$shared_c_meta
@@ -7882,9 +7536,8 @@
php_cxx_post=$shared_cxx_post
php_lo=$shared_lo
;;
- bundle)
+ bundle)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -7906,40 +7559,13 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
- php_build_target=static
+ php_sapi_module=static
;;
- program)
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
-
- php_build_target=program
-;;
- esac
+ esac
+ install_sapi="install-sapi"
-
case sapi/apache_hooks in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
/*) ac_srcdir=`echo "sapi/apache_hooks"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
@@ -7981,6 +7607,7 @@
done
+
APACHE_HOOKS_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_HOOKS_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache_hooks/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache_hooks/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5"
@@ -8015,23 +7642,33 @@
mkdir $APACHE_TARGET
fi
- if test "$PHP_SAPI" != "default"; then
-{ echo "configure: error:
+ if test "static" = "program"; then
+ PHP_BINARIES="$PHP_BINARIES apache_hooks"
+ elif test "$PHP_SAPI" != "none"; then
+ { echo "configure: error:
+--------------------------------------------------------------------+
| *** ATTENTION *** |
| |
| You've configured multiple SAPIs to be build. You can build only |
-| one SAPI module and CLI binary at the same time. |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time. |
+--------------------------------------------------------------------+
" 1>&2; exit 1; }
- fi
+ else
+ PHP_SAPI=apache_hooks
+ fi
- PHP_SAPI=apache_hooks
- case "static" in
- static)
- OVERALL_TARGET=php
+ BUILD_DIR="$BUILD_DIR sapi/apache_hooks"
+
+
+
+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache_hooks"
+
+
+ case "static" in
+ static)
+
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -8053,14 +7690,11 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=static
+ php_sapi_module=static
;;
- shared)
+ shared)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -8082,10 +7716,8 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=shared
+ php_sapi_module=shared
php_c_pre=$shared_c_pre
php_c_meta=$shared_c_meta
@@ -8095,9 +7727,8 @@
php_cxx_post=$shared_cxx_post
php_lo=$shared_lo
;;
- bundle)
+ bundle)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -8119,40 +7750,13 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
- php_build_target=static
+ php_sapi_module=static
;;
- program)
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
-
- php_build_target=program
-;;
- esac
+ esac
+ install_sapi="install-sapi"
-
case sapi/apache_hooks in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
/*) ac_srcdir=`echo "sapi/apache_hooks"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
@@ -8194,6 +7798,7 @@
done
+
PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5"
APACHE_HOOKS_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_HOOKS_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache_hooks/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache_hooks/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
@@ -8224,23 +7829,33 @@
APACHE_INCLUDE="-I$PHP_APACHE_HOOKS_STATIC/apache -I$PHP_APACHE_HOOKS_STATIC/ssl/include"
APACHE_TARGET=$PHP_APACHE_HOOKS_STATIC/apache
- if test "$PHP_SAPI" != "default"; then
-{ echo "configure: error:
+ if test "static" = "program"; then
+ PHP_BINARIES="$PHP_BINARIES apache_hooks"
+ elif test "$PHP_SAPI" != "none"; then
+ { echo "configure: error:
+--------------------------------------------------------------------+
| *** ATTENTION *** |
| |
| You've configured multiple SAPIs to be build. You can build only |
-| one SAPI module and CLI binary at the same time. |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time. |
+--------------------------------------------------------------------+
" 1>&2; exit 1; }
- fi
+ else
+ PHP_SAPI=apache_hooks
+ fi
- PHP_SAPI=apache_hooks
- case "static" in
- static)
- OVERALL_TARGET=php
+ BUILD_DIR="$BUILD_DIR sapi/apache_hooks"
+
+
+
+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache_hooks"
+
+
+ case "static" in
+ static)
+
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -8262,14 +7877,11 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=static
+ php_sapi_module=static
;;
- shared)
+ shared)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -8291,10 +7903,8 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=shared
+ php_sapi_module=shared
php_c_pre=$shared_c_pre
php_c_meta=$shared_c_meta
@@ -8304,9 +7914,8 @@
php_cxx_post=$shared_cxx_post
php_lo=$shared_lo
;;
- bundle)
+ bundle)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -8328,40 +7937,13 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
- php_build_target=static
+ php_sapi_module=static
;;
- program)
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
-
- php_build_target=program
-;;
- esac
+ esac
+ install_sapi="install-sapi"
-
case sapi/apache_hooks in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
/*) ac_srcdir=`echo "sapi/apache_hooks"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
@@ -8403,6 +7985,7 @@
done
+
PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5"
APACHE_HOOKS_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_HOOKS_INSTALL_FILES $APACHE_TARGET"
@@ -8445,7 +8028,7 @@
php_enable_mod_charset=no
echo $ac_n "checking whether to enable Apache charset compatibility option""... $ac_c" 1>&6
-echo "configure:8449: checking whether to enable Apache charset compatibility option" >&5
+echo "configure:8032: checking whether to enable Apache charset compatibility option" >&5
# Check whether --enable-mod-charset or --disable-mod-charset was given.
if test "${enable_mod_charset+set}" = set; then
enableval="$enable_mod_charset"
@@ -8477,7 +8060,7 @@
gcc_arg_name=ac_cv_gcc_arg_rdynamic
echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6
-echo "configure:8481: checking whether $CC supports -rdynamic" >&5
+echo "configure:8064: checking whether $CC supports -rdynamic" >&5
if eval "test \"`echo '$''{'ac_cv_gcc_arg_rdynamic'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -8520,7 +8103,7 @@
echo $ac_n "checking for member fd in BUFF *""... $ac_c" 1>&6
-echo "configure:8524: checking for member fd in BUFF *" >&5
+echo "configure:8107: checking for member fd in BUFF *" >&5
if eval "test \"`echo '$''{'ac_cv_php_fd_in_buff'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -8532,14 +8115,14 @@
CPPFLAGS="$CPPFLAGS $APACHE_INCLUDE"
fi
cat > conftest.$ac_ext <<EOF
-#line 8536 "configure"
+#line 8119 "configure"
#include "confdefs.h"
#include <httpd.h>
int main() {
conn_rec *c; int fd = c->client->fd;
; return 0; }
EOF
-if { (eval echo configure:8543: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8126: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_php_fd_in_buff=yes
@@ -8613,7 +8196,7 @@
echo $ac_n "checking for Caudium support""... $ac_c" 1>&6
-echo "configure:8617: checking for Caudium support" >&5
+echo "configure:8200: checking for Caudium support" >&5
if test "$PHP_CAUDIUM" != "no"; then
if test "$prefix" = "NONE"; then CPREF=/usr/local/; fi
@@ -8683,7 +8266,7 @@
PIKE_C_INCLUDE=/usr/local/include/`basename $PIKE`
fi
echo $ac_n "checking for C includes in $PIKE_C_INCLUDE""... $ac_c" 1>&6
-echo "configure:8687: checking for C includes in $PIKE_C_INCLUDE" >&5
+echo "configure:8270: checking for C includes in $PIKE_C_INCLUDE" >&5
if test -f $PIKE_C_INCLUDE/version.h; then
PIKE_TEST_VER=`$PIKE -e 'string v; int rel;sscanf(version(), "Pike v%s release %d", v, rel); write(v+"."+rel);'`
###### VERSION MATCH CHECK #######
@@ -8754,23 +8337,33 @@
EOF
- if test "$PHP_SAPI" != "default"; then
-{ echo "configure: error:
+ if test "shared" = "program"; then
+ PHP_BINARIES="$PHP_BINARIES caudium"
+ elif test "$PHP_SAPI" != "none"; then
+ { echo "configure: error:
+--------------------------------------------------------------------+
| *** ATTENTION *** |
| |
| You've configured multiple SAPIs to be build. You can build only |
-| one SAPI module and CLI binary at the same time. |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time. |
+--------------------------------------------------------------------+
" 1>&2; exit 1; }
- fi
+ else
+ PHP_SAPI=caudium
+ fi
+
+
+
+ BUILD_DIR="$BUILD_DIR sapi/caudium"
+
+
+
+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS caudium"
- PHP_SAPI=caudium
- case "shared" in
- static)
+ case "shared" in
+ static)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -8792,14 +8385,11 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=static
+ php_sapi_module=static
;;
- shared)
+ shared)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -8821,10 +8411,8 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=shared
+ php_sapi_module=shared
php_c_pre=$shared_c_pre
php_c_meta=$shared_c_meta
@@ -8834,9 +8422,8 @@
php_cxx_post=$shared_cxx_post
php_lo=$shared_lo
;;
- bundle)
+ bundle)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -8858,40 +8445,13 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
- php_build_target=static
+ php_sapi_module=static
;;
- program)
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
-
- php_build_target=program
-;;
- esac
+ esac
+ install_sapi="install-sapi"
-
case sapi/caudium in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
/*) ac_srcdir=`echo "sapi/caudium"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
@@ -8933,6 +8493,7 @@
done
+
INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PHP_CAUDIUM/lib/$PIKE_VERSION/PHP5.so"
RESULT=" *** Pike binary used: $PIKE
@@ -8972,44 +8533,143 @@
echo $ac_n "checking for CLI build""... $ac_c" 1>&6
-echo "configure:8976: checking for CLI build" >&5
+echo "configure:8537: checking for CLI build" >&5
if test "$PHP_CLI" != "no"; then
src=$abs_srcdir/sapi/cli/Makefile.frag
- ac_srcdir=$abs_srcdir/sapi/cli
- ac_builddir=sapi/cli
+ ac_srcdir=$ext_srcdir
+ ac_builddir=$ext_builddir
test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments
- SAPI_CLI_PATH=sapi/cli/php
+
+ SAPI_CLI_PATH=sapi/cli/php
+
+
+ if test "program" = "program"; then
+ PHP_BINARIES="$PHP_BINARIES cli"
+ elif test "$PHP_SAPI" != "none"; then
+ { echo "configure: error:
++--------------------------------------------------------------------+
+| *** ATTENTION *** |
+| |
+| You've configured multiple SAPIs to be build. You can build only |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time. |
++--------------------------------------------------------------------+
+" 1>&2; exit 1; }
+ else
+ PHP_SAPI=cli
+ fi
+
+
+
+ BUILD_DIR="$BUILD_DIR sapi/cli"
+
+
+
+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS cli"
+
+
+
+ php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
+ php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
+ php_c_post=
+ php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
+ php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
+ php_cxx_post=
+ php_lo=lo
+
+ case $with_pic in
+ yes) pic_setting='-prefer-pic';;
+ no) pic_setting='-prefer-non-pic';;
+ esac
+
+ shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
+ shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
+ shared_c_post=
+ shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
+ shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
+ shared_cxx_post=
+ shared_lo=lo
+
+ install_binaries="install-binaries"
+ install_binary_targets="$install_binary_targets install-cli"
+
+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_CLI_OBJS"
+
+
+ case sapi/cli in
+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
+ /*) ac_srcdir=`echo "sapi/cli"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
+ *) ac_srcdir="$abs_srcdir/sapi/cli/"; ac_bdir="sapi/cli/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
+ esac
+
+
+
+ b_c_pre=$php_c_pre
+ b_cxx_pre=$php_cxx_pre
+ b_c_meta=$php_c_meta
+ b_cxx_meta=$php_cxx_meta
+ b_c_post=$php_c_post
+ b_cxx_post=$php_cxx_post
+ b_lo=$php_lo
+
+
+ old_IFS=$IFS
+ for ac_src in php_cli.c php_cli_readline.c; do
+
+ IFS=.
+ set $ac_src
+ ac_obj=$1
+ IFS=$old_IFS
+
+ PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+
+ case $ac_src in
+ *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
+ *.s) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
+ *.S) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
+ esac
+
+ cat >>Makefile.objects<<EOF
+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
+ $ac_comp
+EOF
+ done
+
- PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_CLI_PATH"
case $host_alias in
*aix*)
- if test "$php_build_target" = "shared"; then
- BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/.libs\/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
+ if test "$php_sapi_module" = "shared"; then
+ BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/.libs\/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
else
- BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
+ BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
fi
;;
*darwin*)
- BUILD_CLI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
+ BUILD_CLI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
;;
*netware*)
- BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -Lnetware -lphp5lib -o \$(SAPI_CLI_PATH)"
+ BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -Lnetware -lphp5lib -o \$(SAPI_CLI_PATH)"
;;
*)
- BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
+ BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
;;
esac
- INSTALL_CLI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 \$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)\$(EXEEXT)"
+ PHP_EXECUTABLE="\$(top_builddir)/\$(SAPI_CLI_PATH)"
- PHP_VAR_SUBST="$PHP_VAR_SUBST BUILD_CLI"
+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_EXECUTABLE"
+
+
+
+ PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_CLI_PATH"
- PHP_VAR_SUBST="$PHP_VAR_SUBST INSTALL_CLI"
+ PHP_VAR_SUBST="$PHP_VAR_SUBST BUILD_CLI"
+
PHP_OUTPUT_FILES="$PHP_OUTPUT_FILES sapi/cli/php.1"
@@ -9022,7 +8682,7 @@
php_with_continuity=no
echo $ac_n "checking for Continuity support""... $ac_c" 1>&6
-echo "configure:9026: checking for Continuity support" >&5
+echo "configure:8686: checking for Continuity support" >&5
# Check whether --with-continuity or --without-continuity was given.
if test "${with_continuity+set}" = set; then
withval="$with_continuity"
@@ -9046,7 +8706,7 @@
{ echo "configure: error: Please specify the path to the root of your Continuity server using --with-continuity=DIR" 1>&2; exit 1; }
fi
echo $ac_n "checking for Continuity include files""... $ac_c" 1>&6
-echo "configure:9050: checking for Continuity include files" >&5
+echo "configure:8710: checking for Continuity include files" >&5
if test -d $PHP_CONTINUITY/include ; then
CAPI_INCLUDE=$PHP_CONTINUITY/include
echo "$ac_t""Continuity Binary Distribution" 1>&6
@@ -9055,23 +8715,33 @@
fi
- if test "$PHP_SAPI" != "default"; then
-{ echo "configure: error:
+ if test "shared" = "program"; then
+ PHP_BINARIES="$PHP_BINARIES continuity"
+ elif test "$PHP_SAPI" != "none"; then
+ { echo "configure: error:
+--------------------------------------------------------------------+
| *** ATTENTION *** |
| |
| You've configured multiple SAPIs to be build. You can build only |
-| one SAPI module and CLI binary at the same time. |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time. |
+--------------------------------------------------------------------+
" 1>&2; exit 1; }
- fi
+ else
+ PHP_SAPI=continuity
+ fi
- PHP_SAPI=continuity
- case "shared" in
- static)
- OVERALL_TARGET=php
+ BUILD_DIR="$BUILD_DIR sapi/continuity"
+
+
+
+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS continuity"
+
+
+ case "shared" in
+ static)
+
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -9093,14 +8763,11 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=static
+ php_sapi_module=static
;;
- shared)
+ shared)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -9122,10 +8789,8 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=shared
+ php_sapi_module=shared
php_c_pre=$shared_c_pre
php_c_meta=$shared_c_meta
@@ -9135,9 +8800,8 @@
php_cxx_post=$shared_cxx_post
php_lo=$shared_lo
;;
- bundle)
+ bundle)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -9159,40 +8823,13 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
- php_build_target=static
+ php_sapi_module=static
;;
- program)
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
-
- php_build_target=program
-;;
- esac
+ esac
+ install_sapi="install-sapi"
-
case sapi/continuity in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
/*) ac_srcdir=`echo "sapi/continuity"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
@@ -9234,6 +8871,7 @@
done
+
if test "$CAPI_INCLUDE" != "/usr/include"; then
@@ -9304,7 +8942,7 @@
echo $ac_n "checking for embedded SAPI library support""... $ac_c" 1>&6
-echo "configure:9308: checking for embedded SAPI library support" >&5
+echo "configure:8946: checking for embedded SAPI library support" >&5
if test "$PHP_EMBED" != "no"; then
case "$PHP_EMBED" in
@@ -9322,23 +8960,33 @@
esac
if test "$PHP_EMBED_TYPE" != "no"; then
- if test "$PHP_SAPI" != "default"; then
-{ echo "configure: error:
+ if test "$PHP_EMBED_TYPE" = "program"; then
+ PHP_BINARIES="$PHP_BINARIES embed"
+ elif test "$PHP_SAPI" != "none"; then
+ { echo "configure: error:
+--------------------------------------------------------------------+
| *** ATTENTION *** |
| |
| You've configured multiple SAPIs to be build. You can build only |
-| one SAPI module and CLI binary at the same time. |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time. |
+--------------------------------------------------------------------+
" 1>&2; exit 1; }
- fi
+ else
+ PHP_SAPI=embed
+ fi
- PHP_SAPI=embed
- case "$PHP_EMBED_TYPE" in
- static)
- OVERALL_TARGET=php
+ BUILD_DIR="$BUILD_DIR sapi/embed"
+
+
+
+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS embed"
+
+
+ case "$PHP_EMBED_TYPE" in
+ static)
+
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -9360,14 +9008,11 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=static
+ php_sapi_module=static
;;
- shared)
+ shared)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -9389,10 +9034,8 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=shared
+ php_sapi_module=shared
php_c_pre=$shared_c_pre
php_c_meta=$shared_c_meta
@@ -9402,9 +9045,8 @@
php_cxx_post=$shared_cxx_post
php_lo=$shared_lo
;;
- bundle)
+ bundle)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -9426,40 +9068,13 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
- php_build_target=static
-;;
- program)
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
-
- php_build_target=program
+ php_sapi_module=static
;;
- esac
+ esac
+ install_sapi="install-sapi"
-
case sapi/embed in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
/*) ac_srcdir=`echo "sapi/embed"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
@@ -9501,6 +9116,7 @@
done
+
@@ -9580,7 +9196,7 @@
echo $ac_n "checking for FPM build""... $ac_c" 1>&6
-echo "configure:9584: checking for FPM build" >&5
+echo "configure:9200: checking for FPM build" >&5
if test "$PHP_FPM" != "no"; then
echo "$ac_t""$PHP_FPM" 1>&6
@@ -9588,12 +9204,12 @@
for ac_func in setenv clearenv setproctitle
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9592: checking for $ac_func" >&5
+echo "configure:9208: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9597 "configure"
+#line 9213 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -9616,7 +9232,7 @@
; return 0; }
EOF
-if { (eval echo configure:9620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -9643,14 +9259,14 @@
echo $ac_n "checking for library containing socket""... $ac_c" 1>&6
-echo "configure:9647: checking for library containing socket" >&5
+echo "configure:9263: checking for library containing socket" >&5
if eval "test \"`echo '$''{'ac_cv_search_socket'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_func_search_save_LIBS="$LIBS"
ac_cv_search_socket="no"
cat > conftest.$ac_ext <<EOF
-#line 9654 "configure"
+#line 9270 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9661,7 +9277,7 @@
socket()
; return 0; }
EOF
-if { (eval echo configure:9665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_search_socket="none required"
else
@@ -9672,7 +9288,7 @@
test "$ac_cv_search_socket" = "no" && for i in socket; do
LIBS="-l$i $ac_func_search_save_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9676 "configure"
+#line 9292 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9683,7 +9299,7 @@
socket()
; return 0; }
EOF
-if { (eval echo configure:9687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_search_socket="-l$i"
break
@@ -9705,14 +9321,14 @@
fi
echo $ac_n "checking for library containing inet_addr""... $ac_c" 1>&6
-echo "configure:9709: checking for library containing inet_addr" >&5
+echo "configure:9325: checking for library containing inet_addr" >&5
if eval "test \"`echo '$''{'ac_cv_search_inet_addr'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_func_search_save_LIBS="$LIBS"
ac_cv_search_inet_addr="no"
cat > conftest.$ac_ext <<EOF
-#line 9716 "configure"
+#line 9332 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9723,7 +9339,7 @@
inet_addr()
; return 0; }
EOF
-if { (eval echo configure:9727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_search_inet_addr="none required"
else
@@ -9734,7 +9350,7 @@
test "$ac_cv_search_inet_addr" = "no" && for i in nsl; do
LIBS="-l$i $ac_func_search_save_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9738 "configure"
+#line 9354 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9745,7 +9361,7 @@
inet_addr()
; return 0; }
EOF
-if { (eval echo configure:9749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_search_inet_addr="-l$i"
break
@@ -9770,17 +9386,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9774: checking for $ac_hdr" >&5
+echo "configure:9390: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9779 "configure"
+#line 9395 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9784: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9400: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -9810,17 +9426,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9814: checking for $ac_hdr" >&5
+echo "configure:9430: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9819 "configure"
+#line 9435 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9824: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9440: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -9850,17 +9466,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9854: checking for $ac_hdr" >&5
+echo "configure:9470: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9859 "configure"
+#line 9475 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9864: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9480: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -9890,17 +9506,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9894: checking for $ac_hdr" >&5
+echo "configure:9510: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9899 "configure"
+#line 9515 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9904: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9520: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -9929,17 +9545,17 @@
echo $ac_n "checking for prctl""... $ac_c" 1>&6
-echo "configure:9933: checking for prctl" >&5
+echo "configure:9549: checking for prctl" >&5
cat > conftest.$ac_ext <<EOF
-#line 9936 "configure"
+#line 9552 "configure"
#include "confdefs.h"
#include <sys/prctl.h>
int main() {
prctl(0, 0, 0, 0, 0);
; return 0; }
EOF
-if { (eval echo configure:9943: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9559: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
@@ -9962,17 +9578,17 @@
have_clock_gettime=no
echo $ac_n "checking for clock_gettime""... $ac_c" 1>&6
-echo "configure:9966: checking for clock_gettime" >&5
+echo "configure:9582: checking for clock_gettime" >&5
cat > conftest.$ac_ext <<EOF
-#line 9969 "configure"
+#line 9585 "configure"
#include "confdefs.h"
#include <time.h>
int main() {
struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts);
; return 0; }
EOF
-if { (eval echo configure:9976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
have_clock_gettime=yes
@@ -9990,20 +9606,20 @@
if test "$have_clock_gettime" = "no"; then
echo $ac_n "checking for clock_gettime in -lrt""... $ac_c" 1>&6
-echo "configure:9994: checking for clock_gettime in -lrt" >&5
+echo "configure:9610: checking for clock_gettime in -lrt" >&5
SAVED_LIBS="$LIBS"
LIBS="$LIBS -lrt"
cat > conftest.$ac_ext <<EOF
-#line 10000 "configure"
+#line 9616 "configure"
#include "confdefs.h"
#include <time.h>
int main() {
struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts);
; return 0; }
EOF
-if { (eval echo configure:10007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
have_clock_gettime=yes
@@ -10032,13 +9648,13 @@
if test "$have_clock_gettime" = "no"; then
echo $ac_n "checking for clock_get_time""... $ac_c" 1>&6
-echo "configure:10036: checking for clock_get_time" >&5
+echo "configure:9652: checking for clock_get_time" >&5
if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 10042 "configure"
+#line 9658 "configure"
#include "confdefs.h"
#include <mach/mach.h>
#include <mach/clock.h>
@@ -10062,7 +9678,7 @@
}
EOF
-if { (eval echo configure:10066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
have_clock_get_time=yes
@@ -10093,10 +9709,10 @@
have_broken_ptrace=no
echo $ac_n "checking for ptrace""... $ac_c" 1>&6
-echo "configure:10097: checking for ptrace" >&5
+echo "configure:9713: checking for ptrace" >&5
cat > conftest.$ac_ext <<EOF
-#line 10100 "configure"
+#line 9716 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -10105,7 +9721,7 @@
ptrace(0, 0, (void *) 0, 0);
; return 0; }
EOF
-if { (eval echo configure:10109: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9725: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
have_ptrace=yes
@@ -10123,13 +9739,13 @@
if test "$have_ptrace" = "yes"; then
echo $ac_n "checking whether ptrace works""... $ac_c" 1>&6
-echo "configure:10127: checking whether ptrace works" >&5
+echo "configure:9743: checking whether ptrace works" >&5
if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 10133 "configure"
+#line 9749 "configure"
#include "confdefs.h"
#include <unistd.h>
@@ -10200,7 +9816,7 @@
}
EOF
-if { (eval echo configure:10204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
echo "$ac_t""yes" 1>&6
@@ -10231,10 +9847,10 @@
if test "$have_broken_ptrace" = "yes"; then
echo $ac_n "checking for mach_vm_read""... $ac_c" 1>&6
-echo "configure:10235: checking for mach_vm_read" >&5
+echo "configure:9851: checking for mach_vm_read" >&5
cat > conftest.$ac_ext <<EOF
-#line 10238 "configure"
+#line 9854 "configure"
#include "confdefs.h"
#include <mach/mach.h>
#include <mach/mach_vm.h>
@@ -10245,7 +9861,7 @@
; return 0; }
EOF
-if { (eval echo configure:10249: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9865: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
have_mach_vm_read=yes
@@ -10281,13 +9897,13 @@
if test -n "$proc_mem_file" ; then
echo $ac_n "checking for proc mem file""... $ac_c" 1>&6
-echo "configure:10285: checking for proc mem file" >&5
+echo "configure:9901: checking for proc mem file" >&5
if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 10291 "configure"
+#line 9907 "configure"
#include "confdefs.h"
#define _GNU_SOURCE
@@ -10317,7 +9933,7 @@
}
EOF
-if { (eval echo configure:10321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
echo "$ac_t""$proc_mem_file" 1>&6
@@ -10361,9 +9977,9 @@
echo $ac_n "checking if gcc supports __sync_bool_compare_and_swap""... $ac_c" 1>&6
-echo "configure:10365: checking if gcc supports __sync_bool_compare_and_swap" >&5
+echo "configure:9981: checking if gcc supports __sync_bool_compare_and_swap" >&5
cat > conftest.$ac_ext <<EOF
-#line 10367 "configure"
+#line 9983 "configure"
#include "confdefs.h"
int main() {
@@ -10374,7 +9990,7 @@
; return 0; }
EOF
-if { (eval echo configure:10378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
@@ -10397,17 +10013,17 @@
have_lq=no
echo $ac_n "checking for TCP_INFO""... $ac_c" 1>&6
-echo "configure:10401: checking for TCP_INFO" >&5
+echo "configure:10017: checking for TCP_INFO" >&5
cat > conftest.$ac_ext <<EOF
-#line 10404 "configure"
+#line 10020 "configure"
#include "confdefs.h"
#include <netinet/tcp.h>
int main() {
struct tcp_info ti; int x = TCP_INFO;
; return 0; }
EOF
-if { (eval echo configure:10411: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
have_lq=tcp_info
@@ -10432,17 +10048,17 @@
if test "$have_lq" = "no" ; then
echo $ac_n "checking for SO_LISTENQLEN""... $ac_c" 1>&6
-echo "configure:10436: checking for SO_LISTENQLEN" >&5
+echo "configure:10052: checking for SO_LISTENQLEN" >&5
cat > conftest.$ac_ext <<EOF
-#line 10439 "configure"
+#line 10055 "configure"
#include "confdefs.h"
#include <sys/socket.h>
int main() {
int x = SO_LISTENQLIMIT; int y = SO_LISTENQLEN;
; return 0; }
EOF
-if { (eval echo configure:10446: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10062: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
have_lq=so_listenq
@@ -10468,17 +10084,17 @@
echo $ac_n "checking for sysconf""... $ac_c" 1>&6
-echo "configure:10472: checking for sysconf" >&5
+echo "configure:10088: checking for sysconf" >&5
cat > conftest.$ac_ext <<EOF
-#line 10475 "configure"
+#line 10091 "configure"
#include "confdefs.h"
#include <unistd.h>
int main() {
sysconf(_SC_CLK_TCK);
; return 0; }
EOF
-if { (eval echo configure:10482: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10098: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
@@ -10499,17 +10115,17 @@
echo $ac_n "checking for times""... $ac_c" 1>&6
-echo "configure:10503: checking for times" >&5
+echo "configure:10119: checking for times" >&5
cat > conftest.$ac_ext <<EOF
-#line 10506 "configure"
+#line 10122 "configure"
#include "confdefs.h"
#include <sys/times.h>
int main() {
struct tms t; times(&t);
; return 0; }
EOF
-if { (eval echo configure:10513: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10129: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
@@ -10530,10 +10146,10 @@
echo $ac_n "checking for kqueue""... $ac_c" 1>&6
-echo "configure:10534: checking for kqueue" >&5
+echo "configure:10150: checking for kqueue" >&5
cat > conftest.$ac_ext <<EOF
-#line 10537 "configure"
+#line 10153 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -10550,7 +10166,7 @@
; return 0; }
EOF
-if { (eval echo configure:10554: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10170: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
@@ -10571,10 +10187,10 @@
echo $ac_n "checking for port framework""... $ac_c" 1>&6
-echo "configure:10575: checking for port framework" >&5
+echo "configure:10191: checking for port framework" >&5
cat > conftest.$ac_ext <<EOF
-#line 10578 "configure"
+#line 10194 "configure"
#include "confdefs.h"
#include <port.h>
@@ -10590,7 +10206,7 @@
; return 0; }
EOF
-if { (eval echo configure:10594: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10210: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
@@ -10611,10 +10227,10 @@
echo $ac_n "checking for /dev/poll""... $ac_c" 1>&6
-echo "configure:10615: checking for /dev/poll" >&5
+echo "configure:10231: checking for /dev/poll" >&5
cat > conftest.$ac_ext <<EOF
-#line 10618 "configure"
+#line 10234 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -10632,7 +10248,7 @@
; return 0; }
EOF
-if { (eval echo configure:10636: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10252: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
@@ -10653,10 +10269,10 @@
echo $ac_n "checking for epoll""... $ac_c" 1>&6
-echo "configure:10657: checking for epoll" >&5
+echo "configure:10273: checking for epoll" >&5
cat > conftest.$ac_ext <<EOF
-#line 10660 "configure"
+#line 10276 "configure"
#include "confdefs.h"
#include <sys/epoll.h>
@@ -10685,7 +10301,7 @@
; return 0; }
EOF
-if { (eval echo configure:10689: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10305: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
@@ -10706,10 +10322,10 @@
echo $ac_n "checking for poll""... $ac_c" 1>&6
-echo "configure:10710: checking for poll" >&5
+echo "configure:10326: checking for poll" >&5
cat > conftest.$ac_ext <<EOF
-#line 10713 "configure"
+#line 10329 "configure"
#include "confdefs.h"
#include <poll.h>
@@ -10728,7 +10344,7 @@
; return 0; }
EOF
-if { (eval echo configure:10732: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
@@ -10749,10 +10365,10 @@
echo $ac_n "checking for select""... $ac_c" 1>&6
-echo "configure:10753: checking for select" >&5
+echo "configure:10369: checking for select" >&5
cat > conftest.$ac_ext <<EOF
-#line 10756 "configure"
+#line 10372 "configure"
#include "confdefs.h"
/* According to POSIX.1-2001 */
@@ -10776,7 +10392,7 @@
; return 0; }
EOF
-if { (eval echo configure:10780: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
@@ -10896,27 +10512,33 @@
+
+ BUILD_DIR="$BUILD_DIR sapi/fpm/fpm"
+
+
+
+
+ BUILD_DIR="$BUILD_DIR sapi/fpm/fpm/events"
+
+
+
PHP_OUTPUT_FILES="$PHP_OUTPUT_FILES sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.8 sapi/fpm/status.html"
src=$abs_srcdir/sapi/fpm/Makefile.frag
- ac_srcdir=$abs_srcdir/sapi/fpm
- ac_builddir=sapi/fpm
+ ac_srcdir=$ext_srcdir
+ ac_builddir=$ext_builddir
test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments
SAPI_FPM_PATH=sapi/fpm/php-fpm
- PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_FPM_PATH"
-
-
if test "$fpm_trace_type" && test -f "$abs_srcdir/sapi/fpm/fpm/fpm_trace_$fpm_trace_type.c"; then
PHP_FPM_TRACE_FILES="fpm/fpm_trace.c fpm/fpm_trace_$fpm_trace_type.c"
fi
PHP_FPM_CFLAGS="-I$abs_srcdir/sapi/fpm"
- INSTALL_IT=":"
PHP_FPM_FILES="fpm/fastcgi.c \
fpm/fpm.c \
fpm/fpm_children.c \
@@ -10949,89 +10571,31 @@
"
- if test "$PHP_SAPI" != "default"; then
-{ echo "configure: error:
+ if test "program" = "program"; then
+ PHP_BINARIES="$PHP_BINARIES fpm"
+ elif test "$PHP_SAPI" != "none"; then
+ { echo "configure: error:
+--------------------------------------------------------------------+
| *** ATTENTION *** |
| |
| You've configured multiple SAPIs to be build. You can build only |
-| one SAPI module and CLI binary at the same time. |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time. |
+--------------------------------------------------------------------+
" 1>&2; exit 1; }
- fi
+ else
+ PHP_SAPI=fpm
+ fi
- PHP_SAPI=fpm
- case "program" in
- static)
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
-
- php_build_target=program
-
- OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=static
-;;
- shared)
+ BUILD_DIR="$BUILD_DIR sapi/fpm"
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
- php_build_target=program
+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS fpm"
- OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=shared
- php_c_pre=$shared_c_pre
- php_c_meta=$shared_c_meta
- php_c_post=$shared_c_post
- php_cxx_pre=$shared_cxx_pre
- php_cxx_meta=$shared_cxx_meta
- php_cxx_post=$shared_cxx_post
- php_lo=$shared_lo
-;;
- bundle)
-
- OVERALL_TARGET=php
+
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -11053,40 +10617,12 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
- OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
- php_build_target=static
-;;
- program)
- OVERALL_TARGET='$(SAPI_FPM_PATH)'
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
+ install_binaries="install-binaries"
+ install_binary_targets="$install_binary_targets install-fpm"
+
+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_FPM_OBJS"
- php_build_target=program
-;;
- esac
-
-
case sapi/fpm in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
/*) ac_srcdir=`echo "sapi/fpm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
@@ -11112,7 +10648,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_FPM_OBJS="$PHP_FPM_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $PHP_FPM_CFLAGS $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -11127,24 +10663,28 @@
EOF
done
-
+
case $host_alias in
*aix*)
- BUILD_FPM="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
+ BUILD_FPM="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FPM_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
;;
*darwin*)
- BUILD_FPM="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
+ BUILD_FPM="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FPM_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
;;
*)
- BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
+ BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
;;
esac
+ PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_FPM_PATH"
+
+
PHP_VAR_SUBST="$PHP_VAR_SUBST BUILD_FPM"
+
else
echo "$ac_t""no" 1>&6
fi
@@ -11154,7 +10694,7 @@
php_with_isapi=no
echo $ac_n "checking for Zeus ISAPI support""... $ac_c" 1>&6
-echo "configure:11158: checking for Zeus ISAPI support" >&5
+echo "configure:10698: checking for Zeus ISAPI support" >&5
# Check whether --with-isapi or --without-isapi was given.
if test "${with_isapi+set}" = set; then
withval="$with_isapi"
@@ -11222,23 +10762,33 @@
fi
- if test "$PHP_SAPI" != "default"; then
-{ echo "configure: error:
+ if test "shared" = "program"; then
+ PHP_BINARIES="$PHP_BINARIES isapi"
+ elif test "$PHP_SAPI" != "none"; then
+ { echo "configure: error:
+--------------------------------------------------------------------+
| *** ATTENTION *** |
| |
| You've configured multiple SAPIs to be build. You can build only |
-| one SAPI module and CLI binary at the same time. |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time. |
+--------------------------------------------------------------------+
" 1>&2; exit 1; }
- fi
+ else
+ PHP_SAPI=isapi
+ fi
+
+
+
+ BUILD_DIR="$BUILD_DIR sapi/isapi"
+
+
+
+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS isapi"
- PHP_SAPI=isapi
- case "shared" in
- static)
+ case "shared" in
+ static)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -11260,14 +10810,11 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=static
+ php_sapi_module=static
;;
- shared)
+ shared)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -11289,10 +10836,8 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=shared
+ php_sapi_module=shared
php_c_pre=$shared_c_pre
php_c_meta=$shared_c_meta
@@ -11302,9 +10847,8 @@
php_cxx_post=$shared_cxx_post
php_lo=$shared_lo
;;
- bundle)
+ bundle)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -11326,40 +10870,13 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
- php_build_target=static
+ php_sapi_module=static
;;
- program)
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
-
- php_build_target=program
-;;
- esac
+ esac
+ install_sapi="install-sapi"
-
case sapi/isapi in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
/*) ac_srcdir=`echo "sapi/isapi"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
@@ -11401,6 +10918,7 @@
done
+
INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$ZEUSPATH/web/bin/"
fi
@@ -11408,7 +10926,7 @@
echo $ac_n "checking for LiteSpeed support""... $ac_c" 1>&6
-echo "configure:11412: checking for LiteSpeed support" >&5
+echo "configure:10930: checking for LiteSpeed support" >&5
php_with_litespeed=no
@@ -11462,92 +10980,31 @@
SAPI_LITESPEED_PATH=sapi/litespeed/php
- PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_LITESPEED_PATH"
-
-
- if test "$PHP_SAPI" != "default"; then
-{ echo "configure: error:
+ if test "program" = "program"; then
+ PHP_BINARIES="$PHP_BINARIES litespeed"
+ elif test "$PHP_SAPI" != "none"; then
+ { echo "configure: error:
+--------------------------------------------------------------------+
| *** ATTENTION *** |
| |
| You've configured multiple SAPIs to be build. You can build only |
-| one SAPI module and CLI binary at the same time. |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time. |
+--------------------------------------------------------------------+
" 1>&2; exit 1; }
- fi
+ else
+ PHP_SAPI=litespeed
+ fi
- PHP_SAPI=litespeed
- case "program" in
- static)
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
-
- php_build_target=program
-
- OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=static
-;;
- shared)
+ BUILD_DIR="$BUILD_DIR sapi/litespeed"
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS litespeed"
- php_build_target=program
-
- OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=shared
-
- php_c_pre=$shared_c_pre
- php_c_meta=$shared_c_meta
- php_c_post=$shared_c_post
- php_cxx_pre=$shared_cxx_pre
- php_cxx_meta=$shared_cxx_meta
- php_cxx_post=$shared_cxx_post
- php_lo=$shared_lo
-;;
- bundle)
- OVERALL_TARGET=php
+
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -11569,40 +11026,12 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
- OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
- php_build_target=static
-;;
- program)
- OVERALL_TARGET='$(SAPI_LITESPEED_PATH)'
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
+ install_binaries="install-binaries"
+ install_binary_targets="$install_binary_targets install-litespeed"
+
+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_LITESPEED_OBJS"
- php_build_target=program
-;;
- esac
-
-
case sapi/litespeed in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
/*) ac_srcdir=`echo "sapi/litespeed"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
@@ -11628,7 +11057,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_LITESPEED_OBJS="$PHP_LITESPEED_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre "" $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -11643,23 +11072,26 @@
EOF
done
-
+
INSTALL_IT="@echo \"Installing PHP LiteSpeed into: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_LITESPEED_PATH) \$(INSTALL_ROOT)\$(bindir)/lsphp"
case $host_alias in
*darwin*)
- BUILD_LITESPEED="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
+ BUILD_LITESPEED="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_LITESPEED_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
;;
*cygwin*)
SAPI_LITESPEED_PATH=sapi/litespeed/php.exe
- BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
+ BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_LITESPEED_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
;;
*)
- BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
+ BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_LITESPEED_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
;;
esac
+ PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_LITESPEED_PATH"
+
+
PHP_VAR_SUBST="$PHP_VAR_SUBST BUILD_LITESPEED"
fi
@@ -11671,7 +11103,7 @@
php_with_milter=no
echo $ac_n "checking for Milter support""... $ac_c" 1>&6
-echo "configure:11675: checking for Milter support" >&5
+echo "configure:11107: checking for Milter support" >&5
# Check whether --with-milter or --without-milter was given.
if test "${with_milter+set}" = set; then
withval="$with_milter"
@@ -11719,89 +11151,31 @@
test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments
- if test "$PHP_SAPI" != "default"; then
-{ echo "configure: error:
+ if test "program" = "program"; then
+ PHP_BINARIES="$PHP_BINARIES milter"
+ elif test "$PHP_SAPI" != "none"; then
+ { echo "configure: error:
+--------------------------------------------------------------------+
| *** ATTENTION *** |
| |
| You've configured multiple SAPIs to be build. You can build only |
-| one SAPI module and CLI binary at the same time. |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time. |
+--------------------------------------------------------------------+
" 1>&2; exit 1; }
- fi
+ else
+ PHP_SAPI=milter
+ fi
- PHP_SAPI=milter
- case "program" in
- static)
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
-
- php_build_target=program
-
- OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=static
-;;
- shared)
+ BUILD_DIR="$BUILD_DIR sapi/milter"
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
- php_build_target=program
+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS milter"
- OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=shared
-
- php_c_pre=$shared_c_pre
- php_c_meta=$shared_c_meta
- php_c_post=$shared_c_post
- php_cxx_pre=$shared_cxx_pre
- php_cxx_meta=$shared_cxx_meta
- php_cxx_post=$shared_cxx_post
- php_lo=$shared_lo
-;;
- bundle)
- OVERALL_TARGET=php
+
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -11823,40 +11197,12 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
- OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
- php_build_target=static
-;;
- program)
- OVERALL_TARGET='$(SAPI_MILTER_PATH)'
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
+ install_binaries="install-binaries"
+ install_binary_targets="$install_binary_targets install-milter"
+
+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_MILTER_OBJS"
- php_build_target=program
-;;
- esac
-
-
case sapi/milter in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
/*) ac_srcdir=`echo "sapi/milter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
@@ -11882,7 +11228,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_MILTER_OBJS="$PHP_MILTER_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -11897,7 +11243,7 @@
EOF
done
-
+
@@ -11948,8 +11294,7 @@
- BUILD_MILTER="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_MILTER_PATH)"
- INSTALL_IT="\$(INSTALL) -m 0755 \$(SAPI_MILTER_PATH) \$(bindir)/php-milter"
+ BUILD_MILTER="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_MILTER_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_MILTER_PATH)"
PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_MILTER_PATH"
@@ -11963,7 +11308,7 @@
php_with_nsapi=no
echo $ac_n "checking for NSAPI support""... $ac_c" 1>&6
-echo "configure:11967: checking for NSAPI support" >&5
+echo "configure:11312: checking for NSAPI support" >&5
# Check whether --with-nsapi or --without-nsapi was given.
if test "${with_nsapi+set}" = set; then
withval="$with_nsapi"
@@ -11987,7 +11332,7 @@
{ echo "configure: error: Please specify the path to the root of your Netscape/iPlanet/Sun Webserver using --with-nsapi=DIR" 1>&2; exit 1; }
fi
echo $ac_n "checking for NSAPI include files""... $ac_c" 1>&6
-echo "configure:11991: checking for NSAPI include files" >&5
+echo "configure:11336: checking for NSAPI include files" >&5
if test -d $PHP_NSAPI/include ; then
NSAPI_INC_DIR="$PHP_NSAPI/include"
echo "$ac_t""Netscape 3.x / Sun 7.x style" 1>&6
@@ -11995,17 +11340,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11999: checking for $ac_hdr" >&5
+echo "configure:11344: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 12004 "configure"
+#line 11349 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12009: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11354: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -12040,17 +11385,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12044: checking for $ac_hdr" >&5
+echo "configure:11389: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 12049 "configure"
+#line 11394 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12054: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11399: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -12133,23 +11478,33 @@
EOF
- if test "$PHP_SAPI" != "default"; then
-{ echo "configure: error:
+ if test "shared" = "program"; then
+ PHP_BINARIES="$PHP_BINARIES nsapi"
+ elif test "$PHP_SAPI" != "none"; then
+ { echo "configure: error:
+--------------------------------------------------------------------+
| *** ATTENTION *** |
| |
| You've configured multiple SAPIs to be build. You can build only |
-| one SAPI module and CLI binary at the same time. |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time. |
+--------------------------------------------------------------------+
" 1>&2; exit 1; }
- fi
+ else
+ PHP_SAPI=nsapi
+ fi
- PHP_SAPI=nsapi
- case "shared" in
- static)
- OVERALL_TARGET=php
+ BUILD_DIR="$BUILD_DIR sapi/nsapi"
+
+
+
+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS nsapi"
+
+
+ case "shared" in
+ static)
+
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -12171,14 +11526,11 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=static
+ php_sapi_module=static
;;
- shared)
+ shared)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -12200,10 +11552,8 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=shared
+ php_sapi_module=shared
php_c_pre=$shared_c_pre
php_c_meta=$shared_c_meta
@@ -12213,9 +11563,8 @@
php_cxx_post=$shared_cxx_post
php_lo=$shared_lo
;;
- bundle)
+ bundle)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -12237,40 +11586,13 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
- php_build_target=static
-;;
- program)
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
-
- php_build_target=program
+ php_sapi_module=static
;;
- esac
+ esac
+ install_sapi="install-sapi"
-
case sapi/nsapi in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
/*) ac_srcdir=`echo "sapi/nsapi"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
@@ -12312,6 +11634,7 @@
done
+
INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PHP_NSAPI/bin/"
fi
@@ -12323,7 +11646,7 @@
php_with_phttpd=no
echo $ac_n "checking for PHTTPD support""... $ac_c" 1>&6
-echo "configure:12327: checking for PHTTPD support" >&5
+echo "configure:11650: checking for PHTTPD support" >&5
# Check whether --with-phttpd or --without-phttpd was given.
if test "${with_phttpd+set}" = set; then
withval="$with_phttpd"
@@ -12388,23 +11711,33 @@
EOF
- if test "$PHP_SAPI" != "default"; then
-{ echo "configure: error:
+ if test "shared" = "program"; then
+ PHP_BINARIES="$PHP_BINARIES phttpd"
+ elif test "$PHP_SAPI" != "none"; then
+ { echo "configure: error:
+--------------------------------------------------------------------+
| *** ATTENTION *** |
| |
| You've configured multiple SAPIs to be build. You can build only |
-| one SAPI module and CLI binary at the same time. |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time. |
+--------------------------------------------------------------------+
" 1>&2; exit 1; }
- fi
+ else
+ PHP_SAPI=phttpd
+ fi
+
+
+
+ BUILD_DIR="$BUILD_DIR sapi/phttpd"
+
+
+
+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS phttpd"
- PHP_SAPI=phttpd
- case "shared" in
- static)
+ case "shared" in
+ static)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -12426,14 +11759,11 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=static
+ php_sapi_module=static
;;
- shared)
+ shared)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -12455,10 +11785,8 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=shared
+ php_sapi_module=shared
php_c_pre=$shared_c_pre
php_c_meta=$shared_c_meta
@@ -12468,9 +11796,8 @@
php_cxx_post=$shared_cxx_post
php_lo=$shared_lo
;;
- bundle)
+ bundle)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -12492,40 +11819,13 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
- php_build_target=static
+ php_sapi_module=static
;;
- program)
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
-
- php_build_target=program
-;;
- esac
+ esac
+ install_sapi="install-sapi"
-
case sapi/phttpd in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
/*) ac_srcdir=`echo "sapi/phttpd"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
@@ -12567,6 +11867,7 @@
done
+
INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PHP_PHTTPD/modules/"
fi
@@ -12577,7 +11878,7 @@
php_with_pi3web=no
echo $ac_n "checking for Pi3Web support""... $ac_c" 1>&6
-echo "configure:12581: checking for Pi3Web support" >&5
+echo "configure:11882: checking for Pi3Web support" >&5
# Check whether --with-pi3web or --without-pi3web was given.
if test "${with_pi3web+set}" = set; then
withval="$with_pi3web"
@@ -12738,23 +12039,33 @@
fi
- if test "$PHP_SAPI" != "default"; then
-{ echo "configure: error:
+ if test "shared" = "program"; then
+ PHP_BINARIES="$PHP_BINARIES pi3web"
+ elif test "$PHP_SAPI" != "none"; then
+ { echo "configure: error:
+--------------------------------------------------------------------+
| *** ATTENTION *** |
| |
| You've configured multiple SAPIs to be build. You can build only |
-| one SAPI module and CLI binary at the same time. |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time. |
+--------------------------------------------------------------------+
" 1>&2; exit 1; }
- fi
+ else
+ PHP_SAPI=pi3web
+ fi
+
+
+
+ BUILD_DIR="$BUILD_DIR sapi/pi3web"
+
+
+
+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS pi3web"
- PHP_SAPI=pi3web
- case "shared" in
- static)
+ case "shared" in
+ static)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -12776,14 +12087,11 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=static
+ php_sapi_module=static
;;
- shared)
+ shared)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -12805,10 +12113,8 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=shared
+ php_sapi_module=shared
php_c_pre=$shared_c_pre
php_c_meta=$shared_c_meta
@@ -12818,9 +12124,8 @@
php_cxx_post=$shared_cxx_post
php_lo=$shared_lo
;;
- bundle)
+ bundle)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -12842,40 +12147,13 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
- php_build_target=static
-;;
- program)
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
-
- php_build_target=program
+ php_sapi_module=static
;;
- esac
+ esac
+ install_sapi="install-sapi"
-
case sapi/pi3web in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
/*) ac_srcdir=`echo "sapi/pi3web"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
@@ -12917,6 +12195,7 @@
done
+
INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PI3PATH/bin/"
fi
@@ -12949,7 +12228,7 @@
php_enable_roxen_zts=no
echo $ac_n "checking whether Roxen module is build using ZTS""... $ac_c" 1>&6
-echo "configure:12953: checking whether Roxen module is build using ZTS" >&5
+echo "configure:12232: checking whether Roxen module is build using ZTS" >&5
# Check whether --enable-roxen-zts or --disable-roxen-zts was given.
if test "${enable_roxen_zts+set}" = set; then
enableval="$enable_roxen_zts"
@@ -12970,7 +12249,7 @@
RESULT=
echo $ac_n "checking for Roxen/Pike support""... $ac_c" 1>&6
-echo "configure:12974: checking for Roxen/Pike support" >&5
+echo "configure:12253: checking for Roxen/Pike support" >&5
if test "$PHP_ROXEN" != "no"; then
if test ! -d $PHP_ROXEN ; then
{ echo "configure: error: You did not specify a directory" 1>&2; exit 1; }
@@ -13029,23 +12308,33 @@
EOF
- if test "$PHP_SAPI" != "default"; then
-{ echo "configure: error:
+ if test "shared" = "program"; then
+ PHP_BINARIES="$PHP_BINARIES roxen"
+ elif test "$PHP_SAPI" != "none"; then
+ { echo "configure: error:
+--------------------------------------------------------------------+
| *** ATTENTION *** |
| |
| You've configured multiple SAPIs to be build. You can build only |
-| one SAPI module and CLI binary at the same time. |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time. |
+--------------------------------------------------------------------+
" 1>&2; exit 1; }
- fi
+ else
+ PHP_SAPI=roxen
+ fi
+
+
+
+ BUILD_DIR="$BUILD_DIR sapi/roxen"
+
+
+
+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS roxen"
- PHP_SAPI=roxen
- case "shared" in
- static)
+ case "shared" in
+ static)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -13067,14 +12356,11 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=static
+ php_sapi_module=static
;;
- shared)
+ shared)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -13096,10 +12382,8 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=shared
+ php_sapi_module=shared
php_c_pre=$shared_c_pre
php_c_meta=$shared_c_meta
@@ -13109,9 +12393,8 @@
php_cxx_post=$shared_cxx_post
php_lo=$shared_lo
;;
- bundle)
+ bundle)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -13133,40 +12416,13 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
- php_build_target=static
-;;
- program)
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
-
- php_build_target=program
+ php_sapi_module=static
;;
- esac
+ esac
+ install_sapi="install-sapi"
-
case sapi/roxen in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
/*) ac_srcdir=`echo "sapi/roxen"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
@@ -13208,6 +12464,7 @@
done
+
INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PIKE_MODULE_DIR/PHP5.so"
RESULT="yes
@@ -13256,7 +12513,7 @@
echo $ac_n "checking for thttpd""... $ac_c" 1>&6
-echo "configure:13260: checking for thttpd" >&5
+echo "configure:12517: checking for thttpd" >&5
if test "$PHP_THTTPD" != "no"; then
if test ! -d $PHP_THTTPD; then
@@ -13289,7 +12546,7 @@
gcc_arg_name=ac_cv_gcc_arg_rdynamic
echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6
-echo "configure:13293: checking whether $CC supports -rdynamic" >&5
+echo "configure:12550: checking whether $CC supports -rdynamic" >&5
if eval "test \"`echo '$''{'ac_cv_gcc_arg_rdynamic'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -13360,23 +12617,33 @@
fi
- if test "$PHP_SAPI" != "default"; then
-{ echo "configure: error:
+ if test "static" = "program"; then
+ PHP_BINARIES="$PHP_BINARIES thttpd"
+ elif test "$PHP_SAPI" != "none"; then
+ { echo "configure: error:
+--------------------------------------------------------------------+
| *** ATTENTION *** |
| |
| You've configured multiple SAPIs to be build. You can build only |
-| one SAPI module and CLI binary at the same time. |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time. |
+--------------------------------------------------------------------+
" 1>&2; exit 1; }
- fi
+ else
+ PHP_SAPI=thttpd
+ fi
+
+
+
+ BUILD_DIR="$BUILD_DIR sapi/thttpd"
+
+
+
+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS thttpd"
- PHP_SAPI=thttpd
- case "static" in
- static)
+ case "static" in
+ static)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -13398,14 +12665,11 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=static
+ php_sapi_module=static
;;
- shared)
+ shared)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -13427,10 +12691,8 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=shared
+ php_sapi_module=shared
php_c_pre=$shared_c_pre
php_c_meta=$shared_c_meta
@@ -13440,9 +12702,8 @@
php_cxx_post=$shared_cxx_post
php_lo=$shared_lo
;;
- bundle)
+ bundle)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -13464,37 +12725,11 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
- php_build_target=static
+ php_sapi_module=static
;;
- program)
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
-
- php_build_target=program
-;;
- esac
+ esac
+ install_sapi="install-sapi"
@@ -13525,24 +12760,24 @@
echo $ac_n "checking for TUX""... $ac_c" 1>&6
-echo "configure:13529: checking for TUX" >&5
+echo "configure:12764: checking for TUX" >&5
if test "$PHP_TUX" != "no"; then
INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PHP_TUX/php5.tux.so"
for ac_hdr in tuxmodule.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13536: checking for $ac_hdr" >&5
+echo "configure:12771: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 13541 "configure"
+#line 12776 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13546: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12781: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -13569,24 +12804,34 @@
fi
done
-
- if test "$PHP_SAPI" != "default"; then
-{ echo "configure: error:
-+--------------------------------------------------------------------+
-| *** ATTENTION *** |
-| |
-| You've configured multiple SAPIs to be build. You can build only |
-| one SAPI module and CLI binary at the same time. |
-+--------------------------------------------------------------------+
-" 1>&2; exit 1; }
- fi
+
+ if test "shared" = "program"; then
+ PHP_BINARIES="$PHP_BINARIES tux"
+ elif test "$PHP_SAPI" != "none"; then
+ { echo "configure: error:
++--------------------------------------------------------------------+
+| *** ATTENTION *** |
+| |
+| You've configured multiple SAPIs to be build. You can build only |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time. |
++--------------------------------------------------------------------+
+" 1>&2; exit 1; }
+ else
+ PHP_SAPI=tux
+ fi
+
+
+
+ BUILD_DIR="$BUILD_DIR sapi/tux"
+
+
+
+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS tux"
- PHP_SAPI=tux
- case "shared" in
- static)
+ case "shared" in
+ static)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -13608,14 +12853,11 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=static
+ php_sapi_module=static
;;
- shared)
+ shared)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -13637,10 +12879,8 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=shared
+ php_sapi_module=shared
php_c_pre=$shared_c_pre
php_c_meta=$shared_c_meta
@@ -13650,9 +12890,8 @@
php_cxx_post=$shared_cxx_post
php_lo=$shared_lo
;;
- bundle)
+ bundle)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -13674,40 +12913,13 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
- php_build_target=static
-;;
- program)
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
-
- php_build_target=program
+ php_sapi_module=static
;;
- esac
+ esac
+ install_sapi="install-sapi"
-
case sapi/tux in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
/*) ac_srcdir=`echo "sapi/tux"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
@@ -13749,6 +12961,7 @@
done
+
echo "$ac_t""$PHP_TUX" 1>&6
else
@@ -13779,7 +12992,7 @@
echo $ac_n "checking for webjames""... $ac_c" 1>&6
-echo "configure:13783: checking for webjames" >&5
+echo "configure:12996: checking for webjames" >&5
if test "$PHP_WEBJAMES" != "no"; then
@@ -13829,23 +13042,33 @@
fi
- if test "$PHP_SAPI" != "default"; then
-{ echo "configure: error:
+ if test "static" = "program"; then
+ PHP_BINARIES="$PHP_BINARIES webjames"
+ elif test "$PHP_SAPI" != "none"; then
+ { echo "configure: error:
+--------------------------------------------------------------------+
| *** ATTENTION *** |
| |
| You've configured multiple SAPIs to be build. You can build only |
-| one SAPI module and CLI binary at the same time. |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time. |
+--------------------------------------------------------------------+
" 1>&2; exit 1; }
- fi
+ else
+ PHP_SAPI=webjames
+ fi
+
+
+
+ BUILD_DIR="$BUILD_DIR sapi/webjames"
+
+
+
+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS webjames"
- PHP_SAPI=webjames
- case "static" in
- static)
+ case "static" in
+ static)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -13867,14 +13090,11 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=static
+ php_sapi_module=static
;;
- shared)
+ shared)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -13896,10 +13116,8 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=shared
+ php_sapi_module=shared
php_c_pre=$shared_c_pre
php_c_meta=$shared_c_meta
@@ -13909,9 +13127,8 @@
php_cxx_post=$shared_cxx_post
php_lo=$shared_lo
;;
- bundle)
+ bundle)
- OVERALL_TARGET=php
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -13933,40 +13150,13 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
- php_build_target=static
-;;
- program)
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
-
- php_build_target=program
+ php_sapi_module=static
;;
- esac
+ esac
+ install_sapi="install-sapi"
-
case sapi/webjames in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
/*) ac_srcdir=`echo "sapi/webjames"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
@@ -14008,6 +13198,7 @@
done
+
echo "$ac_t""yes, using $PHP_WEBJAMES" 1>&6
else
@@ -14037,16 +13228,14 @@
-if test "$PHP_SAPI" = "default"; then
- echo $ac_n "checking whether to build CGI binary""... $ac_c" 1>&6
-echo "configure:14043: checking whether to build CGI binary" >&5
- if test "$PHP_CGI" != "no"; then
+echo $ac_n "checking for CGI build""... $ac_c" 1>&6
+echo "configure:13233: checking for CGI build" >&5
+if test "$PHP_CGI" != "no"; then
echo "$ac_t""yes" 1>&6
-
echo $ac_n "checking for socklen_t in sys/socket.h""... $ac_c" 1>&6
-echo "configure:14048: checking for socklen_t in sys/socket.h" >&5
+echo "configure:13237: checking for socklen_t in sys/socket.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14050 "configure"
+#line 13239 "configure"
#include "confdefs.h"
#include <sys/socket.h>
EOF
@@ -14066,9 +13255,9 @@
echo $ac_n "checking for sun_len in sys/un.h""... $ac_c" 1>&6
-echo "configure:14070: checking for sun_len in sys/un.h" >&5
+echo "configure:13259: checking for sun_len in sys/un.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14072 "configure"
+#line 13261 "configure"
#include "confdefs.h"
#include <sys/un.h>
EOF
@@ -14088,7 +13277,7 @@
echo $ac_n "checking whether cross-process locking is required by accept()""... $ac_c" 1>&6
-echo "configure:14092: checking whether cross-process locking is required by accept()" >&5
+echo "configure:13281: checking whether cross-process locking is required by accept()" >&5
case "`uname -sr`" in
IRIX\ 5.* | SunOS\ 5.* | UNIX_System_V\ 4.0)
echo "$ac_t""yes" 1>&6
@@ -14117,95 +13306,33 @@
SAPI_CGI_PATH=sapi/cgi/php-cgi
;;
esac
-
- PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_CGI_PATH"
-
- INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
-
- if test "$PHP_SAPI" != "default"; then
-{ echo "configure: error:
+
+ if test "program" = "program"; then
+ PHP_BINARIES="$PHP_BINARIES cgi"
+ elif test "$PHP_SAPI" != "none"; then
+ { echo "configure: error:
+--------------------------------------------------------------------+
| *** ATTENTION *** |
| |
| You've configured multiple SAPIs to be build. You can build only |
-| one SAPI module and CLI binary at the same time. |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time. |
+--------------------------------------------------------------------+
" 1>&2; exit 1; }
- fi
+ else
+ PHP_SAPI=cgi
+ fi
- PHP_SAPI=cgi
- case "program" in
- static)
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
-
- php_build_target=program
-
- OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=static
-;;
- shared)
+ BUILD_DIR="$BUILD_DIR sapi/cgi"
- OVERALL_TARGET=php
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
- php_build_target=program
+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS cgi"
- OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la
- php_build_target=shared
-
- php_c_pre=$shared_c_pre
- php_c_meta=$shared_c_meta
- php_c_post=$shared_c_post
- php_cxx_pre=$shared_cxx_pre
- php_cxx_meta=$shared_cxx_meta
- php_cxx_post=$shared_cxx_post
- php_lo=$shared_lo
-;;
- bundle)
- OVERALL_TARGET=php
+
php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
@@ -14227,40 +13354,12 @@
shared_cxx_post=
shared_lo=lo
- php_build_target=program
-
- OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle
- php_build_target=static
-;;
- program)
- OVERALL_TARGET='$(SAPI_CGI_PATH)'
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=
- php_lo=lo
-
- case $with_pic in
- yes) pic_setting='-prefer-pic';;
- no) pic_setting='-prefer-non-pic';;
- esac
-
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
- shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
- shared_cxx_post=
- shared_lo=lo
+ install_binaries="install-binaries"
+ install_binary_targets="$install_binary_targets install-cgi"
+
+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_CGI_OBJS"
- php_build_target=program
-;;
- esac
-
-
case sapi/cgi in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
/*) ac_srcdir=`echo "sapi/cgi"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
@@ -14286,7 +13385,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_CGI_OBJS="$PHP_CGI_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -14301,40 +13400,53 @@
EOF
done
-
+
case $host_alias in
*aix*)
- BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
+ if test "$php_sapi_module" = "shared"; then
+ BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CGI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/.libs\/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
+ else
+ BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CGI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
+ fi
;;
*darwin*)
- BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
+ BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
;;
*)
- BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
+ BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
;;
esac
+
+ PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_CGI_PATH"
+
PHP_VAR_SUBST="$PHP_VAR_SUBST BUILD_CGI"
-
- elif test "$PHP_CLI" != "no"; then
- echo "$ac_t""no" 1>&6
- OVERALL_TARGET=
- PHP_SAPI=cli
- else
- { echo "configure: error: No SAPIs selected." 1>&2; exit 1; }
- fi
+else
+ echo "$ac_t""yes" 1>&6
fi
echo $ac_n "checking for chosen SAPI module""... $ac_c" 1>&6
-echo "configure:14336: checking for chosen SAPI module" >&5
+echo "configure:13436: checking for chosen SAPI module" >&5
echo "$ac_t""$PHP_SAPI" 1>&6
+echo $ac_n "checking for executable SAPI binaries""... $ac_c" 1>&6
+echo "configure:13440: checking for executable SAPI binaries" >&5
+if test "$PHP_BINARIES"; then
+ echo "$ac_t""$PHP_BINARIES" 1>&6
+else
+ echo "$ac_t""none" 1>&6
+fi
+
+if test -z "$PHP_INSTALLED_SAPIS"; then
+ { echo "configure: error: Nothing to build." 1>&2; exit 1; }
+fi
+
if test "$enable_maintainer_zts" = "yes"; then
if test -n "$ac_cv_pthreads_lib"; then
@@ -14389,7 +13501,7 @@
# Extract the first word of "sendmail", so it can be a program name with args.
set dummy sendmail; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14393: checking for $ac_word" >&5
+echo "configure:13505: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PROG_SENDMAIL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -14428,7 +13540,7 @@
echo $ac_n "checking whether system uses EBCDIC""... $ac_c" 1>&6
-echo "configure:14432: checking whether system uses EBCDIC" >&5
+echo "configure:13544: checking whether system uses EBCDIC" >&5
if eval "test \"`echo '$''{'ac_cv_ebcdic'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -14439,7 +13551,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 14443 "configure"
+#line 13555 "configure"
#include "confdefs.h"
int main(void) {
@@ -14447,7 +13559,7 @@
}
EOF
-if { (eval echo configure:14451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:13563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_ebcdic=yes
@@ -14475,7 +13587,7 @@
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:14479: checking whether byte ordering is bigendian" >&5
+echo "configure:13591: checking whether byte ordering is bigendian" >&5
if eval "test \"`echo '$''{'ac_cv_c_bigendian_php'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -14485,7 +13597,7 @@
ac_cv_c_bigendian_php=unknown
else
cat > conftest.$ac_ext <<EOF
-#line 14489 "configure"
+#line 13601 "configure"
#include "confdefs.h"
int main(void)
@@ -14501,7 +13613,7 @@
}
EOF
-if { (eval echo configure:14505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:13617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_bigendian_php=yes
else
@@ -14527,7 +13639,7 @@
echo $ac_n "checking whether writing to stdout works""... $ac_c" 1>&6
-echo "configure:14531: checking whether writing to stdout works" >&5
+echo "configure:13643: checking whether writing to stdout works" >&5
if eval "test \"`echo '$''{'ac_cv_write_stdout'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -14538,7 +13650,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 14542 "configure"
+#line 13654 "configure"
#include "confdefs.h"
#ifdef HAVE_UNISTD_H
@@ -14556,7 +13668,7 @@
}
EOF
-if { (eval echo configure:14560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:13672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_write_stdout=yes
@@ -14631,12 +13743,12 @@
unset found
echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:14635: checking for socket" >&5
+echo "configure:13747: checking for socket" >&5
if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 14640 "configure"
+#line 13752 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char socket(); below. */
@@ -14659,7 +13771,7 @@
; return 0; }
EOF
-if { (eval echo configure:14663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_socket=yes"
else
@@ -14677,12 +13789,12 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __socket""... $ac_c" 1>&6
-echo "configure:14681: checking for __socket" >&5
+echo "configure:13793: checking for __socket" >&5
if eval "test \"`echo '$''{'ac_cv_func___socket'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 14686 "configure"
+#line 13798 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char __socket(); below. */
@@ -14705,7 +13817,7 @@
; return 0; }
EOF
-if { (eval echo configure:14709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func___socket=yes"
else
@@ -14743,7 +13855,7 @@
unset ac_cv_lib_socket___socket
unset found
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:14747: checking for socket in -lsocket" >&5
+echo "configure:13859: checking for socket in -lsocket" >&5
ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -14751,7 +13863,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 14755 "configure"
+#line 13867 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -14762,7 +13874,7 @@
socket()
; return 0; }
EOF
-if { (eval echo configure:14766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -14782,7 +13894,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __socket in -lsocket""... $ac_c" 1>&6
-echo "configure:14786: checking for __socket in -lsocket" >&5
+echo "configure:13898: checking for __socket in -lsocket" >&5
ac_lib_var=`echo socket'_'__socket | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -14790,7 +13902,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 14794 "configure"
+#line 13906 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -14801,7 +13913,7 @@
__socket()
; return 0; }
EOF
-if { (eval echo configure:14805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -14833,11 +13945,11 @@
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 14837 "configure"
+#line 13949 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:14841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:13953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -14888,12 +14000,12 @@
unset found
echo $ac_n "checking for socketpair""... $ac_c" 1>&6
-echo "configure:14892: checking for socketpair" >&5
+echo "configure:14004: checking for socketpair" >&5
if eval "test \"`echo '$''{'ac_cv_func_socketpair'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 14897 "configure"
+#line 14009 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char socketpair(); below. */
@@ -14916,7 +14028,7 @@
; return 0; }
EOF
-if { (eval echo configure:14920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_socketpair=yes"
else
@@ -14934,12 +14046,12 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __socketpair""... $ac_c" 1>&6
-echo "configure:14938: checking for __socketpair" >&5
+echo "configure:14050: checking for __socketpair" >&5
if eval "test \"`echo '$''{'ac_cv_func___socketpair'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 14943 "configure"
+#line 14055 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char __socketpair(); below. */
@@ -14962,7 +14074,7 @@
; return 0; }
EOF
-if { (eval echo configure:14966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func___socketpair=yes"
else
@@ -15000,7 +14112,7 @@
unset ac_cv_lib_socket___socketpair
unset found
echo $ac_n "checking for socketpair in -lsocket""... $ac_c" 1>&6
-echo "configure:15004: checking for socketpair in -lsocket" >&5
+echo "configure:14116: checking for socketpair in -lsocket" >&5
ac_lib_var=`echo socket'_'socketpair | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -15008,7 +14120,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15012 "configure"
+#line 14124 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -15019,7 +14131,7 @@
socketpair()
; return 0; }
EOF
-if { (eval echo configure:15023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -15039,7 +14151,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __socketpair in -lsocket""... $ac_c" 1>&6
-echo "configure:15043: checking for __socketpair in -lsocket" >&5
+echo "configure:14155: checking for __socketpair in -lsocket" >&5
ac_lib_var=`echo socket'_'__socketpair | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -15047,7 +14159,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15051 "configure"
+#line 14163 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -15058,7 +14170,7 @@
__socketpair()
; return 0; }
EOF
-if { (eval echo configure:15062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -15090,11 +14202,11 @@
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 15094 "configure"
+#line 14206 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:15098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:14210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -15145,12 +14257,12 @@
unset found
echo $ac_n "checking for htonl""... $ac_c" 1>&6
-echo "configure:15149: checking for htonl" >&5
+echo "configure:14261: checking for htonl" >&5
if eval "test \"`echo '$''{'ac_cv_func_htonl'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 15154 "configure"
+#line 14266 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char htonl(); below. */
@@ -15173,7 +14285,7 @@
; return 0; }
EOF
-if { (eval echo configure:15177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_htonl=yes"
else
@@ -15191,12 +14303,12 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __htonl""... $ac_c" 1>&6
-echo "configure:15195: checking for __htonl" >&5
+echo "configure:14307: checking for __htonl" >&5
if eval "test \"`echo '$''{'ac_cv_func___htonl'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 15200 "configure"
+#line 14312 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char __htonl(); below. */
@@ -15219,7 +14331,7 @@
; return 0; }
EOF
-if { (eval echo configure:15223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func___htonl=yes"
else
@@ -15257,7 +14369,7 @@
unset ac_cv_lib_socket___htonl
unset found
echo $ac_n "checking for htonl in -lsocket""... $ac_c" 1>&6
-echo "configure:15261: checking for htonl in -lsocket" >&5
+echo "configure:14373: checking for htonl in -lsocket" >&5
ac_lib_var=`echo socket'_'htonl | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -15265,7 +14377,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15269 "configure"
+#line 14381 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -15276,7 +14388,7 @@
htonl()
; return 0; }
EOF
-if { (eval echo configure:15280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -15296,7 +14408,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __htonl in -lsocket""... $ac_c" 1>&6
-echo "configure:15300: checking for __htonl in -lsocket" >&5
+echo "configure:14412: checking for __htonl in -lsocket" >&5
ac_lib_var=`echo socket'_'__htonl | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -15304,7 +14416,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15308 "configure"
+#line 14420 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -15315,7 +14427,7 @@
__htonl()
; return 0; }
EOF
-if { (eval echo configure:15319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -15347,11 +14459,11 @@
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 15351 "configure"
+#line 14463 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:15355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:14467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -15402,12 +14514,12 @@
unset found
echo $ac_n "checking for gethostname""... $ac_c" 1>&6
-echo "configure:15406: checking for gethostname" >&5
+echo "configure:14518: checking for gethostname" >&5
if eval "test \"`echo '$''{'ac_cv_func_gethostname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 15411 "configure"
+#line 14523 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostname(); below. */
@@ -15430,7 +14542,7 @@
; return 0; }
EOF
-if { (eval echo configure:15434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gethostname=yes"
else
@@ -15448,12 +14560,12 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __gethostname""... $ac_c" 1>&6
-echo "configure:15452: checking for __gethostname" >&5
+echo "configure:14564: checking for __gethostname" >&5
if eval "test \"`echo '$''{'ac_cv_func___gethostname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 15457 "configure"
+#line 14569 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char __gethostname(); below. */
@@ -15476,7 +14588,7 @@
; return 0; }
EOF
-if { (eval echo configure:15480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func___gethostname=yes"
else
@@ -15514,7 +14626,7 @@
unset ac_cv_lib_nsl___gethostname
unset found
echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6
-echo "configure:15518: checking for gethostname in -lnsl" >&5
+echo "configure:14630: checking for gethostname in -lnsl" >&5
ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -15522,7 +14634,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15526 "configure"
+#line 14638 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -15533,7 +14645,7 @@
gethostname()
; return 0; }
EOF
-if { (eval echo configure:15537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -15553,7 +14665,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __gethostname in -lnsl""... $ac_c" 1>&6
-echo "configure:15557: checking for __gethostname in -lnsl" >&5
+echo "configure:14669: checking for __gethostname in -lnsl" >&5
ac_lib_var=`echo nsl'_'__gethostname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -15561,7 +14673,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15565 "configure"
+#line 14677 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -15572,7 +14684,7 @@
__gethostname()
; return 0; }
EOF
-if { (eval echo configure:15576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -15604,11 +14716,11 @@
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 15608 "configure"
+#line 14720 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:15612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:14724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -15659,12 +14771,12 @@
unset found
echo $ac_n "checking for gethostbyaddr""... $ac_c" 1>&6
-echo "configure:15663: checking for gethostbyaddr" >&5
+echo "configure:14775: checking for gethostbyaddr" >&5
if eval "test \"`echo '$''{'ac_cv_func_gethostbyaddr'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 15668 "configure"
+#line 14780 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyaddr(); below. */
@@ -15687,7 +14799,7 @@
; return 0; }
EOF
-if { (eval echo configure:15691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gethostbyaddr=yes"
else
@@ -15705,12 +14817,12 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __gethostbyaddr""... $ac_c" 1>&6
-echo "configure:15709: checking for __gethostbyaddr" >&5
+echo "configure:14821: checking for __gethostbyaddr" >&5
if eval "test \"`echo '$''{'ac_cv_func___gethostbyaddr'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 15714 "configure"
+#line 14826 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char __gethostbyaddr(); below. */
@@ -15733,7 +14845,7 @@
; return 0; }
EOF
-if { (eval echo configure:15737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func___gethostbyaddr=yes"
else
@@ -15771,7 +14883,7 @@
unset ac_cv_lib_nsl___gethostbyaddr
unset found
echo $ac_n "checking for gethostbyaddr in -lnsl""... $ac_c" 1>&6
-echo "configure:15775: checking for gethostbyaddr in -lnsl" >&5
+echo "configure:14887: checking for gethostbyaddr in -lnsl" >&5
ac_lib_var=`echo nsl'_'gethostbyaddr | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -15779,7 +14891,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15783 "configure"
+#line 14895 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -15790,7 +14902,7 @@
gethostbyaddr()
; return 0; }
EOF
-if { (eval echo configure:15794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -15810,7 +14922,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __gethostbyaddr in -lnsl""... $ac_c" 1>&6
-echo "configure:15814: checking for __gethostbyaddr in -lnsl" >&5
+echo "configure:14926: checking for __gethostbyaddr in -lnsl" >&5
ac_lib_var=`echo nsl'_'__gethostbyaddr | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -15818,7 +14930,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15822 "configure"
+#line 14934 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -15829,7 +14941,7 @@
__gethostbyaddr()
; return 0; }
EOF
-if { (eval echo configure:15833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -15861,11 +14973,11 @@
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 15865 "configure"
+#line 14977 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:15869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:14981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -15916,12 +15028,12 @@
unset found
echo $ac_n "checking for yp_get_default_domain""... $ac_c" 1>&6
-echo "configure:15920: checking for yp_get_default_domain" >&5
+echo "configure:15032: checking for yp_get_default_domain" >&5
if eval "test \"`echo '$''{'ac_cv_func_yp_get_default_domain'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 15925 "configure"
+#line 15037 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char yp_get_default_domain(); below. */
@@ -15944,7 +15056,7 @@
; return 0; }
EOF
-if { (eval echo configure:15948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_yp_get_default_domain=yes"
else
@@ -15962,12 +15074,12 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __yp_get_default_domain""... $ac_c" 1>&6
-echo "configure:15966: checking for __yp_get_default_domain" >&5
+echo "configure:15078: checking for __yp_get_default_domain" >&5
if eval "test \"`echo '$''{'ac_cv_func___yp_get_default_domain'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 15971 "configure"
+#line 15083 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char __yp_get_default_domain(); below. */
@@ -15990,7 +15102,7 @@
; return 0; }
EOF
-if { (eval echo configure:15994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func___yp_get_default_domain=yes"
else
@@ -16028,7 +15140,7 @@
unset ac_cv_lib_nsl___yp_get_default_domain
unset found
echo $ac_n "checking for yp_get_default_domain in -lnsl""... $ac_c" 1>&6
-echo "configure:16032: checking for yp_get_default_domain in -lnsl" >&5
+echo "configure:15144: checking for yp_get_default_domain in -lnsl" >&5
ac_lib_var=`echo nsl'_'yp_get_default_domain | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -16036,7 +15148,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 16040 "configure"
+#line 15152 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -16047,7 +15159,7 @@
yp_get_default_domain()
; return 0; }
EOF
-if { (eval echo configure:16051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -16067,7 +15179,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __yp_get_default_domain in -lnsl""... $ac_c" 1>&6
-echo "configure:16071: checking for __yp_get_default_domain in -lnsl" >&5
+echo "configure:15183: checking for __yp_get_default_domain in -lnsl" >&5
ac_lib_var=`echo nsl'_'__yp_get_default_domain | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -16075,7 +15187,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 16079 "configure"
+#line 15191 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -16086,7 +15198,7 @@
__yp_get_default_domain()
; return 0; }
EOF
-if { (eval echo configure:16090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -16118,11 +15230,11 @@
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 16122 "configure"
+#line 15234 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:16126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:15238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -16174,12 +15286,12 @@
unset found
echo $ac_n "checking for dlopen""... $ac_c" 1>&6
-echo "configure:16178: checking for dlopen" >&5
+echo "configure:15290: checking for dlopen" >&5
if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 16183 "configure"
+#line 15295 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dlopen(); below. */
@@ -16202,7 +15314,7 @@
; return 0; }
EOF
-if { (eval echo configure:16206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_dlopen=yes"
else
@@ -16220,12 +15332,12 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __dlopen""... $ac_c" 1>&6
-echo "configure:16224: checking for __dlopen" >&5
+echo "configure:15336: checking for __dlopen" >&5
if eval "test \"`echo '$''{'ac_cv_func___dlopen'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 16229 "configure"
+#line 15341 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char __dlopen(); below. */
@@ -16248,7 +15360,7 @@
; return 0; }
EOF
-if { (eval echo configure:16252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func___dlopen=yes"
else
@@ -16286,7 +15398,7 @@
unset ac_cv_lib_dl___dlopen
unset found
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:16290: checking for dlopen in -ldl" >&5
+echo "configure:15402: checking for dlopen in -ldl" >&5
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -16294,7 +15406,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 16298 "configure"
+#line 15410 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -16305,7 +15417,7 @@
dlopen()
; return 0; }
EOF
-if { (eval echo configure:16309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -16325,7 +15437,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:16329: checking for __dlopen in -ldl" >&5
+echo "configure:15441: checking for __dlopen in -ldl" >&5
ac_lib_var=`echo dl'_'__dlopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -16333,7 +15445,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 16337 "configure"
+#line 15449 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -16344,7 +15456,7 @@
__dlopen()
; return 0; }
EOF
-if { (eval echo configure:16348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -16376,11 +15488,11 @@
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 16380 "configure"
+#line 15492 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:16384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:15496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -16432,7 +15544,7 @@
fi
echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
-echo "configure:16436: checking for sin in -lm" >&5
+echo "configure:15548: checking for sin in -lm" >&5
ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -16440,7 +15552,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 16444 "configure"
+#line 15556 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -16451,7 +15563,7 @@
sin()
; return 0; }
EOF
-if { (eval echo configure:16455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -16485,12 +15597,12 @@
unset found
echo $ac_n "checking for inet_aton""... $ac_c" 1>&6
-echo "configure:16489: checking for inet_aton" >&5
+echo "configure:15601: checking for inet_aton" >&5
if eval "test \"`echo '$''{'ac_cv_func_inet_aton'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 16494 "configure"
+#line 15606 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char inet_aton(); below. */
@@ -16513,7 +15625,7 @@
; return 0; }
EOF
-if { (eval echo configure:16517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_inet_aton=yes"
else
@@ -16531,12 +15643,12 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __inet_aton""... $ac_c" 1>&6
-echo "configure:16535: checking for __inet_aton" >&5
+echo "configure:15647: checking for __inet_aton" >&5
if eval "test \"`echo '$''{'ac_cv_func___inet_aton'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 16540 "configure"
+#line 15652 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char __inet_aton(); below. */
@@ -16559,7 +15671,7 @@
; return 0; }
EOF
-if { (eval echo configure:16563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func___inet_aton=yes"
else
@@ -16597,7 +15709,7 @@
unset ac_cv_lib_resolv___inet_aton
unset found
echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6
-echo "configure:16601: checking for inet_aton in -lresolv" >&5
+echo "configure:15713: checking for inet_aton in -lresolv" >&5
ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -16605,7 +15717,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 16609 "configure"
+#line 15721 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -16616,7 +15728,7 @@
inet_aton()
; return 0; }
EOF
-if { (eval echo configure:16620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -16636,7 +15748,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __inet_aton in -lresolv""... $ac_c" 1>&6
-echo "configure:16640: checking for __inet_aton in -lresolv" >&5
+echo "configure:15752: checking for __inet_aton in -lresolv" >&5
ac_lib_var=`echo resolv'_'__inet_aton | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -16644,7 +15756,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 16648 "configure"
+#line 15760 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -16655,7 +15767,7 @@
__inet_aton()
; return 0; }
EOF
-if { (eval echo configure:16659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -16687,11 +15799,11 @@
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 16691 "configure"
+#line 15803 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:16695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:15807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -16733,7 +15845,7 @@
unset ac_cv_lib_bind___inet_aton
unset found
echo $ac_n "checking for inet_aton in -lbind""... $ac_c" 1>&6
-echo "configure:16737: checking for inet_aton in -lbind" >&5
+echo "configure:15849: checking for inet_aton in -lbind" >&5
ac_lib_var=`echo bind'_'inet_aton | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -16741,7 +15853,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lbind $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 16745 "configure"
+#line 15857 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -16752,7 +15864,7 @@
inet_aton()
; return 0; }
EOF
-if { (eval echo configure:16756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -16772,7 +15884,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __inet_aton in -lbind""... $ac_c" 1>&6
-echo "configure:16776: checking for __inet_aton in -lbind" >&5
+echo "configure:15888: checking for __inet_aton in -lbind" >&5
ac_lib_var=`echo bind'_'__inet_aton | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -16780,7 +15892,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lbind $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 16784 "configure"
+#line 15896 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -16791,7 +15903,7 @@
__inet_aton()
; return 0; }
EOF
-if { (eval echo configure:16795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -16823,11 +15935,11 @@
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 16827 "configure"
+#line 15939 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:16831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:15943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -16878,12 +15990,12 @@
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:16882: checking for ANSI C header files" >&5
+echo "configure:15994: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 16887 "configure"
+#line 15999 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -16891,7 +16003,7 @@
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:16895: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:16007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -16908,7 +16020,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 16912 "configure"
+#line 16024 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -16926,7 +16038,7 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 16930 "configure"
+#line 16042 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -16947,7 +16059,7 @@
:
else
cat > conftest.$ac_ext <<EOF
-#line 16951 "configure"
+#line 16063 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -16958,7 +16070,7 @@
exit (0); }
EOF
-if { (eval echo configure:16962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:16074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -16986,12 +16098,12 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:16990: checking for $ac_hdr that defines DIR" >&5
+echo "configure:16102: checking for $ac_hdr that defines DIR" >&5
if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 16995 "configure"
+#line 16107 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_hdr>
@@ -16999,7 +16111,7 @@
DIR *dirp = 0;
; return 0; }
EOF
-if { (eval echo configure:17003: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_dirent_$ac_safe=yes"
else
@@ -17024,7 +16136,7 @@
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:17028: checking for opendir in -ldir" >&5
+echo "configure:16140: checking for opendir in -ldir" >&5
ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -17032,7 +16144,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldir $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 17036 "configure"
+#line 16148 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -17043,7 +16155,7 @@
opendir()
; return 0; }
EOF
-if { (eval echo configure:17047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -17065,7 +16177,7 @@
else
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:17069: checking for opendir in -lx" >&5
+echo "configure:16181: checking for opendir in -lx" >&5
ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -17073,7 +16185,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lx $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 17077 "configure"
+#line 16189 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -17084,7 +16196,7 @@
opendir()
; return 0; }
EOF
-if { (eval echo configure:17088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -17166,17 +16278,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:17170: checking for $ac_hdr" >&5
+echo "configure:16282: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 17175 "configure"
+#line 16287 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:17180: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:16292: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -17205,12 +16317,12 @@
echo $ac_n "checking for fopencookie""... $ac_c" 1>&6
-echo "configure:17209: checking for fopencookie" >&5
+echo "configure:16321: checking for fopencookie" >&5
if eval "test \"`echo '$''{'ac_cv_func_fopencookie'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 17214 "configure"
+#line 16326 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char fopencookie(); below. */
@@ -17233,7 +16345,7 @@
; return 0; }
EOF
-if { (eval echo configure:17237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_fopencookie=yes"
else
@@ -17255,7 +16367,7 @@
if test "$have_glibc_fopencookie" = "yes"; then
cat > conftest.$ac_ext <<EOF
-#line 17259 "configure"
+#line 16371 "configure"
#include "confdefs.h"
#define _GNU_SOURCE
@@ -17265,7 +16377,7 @@
cookie_io_functions_t cookie;
; return 0; }
EOF
-if { (eval echo configure:17269: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
have_cookie_io_functions_t=yes
else
@@ -17284,7 +16396,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 17288 "configure"
+#line 16400 "configure"
#include "confdefs.h"
#define _GNU_SOURCE
@@ -17316,7 +16428,7 @@
EOF
-if { (eval echo configure:17320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:16432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cookie_io_functions_use_off64_t=yes
@@ -17336,7 +16448,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 17340 "configure"
+#line 16452 "configure"
#include "confdefs.h"
#define _GNU_SOURCE
@@ -17346,7 +16458,7 @@
_IO_cookie_io_functions_t cookie;
; return 0; }
EOF
-if { (eval echo configure:17350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
have_IO_cookie_io_functions_t=yes
else
@@ -17380,7 +16492,7 @@
echo $ac_n "checking for broken getcwd""... $ac_c" 1>&6
-echo "configure:17384: checking for broken getcwd" >&5
+echo "configure:16496: checking for broken getcwd" >&5
os=`uname -sr 2>/dev/null`
case $os in
SunOS*)
@@ -17395,14 +16507,14 @@
echo $ac_n "checking for broken libc stdio""... $ac_c" 1>&6
-echo "configure:17399: checking for broken libc stdio" >&5
+echo "configure:16511: checking for broken libc stdio" >&5
if eval "test \"`echo '$''{'_cv_have_broken_glibc_fopen_append'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$cross_compiling" = yes; then
cat > conftest.$ac_ext <<EOF
-#line 17406 "configure"
+#line 16518 "configure"
#include "confdefs.h"
#include <features.h>
@@ -17415,7 +16527,7 @@
; return 0; }
EOF
-if { (eval echo configure:17419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16531: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
_cv_have_broken_glibc_fopen_append=yes
else
@@ -17428,7 +16540,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 17432 "configure"
+#line 16544 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -17456,7 +16568,7 @@
}
EOF
-if { (eval echo configure:17460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:16572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
_cv_have_broken_glibc_fopen_append=no
else
@@ -17484,12 +16596,12 @@
echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:17488: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:16600: checking whether struct tm is in sys/time.h or time.h" >&5
if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 17493 "configure"
+#line 16605 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <time.h>
@@ -17497,7 +16609,7 @@
struct tm *tp; tp->tm_sec;
; return 0; }
EOF
-if { (eval echo configure:17501: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16613: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm=time.h
else
@@ -17518,12 +16630,12 @@
fi
echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:17522: checking for tm_zone in struct tm" >&5
+echo "configure:16634: checking for tm_zone in struct tm" >&5
if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 17527 "configure"
+#line 16639 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_cv_struct_tm>
@@ -17531,7 +16643,7 @@
struct tm tm; tm.tm_zone;
; return 0; }
EOF
-if { (eval echo configure:17535: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16647: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm_zone=yes
else
@@ -17551,12 +16663,12 @@
else
echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:17555: checking for tzname" >&5
+echo "configure:16667: checking for tzname" >&5
if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 17560 "configure"
+#line 16672 "configure"
#include "confdefs.h"
#include <time.h>
#ifndef tzname /* For SGI. */
@@ -17566,7 +16678,7 @@
atoi(*tzname);
; return 0; }
EOF
-if { (eval echo configure:17570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_var_tzname=yes
else
@@ -17590,16 +16702,16 @@
echo $ac_n "checking for missing declarations of reentrant functions""... $ac_c" 1>&6
-echo "configure:17594: checking for missing declarations of reentrant functions" >&5
+echo "configure:16706: checking for missing declarations of reentrant functions" >&5
cat > conftest.$ac_ext <<EOF
-#line 17596 "configure"
+#line 16708 "configure"
#include "confdefs.h"
#include <time.h>
int main() {
struct tm *(*func)() = localtime_r
; return 0; }
EOF
-if { (eval echo configure:17603: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16715: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
:
@@ -17617,14 +16729,14 @@
fi
rm -f conftest*
cat > conftest.$ac_ext <<EOF
-#line 17621 "configure"
+#line 16733 "configure"
#include "confdefs.h"
#include <time.h>
int main() {
struct tm *(*func)() = gmtime_r
; return 0; }
EOF
-if { (eval echo configure:17628: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16740: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
:
@@ -17642,14 +16754,14 @@
fi
rm -f conftest*
cat > conftest.$ac_ext <<EOF
-#line 17646 "configure"
+#line 16758 "configure"
#include "confdefs.h"
#include <time.h>
int main() {
char *(*func)() = asctime_r
; return 0; }
EOF
-if { (eval echo configure:17653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16765: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
:
@@ -17667,14 +16779,14 @@
fi
rm -f conftest*
cat > conftest.$ac_ext <<EOF
-#line 17671 "configure"
+#line 16783 "configure"
#include "confdefs.h"
#include <time.h>
int main() {
char *(*func)() = ctime_r
; return 0; }
EOF
-if { (eval echo configure:17678: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16790: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
:
@@ -17692,14 +16804,14 @@
fi
rm -f conftest*
cat > conftest.$ac_ext <<EOF
-#line 17696 "configure"
+#line 16808 "configure"
#include "confdefs.h"
#include <string.h>
int main() {
char *(*func)() = strtok_r
; return 0; }
EOF
-if { (eval echo configure:17703: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16815: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
:
@@ -17720,16 +16832,16 @@
echo $ac_n "checking for fclose declaration""... $ac_c" 1>&6
-echo "configure:17724: checking for fclose declaration" >&5
+echo "configure:16836: checking for fclose declaration" >&5
cat > conftest.$ac_ext <<EOF
-#line 17726 "configure"
+#line 16838 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
int (*func)() = fclose
; return 0; }
EOF
-if { (eval echo configure:17733: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16845: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
@@ -17755,12 +16867,12 @@
echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
-echo "configure:17759: checking for tm_gmtoff in struct tm" >&5
+echo "configure:16871: checking for tm_gmtoff in struct tm" >&5
if eval "test \"`echo '$''{'ac_cv_struct_tm_gmtoff'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 17764 "configure"
+#line 16876 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_cv_struct_tm>
@@ -17768,7 +16880,7 @@
struct tm tm; tm.tm_gmtoff;
; return 0; }
EOF
-if { (eval echo configure:17772: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16884: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm_gmtoff=yes
else
@@ -17791,12 +16903,12 @@
echo $ac_n "checking for struct flock""... $ac_c" 1>&6
-echo "configure:17795: checking for struct flock" >&5
+echo "configure:16907: checking for struct flock" >&5
if eval "test \"`echo '$''{'ac_cv_struct_flock'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 17800 "configure"
+#line 16912 "configure"
#include "confdefs.h"
#include <unistd.h>
@@ -17806,7 +16918,7 @@
struct flock x;
; return 0; }
EOF
-if { (eval echo configure:17810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16922: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_flock=yes
@@ -17833,12 +16945,12 @@
echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
-echo "configure:17837: checking for socklen_t" >&5
+echo "configure:16949: checking for socklen_t" >&5
if eval "test \"`echo '$''{'ac_cv_socklen_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 17842 "configure"
+#line 16954 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -17850,7 +16962,7 @@
; return 0; }
EOF
-if { (eval echo configure:17854: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16966: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_socklen_t=yes
@@ -17876,7 +16988,7 @@
echo $ac_n "checking size of size_t""... $ac_c" 1>&6
-echo "configure:17880: checking size of size_t" >&5
+echo "configure:16992: checking size of size_t" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -17884,7 +16996,7 @@
ac_cv_sizeof_size_t=8
else
cat > conftest.$ac_ext <<EOF
-#line 17888 "configure"
+#line 17000 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -17895,7 +17007,7 @@
exit(0);
}
EOF
-if { (eval echo configure:17899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:17011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_size_t=`cat conftestval`
else
@@ -17915,7 +17027,7 @@
echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:17919: checking size of long long" >&5
+echo "configure:17031: checking size of long long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -17923,7 +17035,7 @@
ac_cv_sizeof_long_long=8
else
cat > conftest.$ac_ext <<EOF
-#line 17927 "configure"
+#line 17039 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -17934,7 +17046,7 @@
exit(0);
}
EOF
-if { (eval echo configure:17938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:17050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long_long=`cat conftestval`
else
@@ -17954,7 +17066,7 @@
echo $ac_n "checking size of long long int""... $ac_c" 1>&6
-echo "configure:17958: checking size of long long int" >&5
+echo "configure:17070: checking size of long long int" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long_long_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -17962,7 +17074,7 @@
ac_cv_sizeof_long_long_int=8
else
cat > conftest.$ac_ext <<EOF
-#line 17966 "configure"
+#line 17078 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -17973,7 +17085,7 @@
exit(0);
}
EOF
-if { (eval echo configure:17977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:17089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long_long_int=`cat conftestval`
else
@@ -17993,7 +17105,7 @@
echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:17997: checking size of long" >&5
+echo "configure:17109: checking size of long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -18001,7 +17113,7 @@
ac_cv_sizeof_long=8
else
cat > conftest.$ac_ext <<EOF
-#line 18005 "configure"
+#line 17117 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -18012,7 +17124,7 @@
exit(0);
}
EOF
-if { (eval echo configure:18016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:17128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long=`cat conftestval`
else
@@ -18032,7 +17144,7 @@
echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:18036: checking size of int" >&5
+echo "configure:17148: checking size of int" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -18040,7 +17152,7 @@
ac_cv_sizeof_int=4
else
cat > conftest.$ac_ext <<EOF
-#line 18044 "configure"
+#line 17156 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -18051,7 +17163,7 @@
exit(0);
}
EOF
-if { (eval echo configure:18055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:17167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_int=`cat conftestval`
else
@@ -18073,7 +17185,7 @@
echo $ac_n "checking size of intmax_t""... $ac_c" 1>&6
-echo "configure:18077: checking size of intmax_t" >&5
+echo "configure:17189: checking size of intmax_t" >&5
php_cache_value=php_cv_sizeof_intmax_t
if eval "test \"`echo '$''{'php_cv_sizeof_intmax_t'+set}'`\" = set"; then
@@ -18090,7 +17202,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 18094 "configure"
+#line 17206 "configure"
#include "confdefs.h"
#include <stdio.h>
#if STDC_HEADERS
@@ -18114,7 +17226,7 @@
}
EOF
-if { (eval echo configure:18118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:17230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
eval $php_cache_value=`cat conftestval`
@@ -18153,7 +17265,7 @@
echo $ac_n "checking size of ssize_t""... $ac_c" 1>&6
-echo "configure:18157: checking size of ssize_t" >&5
+echo "configure:17269: checking size of ssize_t" >&5
php_cache_value=php_cv_sizeof_ssize_t
if eval "test \"`echo '$''{'php_cv_sizeof_ssize_t'+set}'`\" = set"; then
@@ -18170,7 +17282,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 18174 "configure"
+#line 17286 "configure"
#include "confdefs.h"
#include <stdio.h>
#if STDC_HEADERS
@@ -18194,7 +17306,7 @@
}
EOF
-if { (eval echo configure:18198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:17310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
eval $php_cache_value=`cat conftestval`
@@ -18233,7 +17345,7 @@
echo $ac_n "checking size of ptrdiff_t""... $ac_c" 1>&6
-echo "configure:18237: checking size of ptrdiff_t" >&5
+echo "configure:17349: checking size of ptrdiff_t" >&5
php_cache_value=php_cv_sizeof_ptrdiff_t
if eval "test \"`echo '$''{'php_cv_sizeof_ptrdiff_t'+set}'`\" = set"; then
@@ -18250,7 +17362,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 18254 "configure"
+#line 17366 "configure"
#include "confdefs.h"
#include <stdio.h>
#if STDC_HEADERS
@@ -18274,7 +17386,7 @@
}
EOF
-if { (eval echo configure:18278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:17390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
eval $php_cache_value=`cat conftestval`
@@ -18313,12 +17425,12 @@
echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
-echo "configure:18317: checking for st_blksize in struct stat" >&5
+echo "configure:17429: checking for st_blksize in struct stat" >&5
if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 18322 "configure"
+#line 17434 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/stat.h>
@@ -18326,7 +17438,7 @@
struct stat s; s.st_blksize;
; return 0; }
EOF
-if { (eval echo configure:18330: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17442: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_st_blksize=yes
else
@@ -18348,12 +17460,12 @@
if test "`uname -s 2>/dev/null`" != "QNX"; then
echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6
-echo "configure:18352: checking for st_blocks in struct stat" >&5
+echo "configure:17464: checking for st_blocks in struct stat" >&5
if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 18357 "configure"
+#line 17469 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/stat.h>
@@ -18361,7 +17473,7 @@
struct stat s; s.st_blocks;
; return 0; }
EOF
-if { (eval echo configure:18365: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_st_blocks=yes
else
@@ -18388,12 +17500,12 @@
WARNING_LEVEL=0
fi
echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6
-echo "configure:18392: checking for st_rdev in struct stat" >&5
+echo "configure:17504: checking for st_rdev in struct stat" >&5
if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 18397 "configure"
+#line 17509 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/stat.h>
@@ -18401,7 +17513,7 @@
struct stat s; s.st_rdev;
; return 0; }
EOF
-if { (eval echo configure:18405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17517: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_st_rdev=yes
else
@@ -18423,12 +17535,12 @@
echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:18427: checking for size_t" >&5
+echo "configure:17539: checking for size_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 18432 "configure"
+#line 17544 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -18456,12 +17568,12 @@
fi
echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:18460: checking for uid_t in sys/types.h" >&5
+echo "configure:17572: checking for uid_t in sys/types.h" >&5
if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 18465 "configure"
+#line 17577 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
@@ -18492,12 +17604,12 @@
echo $ac_n "checking for struct sockaddr_storage""... $ac_c" 1>&6
-echo "configure:18496: checking for struct sockaddr_storage" >&5
+echo "configure:17608: checking for struct sockaddr_storage" >&5
if eval "test \"`echo '$''{'ac_cv_sockaddr_storage'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 18501 "configure"
+#line 17613 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/socket.h>
@@ -18505,7 +17617,7 @@
struct sockaddr_storage s; s
; return 0; }
EOF
-if { (eval echo configure:18509: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17621: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sockaddr_storage=yes
else
@@ -18526,13 +17638,13 @@
fi
echo $ac_n "checking for field sa_len in struct sockaddr""... $ac_c" 1>&6
-echo "configure:18530: checking for field sa_len in struct sockaddr" >&5
+echo "configure:17642: checking for field sa_len in struct sockaddr" >&5
if eval "test \"`echo '$''{'ac_cv_sockaddr_sa_len'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 18536 "configure"
+#line 17648 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/socket.h>
@@ -18540,7 +17652,7 @@
static struct sockaddr sa; int n = (int) sa.sa_len; return n;
; return 0; }
EOF
-if { (eval echo configure:18544: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17656: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sockaddr_sa_len=yes
else
@@ -18563,12 +17675,12 @@
echo $ac_n "checking for IPv6 support""... $ac_c" 1>&6
-echo "configure:18567: checking for IPv6 support" >&5
+echo "configure:17679: checking for IPv6 support" >&5
if eval "test \"`echo '$''{'ac_cv_ipv6_support'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 18572 "configure"
+#line 17684 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/socket.h>
@@ -18577,7 +17689,7 @@
struct sockaddr_in6 s; struct in6_addr t=in6addr_any; int i=AF_INET6; s; t.s6_addr[0] = 0;
; return 0; }
EOF
-if { (eval echo configure:18581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_ipv6_support=yes
else
@@ -18593,12 +17705,12 @@
echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:18597: checking for vprintf" >&5
+echo "configure:17709: checking for vprintf" >&5
if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 18602 "configure"
+#line 17714 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vprintf(); below. */
@@ -18621,7 +17733,7 @@
; return 0; }
EOF
-if { (eval echo configure:18625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_vprintf=yes"
else
@@ -18645,12 +17757,12 @@
if test "$ac_cv_func_vprintf" != yes; then
echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:18649: checking for _doprnt" >&5
+echo "configure:17761: checking for _doprnt" >&5
if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 18654 "configure"
+#line 17766 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char _doprnt(); below. */
@@ -18673,7 +17785,7 @@
; return 0; }
EOF
-if { (eval echo configure:18677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func__doprnt=yes"
else
@@ -18782,12 +17894,12 @@
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:18786: checking for $ac_func" >&5
+echo "configure:17898: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 18791 "configure"
+#line 17903 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -18810,7 +17922,7 @@
; return 0; }
EOF
-if { (eval echo configure:18814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -18841,7 +17953,7 @@
unset ac_cv_lib_rt___nanosleep
unset found
echo $ac_n "checking for nanosleep in -lrt""... $ac_c" 1>&6
-echo "configure:18845: checking for nanosleep in -lrt" >&5
+echo "configure:17957: checking for nanosleep in -lrt" >&5
ac_lib_var=`echo rt'_'nanosleep | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -18849,7 +17961,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lrt $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 18853 "configure"
+#line 17965 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -18860,7 +17972,7 @@
nanosleep()
; return 0; }
EOF
-if { (eval echo configure:18864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -18880,7 +17992,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __nanosleep in -lrt""... $ac_c" 1>&6
-echo "configure:18884: checking for __nanosleep in -lrt" >&5
+echo "configure:17996: checking for __nanosleep in -lrt" >&5
ac_lib_var=`echo rt'_'__nanosleep | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -18888,7 +18000,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lrt $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 18892 "configure"
+#line 18004 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -18899,7 +18011,7 @@
__nanosleep()
; return 0; }
EOF
-if { (eval echo configure:18903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -18931,11 +18043,11 @@
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 18935 "configure"
+#line 18047 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:18939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:18051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -18979,25 +18091,25 @@
echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6
-echo "configure:18983: checking for getaddrinfo" >&5
+echo "configure:18095: checking for getaddrinfo" >&5
if eval "test \"`echo '$''{'ac_cv_func_getaddrinfo'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 18988 "configure"
+#line 18100 "configure"
#include "confdefs.h"
#include <netdb.h>
int main() {
struct addrinfo *g,h;g=&h;getaddrinfo("","",g,&g);
; return 0; }
EOF
-if { (eval echo configure:18995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
if test "$cross_compiling" = yes; then
ac_cv_func_getaddrinfo=no
else
cat > conftest.$ac_ext <<EOF
-#line 19001 "configure"
+#line 18113 "configure"
#include "confdefs.h"
#include <netdb.h>
@@ -19037,7 +18149,7 @@
}
EOF
-if { (eval echo configure:19041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:18153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_getaddrinfo=yes
else
@@ -19067,19 +18179,19 @@
fi
echo $ac_n "checking for __sync_fetch_and_add""... $ac_c" 1>&6
-echo "configure:19071: checking for __sync_fetch_and_add" >&5
+echo "configure:18183: checking for __sync_fetch_and_add" >&5
if eval "test \"`echo '$''{'ac_cv_func_sync_fetch_and_add'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 19076 "configure"
+#line 18188 "configure"
#include "confdefs.h"
int main() {
int x;__sync_fetch_and_add(&x,1);
; return 0; }
EOF
-if { (eval echo configure:19083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_func_sync_fetch_and_add=yes
else
@@ -19102,12 +18214,12 @@
for ac_func in strlcat strlcpy getopt
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:19106: checking for $ac_func" >&5
+echo "configure:18218: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 19111 "configure"
+#line 18223 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -19130,7 +18242,7 @@
; return 0; }
EOF
-if { (eval echo configure:19134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -19157,7 +18269,7 @@
echo $ac_n "checking whether utime accepts a null argument""... $ac_c" 1>&6
-echo "configure:19161: checking whether utime accepts a null argument" >&5
+echo "configure:18273: checking whether utime accepts a null argument" >&5
if eval "test \"`echo '$''{'ac_cv_func_utime_null'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -19167,7 +18279,7 @@
ac_cv_func_utime_null=no
else
cat > conftest.$ac_ext <<EOF
-#line 19171 "configure"
+#line 18283 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/stat.h>
@@ -19178,7 +18290,7 @@
&& t.st_mtime - s.st_mtime < 120));
}
EOF
-if { (eval echo configure:19182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:18294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_utime_null=yes
else
@@ -19204,19 +18316,19 @@
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
# for constant arguments. Useless!
echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:19208: checking for working alloca.h" >&5
+echo "configure:18320: checking for working alloca.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 19213 "configure"
+#line 18325 "configure"
#include "confdefs.h"
#include <alloca.h>
int main() {
char *p = alloca(2 * sizeof(int));
; return 0; }
EOF
-if { (eval echo configure:19220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_header_alloca_h=yes
else
@@ -19237,12 +18349,12 @@
fi
echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:19241: checking for alloca" >&5
+echo "configure:18353: checking for alloca" >&5
if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 19246 "configure"
+#line 18358 "configure"
#include "confdefs.h"
#ifdef __GNUC__
@@ -19270,7 +18382,7 @@
char *p = (char *) alloca(1);
; return 0; }
EOF
-if { (eval echo configure:19274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_func_alloca_works=yes
else
@@ -19302,12 +18414,12 @@
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:19306: checking whether alloca needs Cray hooks" >&5
+echo "configure:18418: checking whether alloca needs Cray hooks" >&5
if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 19311 "configure"
+#line 18423 "configure"
#include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2)
webecray
@@ -19332,12 +18444,12 @@
if test $ac_cv_os_cray = yes; then
for ac_func in _getb67 GETB67 getb67; do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:19336: checking for $ac_func" >&5
+echo "configure:18448: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 19341 "configure"
+#line 18453 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -19360,7 +18472,7 @@
; return 0; }
EOF
-if { (eval echo configure:19364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -19387,7 +18499,7 @@
fi
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:19391: checking stack direction for C alloca" >&5
+echo "configure:18503: checking stack direction for C alloca" >&5
if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -19395,7 +18507,7 @@
ac_cv_c_stack_direction=0
else
cat > conftest.$ac_ext <<EOF
-#line 19399 "configure"
+#line 18511 "configure"
#include "confdefs.h"
find_stack_direction ()
{
@@ -19414,7 +18526,7 @@
exit (find_stack_direction() < 0);
}
EOF
-if { (eval echo configure:19418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:18530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_stack_direction=1
else
@@ -19435,18 +18547,15 @@
fi
-cat >> confdefs.h <<\EOF
-#define SUHOSIN_PATCH 1
-EOF
echo $ac_n "checking for declared timezone""... $ac_c" 1>&6
-echo "configure:19441: checking for declared timezone" >&5
+echo "configure:18553: checking for declared timezone" >&5
if eval "test \"`echo '$''{'ac_cv_declared_timezone'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 19447 "configure"
+#line 18559 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -19461,7 +18570,7 @@
; return 0; }
EOF
-if { (eval echo configure:19462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:18574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_declared_timezone=yes
@@ -19487,7 +18596,7 @@
echo $ac_n "checking for type of reentrant time-related functions""... $ac_c" 1>&6
-echo "configure:19488: checking for type of reentrant time-related functions" >&5
+echo "configure:18600: checking for type of reentrant time-related functions" >&5
if eval "test \"`echo '$''{'ac_cv_time_r_type'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -19498,7 +18607,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 19499 "configure"
+#line 18611 "configure"
#include "confdefs.h"
#include <time.h>
@@ -19516,7 +18625,7 @@
}
EOF
-if { (eval echo configure:19517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:18629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_time_r_type=hpux
@@ -19532,7 +18641,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 19533 "configure"
+#line 18645 "configure"
#include "confdefs.h"
#include <time.h>
@@ -19548,7 +18657,7 @@
}
EOF
-if { (eval echo configure:19549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:18661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_time_r_type=irix
@@ -19586,12 +18695,12 @@
echo $ac_n "checking for readdir_r""... $ac_c" 1>&6
-echo "configure:19587: checking for readdir_r" >&5
+echo "configure:18699: checking for readdir_r" >&5
if eval "test \"`echo '$''{'ac_cv_func_readdir_r'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 19592 "configure"
+#line 18704 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char readdir_r(); below. */
@@ -19614,7 +18723,7 @@
; return 0; }
EOF
-if { (eval echo configure:19615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_readdir_r=yes"
else
@@ -19636,7 +18745,7 @@
if test "$ac_cv_func_readdir_r" = "yes"; then
echo $ac_n "checking for type of readdir_r""... $ac_c" 1>&6
-echo "configure:19637: checking for type of readdir_r" >&5
+echo "configure:18749: checking for type of readdir_r" >&5
if eval "test \"`echo '$''{'ac_cv_what_readdir_r'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -19647,7 +18756,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 19648 "configure"
+#line 18760 "configure"
#include "confdefs.h"
#define _REENTRANT
@@ -19672,7 +18781,7 @@
}
EOF
-if { (eval echo configure:19673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:18785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_what_readdir_r=POSIX
@@ -19683,7 +18792,7 @@
rm -fr conftest*
cat > conftest.$ac_ext <<EOF
-#line 19684 "configure"
+#line 18796 "configure"
#include "confdefs.h"
#define _REENTRANT
@@ -19693,7 +18802,7 @@
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:19694: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:18806: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -19735,12 +18844,12 @@
echo $ac_n "checking for in_addr_t""... $ac_c" 1>&6
-echo "configure:19736: checking for in_addr_t" >&5
+echo "configure:18848: checking for in_addr_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_in_addr_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 19741 "configure"
+#line 18853 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -19774,12 +18883,12 @@
for ac_func in crypt_r
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:19775: checking for $ac_func" >&5
+echo "configure:18887: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 19780 "configure"
+#line 18892 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -19802,7 +18911,7 @@
; return 0; }
EOF
-if { (eval echo configure:19803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -19830,14 +18939,14 @@
if test "x$php_crypt_r" = "x1"; then
echo $ac_n "checking which data struct is used by crypt_r""... $ac_c" 1>&6
-echo "configure:19831: checking which data struct is used by crypt_r" >&5
+echo "configure:18943: checking which data struct is used by crypt_r" >&5
if eval "test \"`echo '$''{'php_cv_crypt_r_style'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
php_cv_crypt_r_style=none
cat > conftest.$ac_ext <<EOF
-#line 19838 "configure"
+#line 18950 "configure"
#include "confdefs.h"
#define _REENTRANT 1
@@ -19850,7 +18959,7 @@
; return 0; }
EOF
-if { (eval echo configure:19851: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:18963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
php_cv_crypt_r_style=cryptd
else
@@ -19861,7 +18970,7 @@
if test "$php_cv_crypt_r_style" = "none"; then
cat > conftest.$ac_ext <<EOF
-#line 19862 "configure"
+#line 18974 "configure"
#include "confdefs.h"
#define _REENTRANT 1
@@ -19874,7 +18983,7 @@
; return 0; }
EOF
-if { (eval echo configure:19875: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:18987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
php_cv_crypt_r_style=struct_crypt_data
else
@@ -19886,7 +18995,7 @@
if test "$php_cv_crypt_r_style" = "none"; then
cat > conftest.$ac_ext <<EOF
-#line 19887 "configure"
+#line 18999 "configure"
#include "confdefs.h"
#define _REENTRANT 1
@@ -19900,7 +19009,7 @@
; return 0; }
EOF
-if { (eval echo configure:19901: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19013: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
php_cv_crypt_r_style=struct_crypt_data_gnu_source
else
@@ -19959,7 +19068,7 @@
php_enable_gcov=no
echo $ac_n "checking whether to include gcov symbols""... $ac_c" 1>&6
-echo "configure:19960: checking whether to include gcov symbols" >&5
+echo "configure:19072: checking whether to include gcov symbols" >&5
# Check whether --enable-gcov or --disable-gcov was given.
if test "${enable_gcov+set}" = set; then
enableval="$enable_gcov"
@@ -19998,7 +19107,7 @@
# Extract the first word of "lcov", so it can be a program name with args.
set dummy lcov; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:19999: checking for $ac_word" >&5
+echo "configure:19111: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LTP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -20027,7 +19136,7 @@
# Extract the first word of "genhtml", so it can be a program name with args.
set dummy genhtml; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:20028: checking for $ac_word" >&5
+echo "configure:19140: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LTP_GENHTML'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -20062,7 +19171,7 @@
if test "$LTP"; then
echo $ac_n "checking for ltp version""... $ac_c" 1>&6
-echo "configure:20063: checking for ltp version" >&5
+echo "configure:19175: checking for ltp version" >&5
if eval "test \"`echo '$''{'php_cv_ltp_version'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -20119,7 +19228,7 @@
php_enable_debug=no
echo $ac_n "checking whether to include debugging symbols""... $ac_c" 1>&6
-echo "configure:20120: checking whether to include debugging symbols" >&5
+echo "configure:19232: checking whether to include debugging symbols" >&5
# Check whether --enable-debug or --disable-debug was given.
if test "${enable_debug+set}" = set; then
enableval="$enable_debug"
@@ -20167,7 +19276,7 @@
php_with_layout=PHP
echo $ac_n "checking layout of installed files""... $ac_c" 1>&6
-echo "configure:20168: checking layout of installed files" >&5
+echo "configure:19280: checking layout of installed files" >&5
# Check whether --with-layout or --without-layout was given.
if test "${with_layout+set}" = set; then
withval="$with_layout"
@@ -20199,7 +19308,7 @@
php_with_config_file_path=DEFAULT
echo $ac_n "checking path to configuration file""... $ac_c" 1>&6
-echo "configure:20200: checking path to configuration file" >&5
+echo "configure:19312: checking path to configuration file" >&5
# Check whether --with-config-file-path or --without-config-file-path was given.
if test "${with_config_file_path+set}" = set; then
withval="$with_config_file_path"
@@ -20230,7 +19339,7 @@
fi
echo $ac_n "checking where to scan for configuration files""... $ac_c" 1>&6
-echo "configure:20231: checking where to scan for configuration files" >&5
+echo "configure:19343: checking where to scan for configuration files" >&5
php_with_config_file_scan_dir=DEFAULT
@@ -20263,7 +19372,7 @@
php_enable_safe_mode=no
echo $ac_n "checking whether to enable safe mode by default""... $ac_c" 1>&6
-echo "configure:20264: checking whether to enable safe mode by default" >&5
+echo "configure:19376: checking whether to enable safe mode by default" >&5
# Check whether --enable-safe-mode or --disable-safe-mode was given.
if test "${enable_safe_mode+set}" = set; then
enableval="$enable_safe_mode"
@@ -20295,7 +19404,7 @@
fi
echo $ac_n "checking for safe mode exec dir""... $ac_c" 1>&6
-echo "configure:20296: checking for safe mode exec dir" >&5
+echo "configure:19408: checking for safe mode exec dir" >&5
php_with_exec_dir=no
@@ -20336,7 +19445,7 @@
php_enable_sigchild=no
echo $ac_n "checking whether to enable PHP's own SIGCHLD handler""... $ac_c" 1>&6
-echo "configure:20337: checking whether to enable PHP's own SIGCHLD handler" >&5
+echo "configure:19449: checking whether to enable PHP's own SIGCHLD handler" >&5
# Check whether --enable-sigchild or --disable-sigchild was given.
if test "${enable_sigchild+set}" = set; then
enableval="$enable_sigchild"
@@ -20371,7 +19480,7 @@
php_enable_magic_quotes=no
echo $ac_n "checking whether to enable magic quotes by default""... $ac_c" 1>&6
-echo "configure:20372: checking whether to enable magic quotes by default" >&5
+echo "configure:19484: checking whether to enable magic quotes by default" >&5
# Check whether --enable-magic-quotes or --disable-magic-quotes was given.
if test "${enable_magic_quotes+set}" = set; then
enableval="$enable_magic_quotes"
@@ -20406,7 +19515,7 @@
php_enable_libgcc=no
echo $ac_n "checking whether to explicitly link against libgcc""... $ac_c" 1>&6
-echo "configure:20407: checking whether to explicitly link against libgcc" >&5
+echo "configure:19519: checking whether to explicitly link against libgcc" >&5
# Check whether --enable-libgcc or --disable-libgcc was given.
if test "${enable_libgcc+set}" = set; then
enableval="$enable_libgcc"
@@ -20483,7 +19592,7 @@
php_enable_short_tags=yes
echo $ac_n "checking whether to enable short tags by default""... $ac_c" 1>&6
-echo "configure:20484: checking whether to enable short tags by default" >&5
+echo "configure:19596: checking whether to enable short tags by default" >&5
# Check whether --enable-short-tags or --disable-short-tags was given.
if test "${enable_short_tags+set}" = set; then
enableval="$enable_short_tags"
@@ -20518,7 +19627,7 @@
php_enable_dmalloc=no
echo $ac_n "checking whether to enable dmalloc""... $ac_c" 1>&6
-echo "configure:20519: checking whether to enable dmalloc" >&5
+echo "configure:19631: checking whether to enable dmalloc" >&5
# Check whether --enable-dmalloc or --disable-dmalloc was given.
if test "${enable_dmalloc+set}" = set; then
enableval="$enable_dmalloc"
@@ -20539,7 +19648,7 @@
if test "$PHP_DMALLOC" = "yes"; then
echo $ac_n "checking for dmalloc_error in -ldmalloc""... $ac_c" 1>&6
-echo "configure:20540: checking for dmalloc_error in -ldmalloc" >&5
+echo "configure:19652: checking for dmalloc_error in -ldmalloc" >&5
ac_lib_var=`echo dmalloc'_'dmalloc_error | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -20547,7 +19656,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldmalloc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 20548 "configure"
+#line 19660 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -20558,7 +19667,7 @@
dmalloc_error()
; return 0; }
EOF
-if { (eval echo configure:20559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -20603,7 +19712,7 @@
php_enable_ipv6=yes
echo $ac_n "checking whether to enable IPv6 support""... $ac_c" 1>&6
-echo "configure:20604: checking whether to enable IPv6 support" >&5
+echo "configure:19716: checking whether to enable IPv6 support" >&5
# Check whether --enable-ipv6 or --disable-ipv6 was given.
if test "${enable_ipv6+set}" = set; then
enableval="$enable_ipv6"
@@ -20630,7 +19739,7 @@
fi
echo $ac_n "checking how big to make fd sets""... $ac_c" 1>&6
-echo "configure:20631: checking how big to make fd sets" >&5
+echo "configure:19743: checking how big to make fd sets" >&5
php_enable_fd_setsize=no
@@ -20698,7 +19807,7 @@
echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:20699: checking size of long" >&5
+echo "configure:19811: checking size of long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -20706,7 +19815,7 @@
ac_cv_sizeof_long=8
else
cat > conftest.$ac_ext <<EOF
-#line 20707 "configure"
+#line 19819 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -20717,7 +19826,7 @@
exit(0);
}
EOF
-if { (eval echo configure:20718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:19830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long=`cat conftestval`
else
@@ -20737,7 +19846,7 @@
echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:20738: checking size of int" >&5
+echo "configure:19850: checking size of int" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -20745,7 +19854,7 @@
ac_cv_sizeof_int=4
else
cat > conftest.$ac_ext <<EOF
-#line 20746 "configure"
+#line 19858 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -20756,7 +19865,7 @@
exit(0);
}
EOF
-if { (eval echo configure:20757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:19869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_int=`cat conftestval`
else
@@ -20777,13 +19886,13 @@
echo $ac_n "checking for int32_t""... $ac_c" 1>&6
-echo "configure:20778: checking for int32_t" >&5
+echo "configure:19890: checking for int32_t" >&5
if eval "test \"`echo '$''{'ac_cv_int_type_int32_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 20784 "configure"
+#line 19896 "configure"
#include "confdefs.h"
#if HAVE_SYS_TYPES_H
@@ -20802,7 +19911,7 @@
; return 0; }
EOF
-if { (eval echo configure:20803: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_int_type_int32_t=yes
else
@@ -20825,13 +19934,13 @@
echo $ac_n "checking for uint32_t""... $ac_c" 1>&6
-echo "configure:20826: checking for uint32_t" >&5
+echo "configure:19938: checking for uint32_t" >&5
if eval "test \"`echo '$''{'ac_cv_int_type_uint32_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 20832 "configure"
+#line 19944 "configure"
#include "confdefs.h"
#if HAVE_SYS_TYPES_H
@@ -20850,7 +19959,7 @@
; return 0; }
EOF
-if { (eval echo configure:20851: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_int_type_uint32_t=yes
else
@@ -20882,17 +19991,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:20883: checking for $ac_hdr" >&5
+echo "configure:19995: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 20888 "configure"
+#line 20000 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:20893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:20005: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -20922,12 +20031,12 @@
for ac_func in strtoll atoll strftime
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:20923: checking for $ac_func" >&5
+echo "configure:20035: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 20928 "configure"
+#line 20040 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -20950,7 +20059,7 @@
; return 0; }
EOF
-if { (eval echo configure:20951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -21240,7 +20349,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -21412,7 +20521,7 @@
esac
echo $ac_n "checking which regex library to use""... $ac_c" 1>&6
-echo "configure:21413: checking which regex library to use" >&5
+echo "configure:20525: checking which regex library to use" >&5
echo "$ac_t""$REGEX_TYPE" 1>&6
if test "$REGEX_TYPE" = "php"; then
@@ -21680,7 +20789,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -21789,13 +20898,13 @@
EOF
echo $ac_n "checking whether field re_magic exists in struct regex_t""... $ac_c" 1>&6
-echo "configure:21790: checking whether field re_magic exists in struct regex_t" >&5
+echo "configure:20902: checking whether field re_magic exists in struct regex_t" >&5
if eval "test \"`echo '$''{'ac_cv_regex_t_re_magic'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 21796 "configure"
+#line 20908 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <regex.h>
@@ -21803,7 +20912,7 @@
regex_t rt; rt.re_magic;
; return 0; }
EOF
-if { (eval echo configure:21804: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20916: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_regex_t_re_magic=yes
else
@@ -21829,7 +20938,7 @@
php_enable_libxml=yes
echo $ac_n "checking whether to enable LIBXML support""... $ac_c" 1>&6
-echo "configure:21830: checking whether to enable LIBXML support" >&5
+echo "configure:20942: checking whether to enable LIBXML support" >&5
# Check whether --enable-libxml or --disable-libxml was given.
if test "${enable_libxml+set}" = set; then
enableval="$enable_libxml"
@@ -21874,7 +20983,7 @@
php_with_libxml_dir=no
echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
-echo "configure:21875: checking libxml2 install dir" >&5
+echo "configure:20987: checking libxml2 install dir" >&5
# Check whether --with-libxml-dir or --without-libxml-dir was given.
if test "${with_libxml_dir+set}" = set; then
withval="$with_libxml_dir"
@@ -21900,7 +21009,7 @@
echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
-echo "configure:21901: checking for xml2-config path" >&5
+echo "configure:21013: checking for xml2-config path" >&5
if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -22058,7 +21167,7 @@
echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
-echo "configure:22059: checking whether libxml build works" >&5
+echo "configure:21171: checking whether libxml build works" >&5
if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -22074,7 +21183,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 22075 "configure"
+#line 21187 "configure"
#include "confdefs.h"
@@ -22085,7 +21194,7 @@
}
EOF
-if { (eval echo configure:22086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:21198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
LIBS=$old_LIBS
@@ -22383,7 +21492,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -22450,7 +21559,7 @@
php_with_openssl=no
echo $ac_n "checking for OpenSSL support""... $ac_c" 1>&6
-echo "configure:22451: checking for OpenSSL support" >&5
+echo "configure:21563: checking for OpenSSL support" >&5
# Check whether --with-openssl or --without-openssl was given.
if test "${with_openssl+set}" = set; then
withval="$with_openssl"
@@ -22494,7 +21603,7 @@
php_with_kerberos=no
echo $ac_n "checking for Kerberos support""... $ac_c" 1>&6
-echo "configure:22495: checking for Kerberos support" >&5
+echo "configure:21607: checking for Kerberos support" >&5
# Check whether --with-kerberos or --without-kerberos was given.
if test "${with_kerberos+set}" = set; then
withval="$with_kerberos"
@@ -22773,7 +21882,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -22820,7 +21929,7 @@
# Extract the first word of "krb5-config", so it can be a program name with args.
set dummy krb5-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:22821: checking for $ac_word" >&5
+echo "configure:21933: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_KRB5_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -23180,7 +22289,7 @@
fi
echo $ac_n "checking for DSA_get_default_method in -lssl""... $ac_c" 1>&6
-echo "configure:23181: checking for DSA_get_default_method in -lssl" >&5
+echo "configure:22293: checking for DSA_get_default_method in -lssl" >&5
ac_lib_var=`echo ssl'_'DSA_get_default_method | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -23188,7 +22297,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lssl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 23189 "configure"
+#line 22301 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -23199,7 +22308,7 @@
DSA_get_default_method()
; return 0; }
EOF
-if { (eval echo configure:23200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:22312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -23223,7 +22332,7 @@
fi
echo $ac_n "checking for X509_free in -lcrypto""... $ac_c" 1>&6
-echo "configure:23224: checking for X509_free in -lcrypto" >&5
+echo "configure:22336: checking for X509_free in -lcrypto" >&5
ac_lib_var=`echo crypto'_'X509_free | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -23231,7 +22340,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lcrypto $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 23232 "configure"
+#line 22344 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -23242,7 +22351,7 @@
X509_free()
; return 0; }
EOF
-if { (eval echo configure:23243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:22355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -23284,7 +22393,7 @@
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:23285: checking for $ac_word" >&5
+echo "configure:22397: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -23489,9 +22598,9 @@
old_CPPFLAGS=$CPPFLAGS
CPPFLAGS=-I$OPENSSL_INCDIR
echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
-echo "configure:23490: checking for OpenSSL version" >&5
+echo "configure:22602: checking for OpenSSL version" >&5
cat > conftest.$ac_ext <<EOF
-#line 23492 "configure"
+#line 22604 "configure"
#include "confdefs.h"
#include <openssl/opensslv.h>
@@ -23646,7 +22755,7 @@
done
echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
-echo "configure:23647: checking for CRYPTO_free in -lcrypto" >&5
+echo "configure:22759: checking for CRYPTO_free in -lcrypto" >&5
ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -23654,7 +22763,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lcrypto $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 23655 "configure"
+#line 22767 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -23665,7 +22774,7 @@
CRYPTO_free()
; return 0; }
EOF
-if { (eval echo configure:23666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:22778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -23822,7 +22931,7 @@
done
echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
-echo "configure:23823: checking for SSL_CTX_set_ssl_version in -lssl" >&5
+echo "configure:22935: checking for SSL_CTX_set_ssl_version in -lssl" >&5
ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -23830,7 +22939,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lssl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 23831 "configure"
+#line 22943 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -23841,7 +22950,7 @@
SSL_CTX_set_ssl_version()
; return 0; }
EOF
-if { (eval echo configure:23842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:22954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -24006,7 +23115,7 @@
if test "$PHP_PCRE_REGEX" != "yes" && test "$PHP_PCRE_REGEX" != "no"; then
echo $ac_n "checking for PCRE headers location""... $ac_c" 1>&6
-echo "configure:24007: checking for PCRE headers location" >&5
+echo "configure:23119: checking for PCRE headers location" >&5
for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include $PHP_PCRE_REGEX/include/pcre $PHP_PCRE_REGEX/local/include; do
test -f $i/pcre.h && PCRE_INCDIR=$i
done
@@ -24017,7 +23126,7 @@
echo "$ac_t""$PCRE_INCDIR" 1>&6
echo $ac_n "checking for PCRE library location""... $ac_c" 1>&6
-echo "configure:24018: checking for PCRE library location" >&5
+echo "configure:23130: checking for PCRE library location" >&5
for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/$PHP_LIBDIR; do
test -f $j/libpcre.a || test -f $j/libpcre.$SHLIB_SUFFIX_NAME && PCRE_LIBDIR=$j
done
@@ -24384,7 +23493,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -24439,7 +23548,7 @@
else
echo $ac_n "checking for PCRE library to use""... $ac_c" 1>&6
-echo "configure:24440: checking for PCRE library to use" >&5
+echo "configure:23552: checking for PCRE library to use" >&5
echo "$ac_t""bundled" 1>&6
pcrelib_sources="pcrelib/pcre_chartables.c pcrelib/pcre_ucd.c \
pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_exec.c \
@@ -24707,7 +23816,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -24776,7 +23885,7 @@
php_with_sqlite3=yes
echo $ac_n "checking whether to enable the SQLite3 extension""... $ac_c" 1>&6
-echo "configure:24777: checking whether to enable the SQLite3 extension" >&5
+echo "configure:23889: checking whether to enable the SQLite3 extension" >&5
# Check whether --with-sqlite3 or --without-sqlite3 was given.
if test "${with_sqlite3+set}" = set; then
withval="$with_sqlite3"
@@ -24831,7 +23940,7 @@
if test $PHP_SQLITE3 != "yes"; then
echo $ac_n "checking for sqlite3 files in default path""... $ac_c" 1>&6
-echo "configure:24832: checking for sqlite3 files in default path" >&5
+echo "configure:23944: checking for sqlite3 files in default path" >&5
for i in $PHP_SQLITE3 /usr/local /usr; do
if test -r $i/include/sqlite3.h; then
SQLITE3_DIR=$i
@@ -24846,7 +23955,7 @@
fi
echo $ac_n "checking for SQLite 3.3.9+""... $ac_c" 1>&6
-echo "configure:24847: checking for SQLite 3.3.9+" >&5
+echo "configure:23959: checking for SQLite 3.3.9+" >&5
save_old_LDFLAGS=$LDFLAGS
ac_stuff="
@@ -24945,7 +24054,7 @@
done
echo $ac_n "checking for sqlite3_prepare_v2 in -lsqlite3""... $ac_c" 1>&6
-echo "configure:24946: checking for sqlite3_prepare_v2 in -lsqlite3" >&5
+echo "configure:24058: checking for sqlite3_prepare_v2 in -lsqlite3" >&5
ac_lib_var=`echo sqlite3'_'sqlite3_prepare_v2 | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -24953,7 +24062,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsqlite3 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 24954 "configure"
+#line 24066 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -24964,7 +24073,7 @@
sqlite3_prepare_v2()
; return 0; }
EOF
-if { (eval echo configure:24965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:24077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -25224,7 +24333,7 @@
done
echo $ac_n "checking for sqlite3_key in -lsqlite3""... $ac_c" 1>&6
-echo "configure:25225: checking for sqlite3_key in -lsqlite3" >&5
+echo "configure:24337: checking for sqlite3_key in -lsqlite3" >&5
ac_lib_var=`echo sqlite3'_'sqlite3_key | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -25232,7 +24341,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsqlite3 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 25233 "configure"
+#line 24345 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -25243,7 +24352,7 @@
sqlite3_key()
; return 0; }
EOF
-if { (eval echo configure:25244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:24356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -25375,7 +24484,7 @@
done
echo $ac_n "checking for sqlite3_load_extension in -lsqlite3""... $ac_c" 1>&6
-echo "configure:25376: checking for sqlite3_load_extension in -lsqlite3" >&5
+echo "configure:24488: checking for sqlite3_load_extension in -lsqlite3" >&5
ac_lib_var=`echo sqlite3'_'sqlite3_load_extension | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -25383,7 +24492,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsqlite3 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 25384 "configure"
+#line 24496 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -25394,7 +24503,7 @@
sqlite3_load_extension()
; return 0; }
EOF
-if { (eval echo configure:25395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:24507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -25431,7 +24540,7 @@
else
echo $ac_n "checking bundled sqlite3 library""... $ac_c" 1>&6
-echo "configure:25432: checking bundled sqlite3 library" >&5
+echo "configure:24544: checking bundled sqlite3 library" >&5
echo "$ac_t""yes" 1>&6
sqlite3_extra_sources="libsqlite/sqlite3.c"
@@ -25739,7 +24848,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -25787,7 +24896,7 @@
php_with_zlib=no
echo $ac_n "checking for ZLIB support""... $ac_c" 1>&6
-echo "configure:25788: checking for ZLIB support" >&5
+echo "configure:24900: checking for ZLIB support" >&5
# Check whether --with-zlib or --without-zlib was given.
if test "${with_zlib+set}" = set; then
withval="$with_zlib"
@@ -25831,7 +24940,7 @@
php_with_zlib_dir=no
echo $ac_n "checking if the location of ZLIB install directory is defined""... $ac_c" 1>&6
-echo "configure:25832: checking if the location of ZLIB install directory is defined" >&5
+echo "configure:24944: checking if the location of ZLIB install directory is defined" >&5
# Check whether --with-zlib-dir or --without-zlib-dir was given.
if test "${with_zlib_dir+set}" = set; then
withval="$with_zlib_dir"
@@ -26110,7 +25219,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -26274,7 +25383,7 @@
done
echo $ac_n "checking for gzgets in -lz""... $ac_c" 1>&6
-echo "configure:26275: checking for gzgets in -lz" >&5
+echo "configure:25387: checking for gzgets in -lz" >&5
ac_lib_var=`echo z'_'gzgets | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -26282,7 +25391,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lz $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 26283 "configure"
+#line 25395 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -26293,7 +25402,7 @@
gzgets()
; return 0; }
EOF
-if { (eval echo configure:26294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:25406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -26433,7 +25542,7 @@
php_enable_bcmath=no
echo $ac_n "checking whether to enable bc style precision math functions""... $ac_c" 1>&6
-echo "configure:26434: checking whether to enable bc style precision math functions" >&5
+echo "configure:25546: checking whether to enable bc style precision math functions" >&5
# Check whether --enable-bcmath or --disable-bcmath was given.
if test "${enable_bcmath+set}" = set; then
enableval="$enable_bcmath"
@@ -26749,7 +25858,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -26798,7 +25907,7 @@
php_with_bz2=no
echo $ac_n "checking for BZip2 support""... $ac_c" 1>&6
-echo "configure:26799: checking for BZip2 support" >&5
+echo "configure:25911: checking for BZip2 support" >&5
# Check whether --with-bz2 or --without-bz2 was given.
if test "${with_bz2+set}" = set; then
withval="$with_bz2"
@@ -26843,7 +25952,7 @@
BZIP_DIR=$PHP_BZ2
else
echo $ac_n "checking for BZip2 in default path""... $ac_c" 1>&6
-echo "configure:26844: checking for BZip2 in default path" >&5
+echo "configure:25956: checking for BZip2 in default path" >&5
for i in /usr/local /usr; do
if test -r $i/include/bzlib.h; then
BZIP_DIR=$i
@@ -26956,7 +26065,7 @@
done
echo $ac_n "checking for BZ2_bzerror in -lbz2""... $ac_c" 1>&6
-echo "configure:26957: checking for BZ2_bzerror in -lbz2" >&5
+echo "configure:26069: checking for BZ2_bzerror in -lbz2" >&5
ac_lib_var=`echo bz2'_'BZ2_bzerror | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -26964,7 +26073,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lbz2 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 26965 "configure"
+#line 26077 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -26975,7 +26084,7 @@
BZ2_bzerror()
; return 0; }
EOF
-if { (eval echo configure:26976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:26088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -27400,7 +26509,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -27443,7 +26552,7 @@
php_enable_calendar=no
echo $ac_n "checking whether to enable calendar conversion support""... $ac_c" 1>&6
-echo "configure:27444: checking whether to enable calendar conversion support" >&5
+echo "configure:26556: checking whether to enable calendar conversion support" >&5
# Check whether --enable-calendar or --disable-calendar was given.
if test "${enable_calendar+set}" = set; then
enableval="$enable_calendar"
@@ -27747,7 +26856,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -27787,7 +26896,7 @@
php_enable_ctype=yes
echo $ac_n "checking whether to enable ctype functions""... $ac_c" 1>&6
-echo "configure:27788: checking whether to enable ctype functions" >&5
+echo "configure:26900: checking whether to enable ctype functions" >&5
# Check whether --enable-ctype or --disable-ctype was given.
if test "${enable_ctype+set}" = set; then
enableval="$enable_ctype"
@@ -28091,7 +27200,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -28131,7 +27240,7 @@
php_with_curl=no
echo $ac_n "checking for cURL support""... $ac_c" 1>&6
-echo "configure:28132: checking for cURL support" >&5
+echo "configure:27244: checking for cURL support" >&5
# Check whether --with-curl or --without-curl was given.
if test "${with_curl+set}" = set; then
withval="$with_curl"
@@ -28175,7 +27284,7 @@
php_with_curlwrappers=no
echo $ac_n "checking if we should use cURL for url streams""... $ac_c" 1>&6
-echo "configure:28176: checking if we should use cURL for url streams" >&5
+echo "configure:27288: checking if we should use cURL for url streams" >&5
# Check whether --with-curlwrappers or --without-curlwrappers was given.
if test "${with_curlwrappers+set}" = set; then
withval="$with_curlwrappers"
@@ -28199,7 +27308,7 @@
CURL_DIR=$PHP_CURL
else
echo $ac_n "checking for cURL in default path""... $ac_c" 1>&6
-echo "configure:28200: checking for cURL in default path" >&5
+echo "configure:27312: checking for cURL in default path" >&5
for i in /usr/local /usr; do
if test -r $i/include/curl/easy.h; then
CURL_DIR=$i
@@ -28217,7 +27326,7 @@
CURL_CONFIG="curl-config"
echo $ac_n "checking for cURL 7.10.5 or greater""... $ac_c" 1>&6
-echo "configure:28218: checking for cURL 7.10.5 or greater" >&5
+echo "configure:27330: checking for cURL 7.10.5 or greater" >&5
if ${CURL_DIR}/bin/curl-config --libs > /dev/null 2>&1; then
CURL_CONFIG=${CURL_DIR}/bin/curl-config
@@ -28455,7 +27564,7 @@
echo $ac_n "checking for SSL support in libcurl""... $ac_c" 1>&6
-echo "configure:28456: checking for SSL support in libcurl" >&5
+echo "configure:27568: checking for SSL support in libcurl" >&5
CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL`
if test "$CURL_SSL" = "SSL"; then
echo "$ac_t""yes" 1>&6
@@ -28468,7 +27577,7 @@
CFLAGS="`$CURL_CONFIG --cflags`"
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:28469: checking how to run the C preprocessor" >&5
+echo "configure:27581: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -28483,13 +27592,13 @@
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 28484 "configure"
+#line 27596 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:28490: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:27602: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -28500,13 +27609,13 @@
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 28501 "configure"
+#line 27613 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:28507: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:27619: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -28517,13 +27626,13 @@
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 28518 "configure"
+#line 27630 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:28524: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:27636: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -28548,14 +27657,14 @@
echo "$ac_t""$CPP" 1>&6
echo $ac_n "checking for openssl support in libcurl""... $ac_c" 1>&6
-echo "configure:28549: checking for openssl support in libcurl" >&5
+echo "configure:27661: checking for openssl support in libcurl" >&5
if test "$cross_compiling" = yes; then
echo "$ac_t""no" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 28556 "configure"
+#line 27668 "configure"
#include "confdefs.h"
#include <curl/curl.h>
@@ -28574,7 +27683,7 @@
}
EOF
-if { (eval echo configure:28575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:27687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
echo "$ac_t""yes" 1>&6
@@ -28582,17 +27691,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:28583: checking for $ac_hdr" >&5
+echo "configure:27695: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 28588 "configure"
+#line 27700 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:28593: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:27705: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -28637,14 +27746,14 @@
echo $ac_n "checking for gnutls support in libcurl""... $ac_c" 1>&6
-echo "configure:28638: checking for gnutls support in libcurl" >&5
+echo "configure:27750: checking for gnutls support in libcurl" >&5
if test "$cross_compiling" = yes; then
echo "$ac_t""no" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 28645 "configure"
+#line 27757 "configure"
#include "confdefs.h"
#include <curl/curl.h>
@@ -28663,23 +27772,23 @@
}
EOF
-if { (eval echo configure:28664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:27776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
echo "$ac_t""yes" 1>&6
ac_safe=`echo "gcrypt.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for gcrypt.h""... $ac_c" 1>&6
-echo "configure:28670: checking for gcrypt.h" >&5
+echo "configure:27782: checking for gcrypt.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 28675 "configure"
+#line 27787 "configure"
#include "confdefs.h"
#include <gcrypt.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:28680: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:27792: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -28821,7 +27930,7 @@
done
echo $ac_n "checking for curl_easy_perform in -lcurl""... $ac_c" 1>&6
-echo "configure:28822: checking for curl_easy_perform in -lcurl" >&5
+echo "configure:27934: checking for curl_easy_perform in -lcurl" >&5
ac_lib_var=`echo curl'_'curl_easy_perform | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -28829,7 +27938,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lcurl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 28830 "configure"
+#line 27942 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -28840,7 +27949,7 @@
curl_easy_perform()
; return 0; }
EOF
-if { (eval echo configure:28841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:27953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -28976,7 +28085,7 @@
done
echo $ac_n "checking for curl_version_info in -lcurl""... $ac_c" 1>&6
-echo "configure:28977: checking for curl_version_info in -lcurl" >&5
+echo "configure:28089: checking for curl_version_info in -lcurl" >&5
ac_lib_var=`echo curl'_'curl_version_info | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -28984,7 +28093,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lcurl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 28985 "configure"
+#line 28097 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -28995,7 +28104,7 @@
curl_version_info()
; return 0; }
EOF
-if { (eval echo configure:28996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:28108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -29129,7 +28238,7 @@
done
echo $ac_n "checking for curl_easy_strerror in -lcurl""... $ac_c" 1>&6
-echo "configure:29130: checking for curl_easy_strerror in -lcurl" >&5
+echo "configure:28242: checking for curl_easy_strerror in -lcurl" >&5
ac_lib_var=`echo curl'_'curl_easy_strerror | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -29137,7 +28246,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lcurl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 29138 "configure"
+#line 28250 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -29148,7 +28257,7 @@
curl_easy_strerror()
; return 0; }
EOF
-if { (eval echo configure:29149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:28261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -29282,7 +28391,7 @@
done
echo $ac_n "checking for curl_multi_strerror in -lcurl""... $ac_c" 1>&6
-echo "configure:29283: checking for curl_multi_strerror in -lcurl" >&5
+echo "configure:28395: checking for curl_multi_strerror in -lcurl" >&5
ac_lib_var=`echo curl'_'curl_multi_strerror | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -29290,7 +28399,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lcurl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 29291 "configure"
+#line 28403 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -29301,7 +28410,7 @@
curl_multi_strerror()
; return 0; }
EOF
-if { (eval echo configure:29302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:28414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -29603,7 +28712,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -29987,7 +29096,7 @@
done
echo $ac_n "checking for dpopen in -l$LIB""... $ac_c" 1>&6
-echo "configure:29988: checking for dpopen in -l$LIB" >&5
+echo "configure:29100: checking for dpopen in -l$LIB" >&5
ac_lib_var=`echo $LIB'_'dpopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -29995,7 +29104,7 @@
ac_save_LIBS="$LIBS"
LIBS="-l$LIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 29996 "configure"
+#line 29108 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -30006,7 +29115,7 @@
dpopen()
; return 0; }
EOF
-if { (eval echo configure:30007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:29119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -30175,7 +29284,7 @@
THIS_FULL_NAME="$THIS_NAME"
fi
echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:30176: checking for $THIS_FULL_NAME support" >&5
+echo "configure:29288: checking for $THIS_FULL_NAME support" >&5
if test -n ""; then
{ echo "configure: error: " 1>&2; exit 1; }
fi
@@ -30203,7 +29312,7 @@
THIS_FULL_NAME="$THIS_NAME"
fi
echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:30204: checking for $THIS_FULL_NAME support" >&5
+echo "configure:29316: checking for $THIS_FULL_NAME support" >&5
if test -n "You cannot combine --with-gdbm with --with-qdbm"; then
{ echo "configure: error: You cannot combine --with-gdbm with --with-qdbm" 1>&2; exit 1; }
fi
@@ -30322,7 +29431,7 @@
done
echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:30323: checking for gdbm_open in -lgdbm" >&5
+echo "configure:29435: checking for gdbm_open in -lgdbm" >&5
ac_lib_var=`echo gdbm'_'gdbm_open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -30330,7 +29439,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lgdbm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 30331 "configure"
+#line 29443 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -30341,7 +29450,7 @@
gdbm_open()
; return 0; }
EOF
-if { (eval echo configure:30342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:29454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -30506,7 +29615,7 @@
THIS_FULL_NAME="$THIS_NAME"
fi
echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:30507: checking for $THIS_FULL_NAME support" >&5
+echo "configure:29619: checking for $THIS_FULL_NAME support" >&5
if test -n ""; then
{ echo "configure: error: " 1>&2; exit 1; }
fi
@@ -30635,7 +29744,7 @@
done
echo $ac_n "checking for dbm_open in -l$LIB""... $ac_c" 1>&6
-echo "configure:30636: checking for dbm_open in -l$LIB" >&5
+echo "configure:29748: checking for dbm_open in -l$LIB" >&5
ac_lib_var=`echo $LIB'_'dbm_open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -30643,7 +29752,7 @@
ac_save_LIBS="$LIBS"
LIBS="-l$LIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 30644 "configure"
+#line 29756 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -30654,7 +29763,7 @@
dbm_open()
; return 0; }
EOF
-if { (eval echo configure:30655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:29767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -30823,7 +29932,7 @@
THIS_FULL_NAME="$THIS_NAME"
fi
echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:30824: checking for $THIS_FULL_NAME support" >&5
+echo "configure:29936: checking for $THIS_FULL_NAME support" >&5
if test -n ""; then
{ echo "configure: error: " 1>&2; exit 1; }
fi
@@ -30911,7 +30020,7 @@
LIBS="-l$LIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 30912 "configure"
+#line 30024 "configure"
#include "confdefs.h"
#include "$THIS_INCLUDE"
@@ -30922,11 +30031,11 @@
; return 0; }
EOF
-if { (eval echo configure:30923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:30035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 30927 "configure"
+#line 30039 "configure"
#include "confdefs.h"
#include "$THIS_INCLUDE"
@@ -30963,14 +30072,14 @@
done
if test -z "$THIS_LIBS"; then
echo $ac_n "checking for DB4 major version""... $ac_c" 1>&6
-echo "configure:30964: checking for DB4 major version" >&5
+echo "configure:30076: checking for DB4 major version" >&5
{ echo "configure: error: Header contains different version" 1>&2; exit 1; }
fi
if test "4" = "4"; then
echo $ac_n "checking for DB4 minor version and patch level""... $ac_c" 1>&6
-echo "configure:30969: checking for DB4 minor version and patch level" >&5
+echo "configure:30081: checking for DB4 minor version and patch level" >&5
cat > conftest.$ac_ext <<EOF
-#line 30971 "configure"
+#line 30083 "configure"
#include "confdefs.h"
#include "$THIS_INCLUDE"
@@ -30996,9 +30105,9 @@
fi
if test "$ext_shared" = "yes"; then
echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6
-echo "configure:30997: checking if dba can be used as shared extension" >&5
+echo "configure:30109: checking if dba can be used as shared extension" >&5
cat > conftest.$ac_ext <<EOF
-#line 30999 "configure"
+#line 30111 "configure"
#include "confdefs.h"
#include "$THIS_INCLUDE"
@@ -31155,7 +30264,7 @@
THIS_FULL_NAME="$THIS_NAME"
fi
echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:31156: checking for $THIS_FULL_NAME support" >&5
+echo "configure:30268: checking for $THIS_FULL_NAME support" >&5
if test -n ""; then
{ echo "configure: error: " 1>&2; exit 1; }
fi
@@ -31183,7 +30292,7 @@
THIS_FULL_NAME="$THIS_NAME"
fi
echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:31184: checking for $THIS_FULL_NAME support" >&5
+echo "configure:30296: checking for $THIS_FULL_NAME support" >&5
if test -n "You cannot combine --with-db3 with --with-db4"; then
{ echo "configure: error: You cannot combine --with-db3 with --with-db4" 1>&2; exit 1; }
fi
@@ -31234,7 +30343,7 @@
LIBS="-l$LIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 31235 "configure"
+#line 30347 "configure"
#include "confdefs.h"
#include "$THIS_INCLUDE"
@@ -31245,11 +30354,11 @@
; return 0; }
EOF
-if { (eval echo configure:31246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:30358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 31250 "configure"
+#line 30362 "configure"
#include "confdefs.h"
#include "$THIS_INCLUDE"
@@ -31286,14 +30395,14 @@
done
if test -z "$THIS_LIBS"; then
echo $ac_n "checking for DB3 major version""... $ac_c" 1>&6
-echo "configure:31287: checking for DB3 major version" >&5
+echo "configure:30399: checking for DB3 major version" >&5
{ echo "configure: error: Header contains different version" 1>&2; exit 1; }
fi
if test "3" = "4"; then
echo $ac_n "checking for DB4 minor version and patch level""... $ac_c" 1>&6
-echo "configure:31292: checking for DB4 minor version and patch level" >&5
+echo "configure:30404: checking for DB4 minor version and patch level" >&5
cat > conftest.$ac_ext <<EOF
-#line 31294 "configure"
+#line 30406 "configure"
#include "confdefs.h"
#include "$THIS_INCLUDE"
@@ -31319,9 +30428,9 @@
fi
if test "$ext_shared" = "yes"; then
echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6
-echo "configure:31320: checking if dba can be used as shared extension" >&5
+echo "configure:30432: checking if dba can be used as shared extension" >&5
cat > conftest.$ac_ext <<EOF
-#line 31322 "configure"
+#line 30434 "configure"
#include "confdefs.h"
#include "$THIS_INCLUDE"
@@ -31478,7 +30587,7 @@
THIS_FULL_NAME="$THIS_NAME"
fi
echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:31479: checking for $THIS_FULL_NAME support" >&5
+echo "configure:30591: checking for $THIS_FULL_NAME support" >&5
if test -n ""; then
{ echo "configure: error: " 1>&2; exit 1; }
fi
@@ -31506,7 +30615,7 @@
THIS_FULL_NAME="$THIS_NAME"
fi
echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:31507: checking for $THIS_FULL_NAME support" >&5
+echo "configure:30619: checking for $THIS_FULL_NAME support" >&5
if test -n "You cannot combine --with-db2 with --with-db3 or --with-db4"; then
{ echo "configure: error: You cannot combine --with-db2 with --with-db3 or --with-db4" 1>&2; exit 1; }
fi
@@ -31557,7 +30666,7 @@
LIBS="-l$LIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 31558 "configure"
+#line 30670 "configure"
#include "confdefs.h"
#include "$THIS_INCLUDE"
@@ -31568,11 +30677,11 @@
; return 0; }
EOF
-if { (eval echo configure:31569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:30681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 31573 "configure"
+#line 30685 "configure"
#include "confdefs.h"
#include "$THIS_INCLUDE"
@@ -31609,14 +30718,14 @@
done
if test -z "$THIS_LIBS"; then
echo $ac_n "checking for DB2 major version""... $ac_c" 1>&6
-echo "configure:31610: checking for DB2 major version" >&5
+echo "configure:30722: checking for DB2 major version" >&5
{ echo "configure: error: Header contains different version" 1>&2; exit 1; }
fi
if test "2" = "4"; then
echo $ac_n "checking for DB4 minor version and patch level""... $ac_c" 1>&6
-echo "configure:31615: checking for DB4 minor version and patch level" >&5
+echo "configure:30727: checking for DB4 minor version and patch level" >&5
cat > conftest.$ac_ext <<EOF
-#line 31617 "configure"
+#line 30729 "configure"
#include "confdefs.h"
#include "$THIS_INCLUDE"
@@ -31642,9 +30751,9 @@
fi
if test "$ext_shared" = "yes"; then
echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6
-echo "configure:31643: checking if dba can be used as shared extension" >&5
+echo "configure:30755: checking if dba can be used as shared extension" >&5
cat > conftest.$ac_ext <<EOF
-#line 31645 "configure"
+#line 30757 "configure"
#include "confdefs.h"
#include "$THIS_INCLUDE"
@@ -31801,7 +30910,7 @@
THIS_FULL_NAME="$THIS_NAME"
fi
echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:31802: checking for $THIS_FULL_NAME support" >&5
+echo "configure:30914: checking for $THIS_FULL_NAME support" >&5
if test -n ""; then
{ echo "configure: error: " 1>&2; exit 1; }
fi
@@ -31821,7 +30930,7 @@
unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT
echo $ac_n "checking for DB1 in library""... $ac_c" 1>&6
-echo "configure:31822: checking for DB1 in library" >&5
+echo "configure:30934: checking for DB1 in library" >&5
if test "$HAVE_DB4" = "1"; then
THIS_VERSION=4
THIS_LIBS=$DB4_LIBS
@@ -31869,7 +30978,7 @@
fi
echo "$ac_t""$THIS_LIBS" 1>&6
echo $ac_n "checking for DB1 in header""... $ac_c" 1>&6
-echo "configure:31870: checking for DB1 in header" >&5
+echo "configure:30982: checking for DB1 in header" >&5
echo "$ac_t""$THIS_INCLUDE" 1>&6
if test -n "$THIS_INCLUDE"; then
@@ -31879,7 +30988,7 @@
LIBS="-l$THIS_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 31880 "configure"
+#line 30992 "configure"
#include "confdefs.h"
#include "$THIS_INCLUDE"
@@ -31890,7 +30999,7 @@
; return 0; }
EOF
-if { (eval echo configure:31891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:31003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cat >> confdefs.h <<EOF
@@ -32040,7 +31149,7 @@
THIS_FULL_NAME="$THIS_NAME"
fi
echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:32041: checking for $THIS_FULL_NAME support" >&5
+echo "configure:31153: checking for $THIS_FULL_NAME support" >&5
if test -n ""; then
{ echo "configure: error: " 1>&2; exit 1; }
fi
@@ -32068,7 +31177,7 @@
THIS_FULL_NAME="$THIS_NAME"
fi
echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:32069: checking for $THIS_FULL_NAME support" >&5
+echo "configure:31181: checking for $THIS_FULL_NAME support" >&5
if test -n "You cannot combine --with-dbm with --with-qdbm"; then
{ echo "configure: error: You cannot combine --with-dbm with --with-qdbm" 1>&2; exit 1; }
fi
@@ -32192,7 +31301,7 @@
done
echo $ac_n "checking for dbminit in -l$LIB""... $ac_c" 1>&6
-echo "configure:32193: checking for dbminit in -l$LIB" >&5
+echo "configure:31305: checking for dbminit in -l$LIB" >&5
ac_lib_var=`echo $LIB'_'dbminit | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -32200,7 +31309,7 @@
ac_save_LIBS="$LIBS"
LIBS="-l$LIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 32201 "configure"
+#line 31313 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -32211,7 +31320,7 @@
dbminit()
; return 0; }
EOF
-if { (eval echo configure:32212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:31324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -32231,7 +31340,7 @@
ext_shared=$save_ext_shared
echo $ac_n "checking for DBM using GDBM""... $ac_c" 1>&6
-echo "configure:32232: checking for DBM using GDBM" >&5
+echo "configure:31344: checking for DBM using GDBM" >&5
cat >> confdefs.h <<EOF
#define DBM_INCLUDE_FILE "$THIS_INCLUDE"
EOF
@@ -32395,7 +31504,7 @@
THIS_FULL_NAME="$THIS_NAME"
fi
echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:32396: checking for $THIS_FULL_NAME support" >&5
+echo "configure:31508: checking for $THIS_FULL_NAME support" >&5
if test -n ""; then
{ echo "configure: error: " 1>&2; exit 1; }
fi
@@ -32607,7 +31716,7 @@
done
echo $ac_n "checking for cdb_read in -l$LIB""... $ac_c" 1>&6
-echo "configure:32608: checking for cdb_read in -l$LIB" >&5
+echo "configure:31720: checking for cdb_read in -l$LIB" >&5
ac_lib_var=`echo $LIB'_'cdb_read | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -32615,7 +31724,7 @@
ac_save_LIBS="$LIBS"
LIBS="-l$LIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 32616 "configure"
+#line 31728 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -32626,7 +31735,7 @@
cdb_read()
; return 0; }
EOF
-if { (eval echo configure:32627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:31739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -32795,7 +31904,7 @@
THIS_FULL_NAME="$THIS_NAME"
fi
echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:32796: checking for $THIS_FULL_NAME support" >&5
+echo "configure:31908: checking for $THIS_FULL_NAME support" >&5
if test -n ""; then
{ echo "configure: error: " 1>&2; exit 1; }
fi
@@ -32826,7 +31935,7 @@
THIS_FULL_NAME="$THIS_NAME"
fi
echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:32827: checking for $THIS_FULL_NAME support" >&5
+echo "configure:31939: checking for $THIS_FULL_NAME support" >&5
if test -n ""; then
{ echo "configure: error: " 1>&2; exit 1; }
fi
@@ -32857,7 +31966,7 @@
THIS_FULL_NAME="$THIS_NAME"
fi
echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
-echo "configure:32858: checking for $THIS_FULL_NAME support" >&5
+echo "configure:31970: checking for $THIS_FULL_NAME support" >&5
if test -n ""; then
{ echo "configure: error: " 1>&2; exit 1; }
fi
@@ -32872,7 +31981,7 @@
echo $ac_n "checking whether to enable DBA interface""... $ac_c" 1>&6
-echo "configure:32873: checking whether to enable DBA interface" >&5
+echo "configure:31985: checking whether to enable DBA interface" >&5
if test "$HAVE_DBA" = "1"; then
if test "$ext_shared" = "yes"; then
echo "$ac_t""yes, shared" 1>&6
@@ -33142,7 +32251,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -33202,7 +32311,7 @@
php_enable_dom=yes
echo $ac_n "checking whether to enable DOM support""... $ac_c" 1>&6
-echo "configure:33203: checking whether to enable DOM support" >&5
+echo "configure:32315: checking whether to enable DOM support" >&5
# Check whether --enable-dom or --disable-dom was given.
if test "${enable_dom+set}" = set; then
enableval="$enable_dom"
@@ -33247,7 +32356,7 @@
php_with_libxml_dir=no
echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
-echo "configure:33248: checking libxml2 install dir" >&5
+echo "configure:32360: checking libxml2 install dir" >&5
# Check whether --with-libxml-dir or --without-libxml-dir was given.
if test "${with_libxml_dir+set}" = set; then
withval="$with_libxml_dir"
@@ -33275,7 +32384,7 @@
echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
-echo "configure:33276: checking for xml2-config path" >&5
+echo "configure:32388: checking for xml2-config path" >&5
if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -33433,7 +32542,7 @@
echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
-echo "configure:33434: checking whether libxml build works" >&5
+echo "configure:32546: checking whether libxml build works" >&5
if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -33449,7 +32558,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 33450 "configure"
+#line 32562 "configure"
#include "confdefs.h"
@@ -33460,7 +32569,7 @@
}
EOF
-if { (eval echo configure:33461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:32573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
LIBS=$old_LIBS
@@ -33794,7 +32903,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -33883,7 +32992,7 @@
php_with_enchant=no
echo $ac_n "checking for ENCHANT support""... $ac_c" 1>&6
-echo "configure:33884: checking for ENCHANT support" >&5
+echo "configure:32996: checking for ENCHANT support" >&5
# Check whether --with-enchant or --without-enchant was given.
if test "${with_enchant+set}" = set; then
withval="$with_enchant"
@@ -34183,7 +33292,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -34468,7 +33577,7 @@
done
echo $ac_n "checking for enchant_broker_set_param in -lenchant""... $ac_c" 1>&6
-echo "configure:34469: checking for enchant_broker_set_param in -lenchant" >&5
+echo "configure:33581: checking for enchant_broker_set_param in -lenchant" >&5
ac_lib_var=`echo enchant'_'enchant_broker_set_param | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -34476,7 +33585,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lenchant $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 34477 "configure"
+#line 33589 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -34487,7 +33596,7 @@
enchant_broker_set_param()
; return 0; }
EOF
-if { (eval echo configure:34488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:33600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -34534,7 +33643,7 @@
php_enable_exif=no
echo $ac_n "checking whether to enable EXIF (metadata from images) support""... $ac_c" 1>&6
-echo "configure:34535: checking whether to enable EXIF (metadata from images) support" >&5
+echo "configure:33647: checking whether to enable EXIF (metadata from images) support" >&5
# Check whether --enable-exif or --disable-exif was given.
if test "${enable_exif+set}" = set; then
enableval="$enable_exif"
@@ -34838,7 +33947,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -34878,7 +33987,7 @@
php_enable_fileinfo=yes
echo $ac_n "checking for fileinfo support""... $ac_c" 1>&6
-echo "configure:34879: checking for fileinfo support" >&5
+echo "configure:33991: checking for fileinfo support" >&5
# Check whether --enable-fileinfo or --disable-fileinfo was given.
if test "${enable_fileinfo+set}" = set; then
enableval="$enable_fileinfo"
@@ -35186,7 +34295,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -35228,12 +34337,12 @@
for ac_func in utimes strndup
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:35229: checking for $ac_func" >&5
+echo "configure:34341: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 35234 "configure"
+#line 34346 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -35256,7 +34365,7 @@
; return 0; }
EOF
-if { (eval echo configure:35257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:34369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -35294,7 +34403,7 @@
php_enable_filter=yes
echo $ac_n "checking whether to enable input filter support""... $ac_c" 1>&6
-echo "configure:35295: checking whether to enable input filter support" >&5
+echo "configure:34407: checking whether to enable input filter support" >&5
# Check whether --enable-filter or --disable-filter was given.
if test "${enable_filter+set}" = set; then
enableval="$enable_filter"
@@ -35338,7 +34447,7 @@
php_with_pcre_dir=no
echo $ac_n "checking pcre install prefix""... $ac_c" 1>&6
-echo "configure:35339: checking pcre install prefix" >&5
+echo "configure:34451: checking pcre install prefix" >&5
# Check whether --with-pcre-dir or --without-pcre-dir was given.
if test "${with_pcre_dir+set}" = set; then
withval="$with_pcre_dir"
@@ -35365,7 +34474,7 @@
old_CPPFLAGS=$CPPFLAGS
CPPFLAGS=$INCLUDES
cat > conftest.$ac_ext <<EOF
-#line 35366 "configure"
+#line 34478 "configure"
#include "confdefs.h"
#include <main/php_config.h>
@@ -35384,7 +34493,7 @@
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 35385 "configure"
+#line 34497 "configure"
#include "confdefs.h"
#include <main/php_config.h>
@@ -35673,7 +34782,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -35754,7 +34863,7 @@
php_enable_ftp=no
echo $ac_n "checking whether to enable FTP support""... $ac_c" 1>&6
-echo "configure:35755: checking whether to enable FTP support" >&5
+echo "configure:34867: checking whether to enable FTP support" >&5
# Check whether --enable-ftp or --disable-ftp was given.
if test "${enable_ftp+set}" = set; then
enableval="$enable_ftp"
@@ -35798,7 +34907,7 @@
php_with_openssl_dir=no
echo $ac_n "checking OpenSSL dir for FTP""... $ac_c" 1>&6
-echo "configure:35799: checking OpenSSL dir for FTP" >&5
+echo "configure:34911: checking OpenSSL dir for FTP" >&5
# Check whether --with-openssl-dir or --without-openssl-dir was given.
if test "${with_openssl_dir+set}" = set; then
withval="$with_openssl_dir"
@@ -36081,7 +35190,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -36136,7 +35245,7 @@
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:36137: checking for $ac_word" >&5
+echo "configure:35249: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -36341,9 +35450,9 @@
old_CPPFLAGS=$CPPFLAGS
CPPFLAGS=-I$OPENSSL_INCDIR
echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
-echo "configure:36342: checking for OpenSSL version" >&5
+echo "configure:35454: checking for OpenSSL version" >&5
cat > conftest.$ac_ext <<EOF
-#line 36344 "configure"
+#line 35456 "configure"
#include "confdefs.h"
#include <openssl/opensslv.h>
@@ -36498,7 +35607,7 @@
done
echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
-echo "configure:36499: checking for CRYPTO_free in -lcrypto" >&5
+echo "configure:35611: checking for CRYPTO_free in -lcrypto" >&5
ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -36506,7 +35615,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lcrypto $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 36507 "configure"
+#line 35619 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -36517,7 +35626,7 @@
CRYPTO_free()
; return 0; }
EOF
-if { (eval echo configure:36518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:35630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -36674,7 +35783,7 @@
done
echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
-echo "configure:36675: checking for SSL_CTX_set_ssl_version in -lssl" >&5
+echo "configure:35787: checking for SSL_CTX_set_ssl_version in -lssl" >&5
ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -36682,7 +35791,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lssl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 36683 "configure"
+#line 35795 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -36693,7 +35802,7 @@
SSL_CTX_set_ssl_version()
; return 0; }
EOF
-if { (eval echo configure:36694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:35806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -36835,7 +35944,7 @@
php_with_gd=no
echo $ac_n "checking for GD support""... $ac_c" 1>&6
-echo "configure:36836: checking for GD support" >&5
+echo "configure:35948: checking for GD support" >&5
# Check whether --with-gd or --without-gd was given.
if test "${with_gd+set}" = set; then
withval="$with_gd"
@@ -36880,7 +35989,7 @@
php_with_jpeg_dir=no
echo $ac_n "checking for the location of libjpeg""... $ac_c" 1>&6
-echo "configure:36881: checking for the location of libjpeg" >&5
+echo "configure:35993: checking for the location of libjpeg" >&5
# Check whether --with-jpeg-dir or --without-jpeg-dir was given.
if test "${with_jpeg_dir+set}" = set; then
withval="$with_jpeg_dir"
@@ -36905,7 +36014,7 @@
php_with_png_dir=no
echo $ac_n "checking for the location of libpng""... $ac_c" 1>&6
-echo "configure:36906: checking for the location of libpng" >&5
+echo "configure:36018: checking for the location of libpng" >&5
# Check whether --with-png-dir or --without-png-dir was given.
if test "${with_png_dir+set}" = set; then
withval="$with_png_dir"
@@ -36930,7 +36039,7 @@
php_with_zlib_dir=no
echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
-echo "configure:36931: checking for the location of libz" >&5
+echo "configure:36043: checking for the location of libz" >&5
# Check whether --with-zlib-dir or --without-zlib-dir was given.
if test "${with_zlib_dir+set}" = set; then
withval="$with_zlib_dir"
@@ -36954,7 +36063,7 @@
php_with_xpm_dir=no
echo $ac_n "checking for the location of libXpm""... $ac_c" 1>&6
-echo "configure:36955: checking for the location of libXpm" >&5
+echo "configure:36067: checking for the location of libXpm" >&5
# Check whether --with-xpm-dir or --without-xpm-dir was given.
if test "${with_xpm_dir+set}" = set; then
withval="$with_xpm_dir"
@@ -36977,7 +36086,7 @@
php_with_freetype_dir=no
echo $ac_n "checking for FreeType 2""... $ac_c" 1>&6
-echo "configure:36978: checking for FreeType 2" >&5
+echo "configure:36090: checking for FreeType 2" >&5
# Check whether --with-freetype-dir or --without-freetype-dir was given.
if test "${with_freetype_dir+set}" = set; then
withval="$with_freetype_dir"
@@ -37000,7 +36109,7 @@
php_with_t1lib=no
echo $ac_n "checking for T1lib support""... $ac_c" 1>&6
-echo "configure:37001: checking for T1lib support" >&5
+echo "configure:36113: checking for T1lib support" >&5
# Check whether --with-t1lib or --without-t1lib was given.
if test "${with_t1lib+set}" = set; then
withval="$with_t1lib"
@@ -37023,7 +36132,7 @@
php_enable_gd_native_ttf=no
echo $ac_n "checking whether to enable truetype string function in GD""... $ac_c" 1>&6
-echo "configure:37024: checking whether to enable truetype string function in GD" >&5
+echo "configure:36136: checking whether to enable truetype string function in GD" >&5
# Check whether --enable-gd-native-ttf or --disable-gd-native-ttf was given.
if test "${enable_gd_native_ttf+set}" = set; then
enableval="$enable_gd_native_ttf"
@@ -37046,7 +36155,7 @@
php_enable_gd_jis_conv=no
echo $ac_n "checking whether to enable JIS-mapped Japanese font support in GD""... $ac_c" 1>&6
-echo "configure:37047: checking whether to enable JIS-mapped Japanese font support in GD" >&5
+echo "configure:36159: checking whether to enable JIS-mapped Japanese font support in GD" >&5
# Check whether --enable-gd-jis-conv or --disable-gd-jis-conv was given.
if test "${enable_gd_jis_conv+set}" = set; then
enableval="$enable_gd_jis_conv"
@@ -37098,12 +36207,12 @@
for ac_func in fabsf floorf
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:37099: checking for $ac_func" >&5
+echo "configure:36211: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 37104 "configure"
+#line 36216 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -37126,7 +36235,7 @@
; return 0; }
EOF
-if { (eval echo configure:37127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:36239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -37298,7 +36407,7 @@
done
echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
-echo "configure:37299: checking for jpeg_read_header in -ljpeg" >&5
+echo "configure:36411: checking for jpeg_read_header in -ljpeg" >&5
ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -37306,7 +36415,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ljpeg $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 37307 "configure"
+#line 36419 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -37317,7 +36426,7 @@
jpeg_read_header()
; return 0; }
EOF
-if { (eval echo configure:37318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:36430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -37595,7 +36704,7 @@
done
echo $ac_n "checking for png_write_image in -lpng""... $ac_c" 1>&6
-echo "configure:37596: checking for png_write_image in -lpng" >&5
+echo "configure:36708: checking for png_write_image in -lpng" >&5
ac_lib_var=`echo png'_'png_write_image | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -37603,7 +36712,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpng $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 37604 "configure"
+#line 36716 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -37614,7 +36723,7 @@
png_write_image()
; return 0; }
EOF
-if { (eval echo configure:37615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:36727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -37994,7 +37103,7 @@
done
echo $ac_n "checking for XpmFreeXpmImage in -lXpm""... $ac_c" 1>&6
-echo "configure:37995: checking for XpmFreeXpmImage in -lXpm" >&5
+echo "configure:37107: checking for XpmFreeXpmImage in -lXpm" >&5
ac_lib_var=`echo Xpm'_'XpmFreeXpmImage | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -38002,7 +37111,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lXpm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 38003 "configure"
+#line 37115 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -38013,7 +37122,7 @@
XpmFreeXpmImage()
; return 0; }
EOF
-if { (eval echo configure:38014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:37126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -38388,7 +37497,7 @@
done
echo $ac_n "checking for FT_New_Face in -lfreetype""... $ac_c" 1>&6
-echo "configure:38389: checking for FT_New_Face in -lfreetype" >&5
+echo "configure:37501: checking for FT_New_Face in -lfreetype" >&5
ac_lib_var=`echo freetype'_'FT_New_Face | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -38396,7 +37505,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lfreetype $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 38397 "configure"
+#line 37509 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -38407,7 +37516,7 @@
FT_New_Face()
; return 0; }
EOF
-if { (eval echo configure:38408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:37520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -38724,7 +37833,7 @@
done
echo $ac_n "checking for T1_StrError in -lt1""... $ac_c" 1>&6
-echo "configure:38725: checking for T1_StrError in -lt1" >&5
+echo "configure:37837: checking for T1_StrError in -lt1" >&5
ac_lib_var=`echo t1'_'T1_StrError | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -38732,7 +37841,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lt1 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 38733 "configure"
+#line 37845 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -38743,7 +37852,7 @@
T1_StrError()
; return 0; }
EOF
-if { (eval echo configure:38744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:37856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -39186,7 +38295,7 @@
done
echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
-echo "configure:39187: checking for jpeg_read_header in -ljpeg" >&5
+echo "configure:38299: checking for jpeg_read_header in -ljpeg" >&5
ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -39194,7 +38303,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ljpeg $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 39195 "configure"
+#line 38307 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -39205,7 +38314,7 @@
jpeg_read_header()
; return 0; }
EOF
-if { (eval echo configure:39206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:38318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -39483,7 +38592,7 @@
done
echo $ac_n "checking for png_write_image in -lpng""... $ac_c" 1>&6
-echo "configure:39484: checking for png_write_image in -lpng" >&5
+echo "configure:38596: checking for png_write_image in -lpng" >&5
ac_lib_var=`echo png'_'png_write_image | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -39491,7 +38600,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpng $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 39492 "configure"
+#line 38604 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -39502,7 +38611,7 @@
png_write_image()
; return 0; }
EOF
-if { (eval echo configure:39503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:38615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -39882,7 +38991,7 @@
done
echo $ac_n "checking for XpmFreeXpmImage in -lXpm""... $ac_c" 1>&6
-echo "configure:39883: checking for XpmFreeXpmImage in -lXpm" >&5
+echo "configure:38995: checking for XpmFreeXpmImage in -lXpm" >&5
ac_lib_var=`echo Xpm'_'XpmFreeXpmImage | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -39890,7 +38999,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lXpm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 39891 "configure"
+#line 39003 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -39901,7 +39010,7 @@
XpmFreeXpmImage()
; return 0; }
EOF
-if { (eval echo configure:39902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:39014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -40276,7 +39385,7 @@
done
echo $ac_n "checking for FT_New_Face in -lfreetype""... $ac_c" 1>&6
-echo "configure:40277: checking for FT_New_Face in -lfreetype" >&5
+echo "configure:39389: checking for FT_New_Face in -lfreetype" >&5
ac_lib_var=`echo freetype'_'FT_New_Face | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -40284,7 +39393,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lfreetype $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 40285 "configure"
+#line 39397 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -40295,7 +39404,7 @@
FT_New_Face()
; return 0; }
EOF
-if { (eval echo configure:40296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:39408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -40612,7 +39721,7 @@
done
echo $ac_n "checking for T1_StrError in -lt1""... $ac_c" 1>&6
-echo "configure:40613: checking for T1_StrError in -lt1" >&5
+echo "configure:39725: checking for T1_StrError in -lt1" >&5
ac_lib_var=`echo t1'_'T1_StrError | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -40620,7 +39729,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lt1 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 40621 "configure"
+#line 39733 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -40631,7 +39740,7 @@
T1_StrError()
; return 0; }
EOF
-if { (eval echo configure:40632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:39744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -41006,7 +40115,7 @@
done
echo $ac_n "checking for gdImageString16 in -lgd""... $ac_c" 1>&6
-echo "configure:41007: checking for gdImageString16 in -lgd" >&5
+echo "configure:40119: checking for gdImageString16 in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageString16 | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -41014,7 +40123,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 41015 "configure"
+#line 40127 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -41025,7 +40134,7 @@
gdImageString16()
; return 0; }
EOF
-if { (eval echo configure:41026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:40138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -41154,7 +40263,7 @@
done
echo $ac_n "checking for gdImagePaletteCopy in -lgd""... $ac_c" 1>&6
-echo "configure:41155: checking for gdImagePaletteCopy in -lgd" >&5
+echo "configure:40267: checking for gdImagePaletteCopy in -lgd" >&5
ac_lib_var=`echo gd'_'gdImagePaletteCopy | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -41162,7 +40271,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 41163 "configure"
+#line 40275 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -41173,7 +40282,7 @@
gdImagePaletteCopy()
; return 0; }
EOF
-if { (eval echo configure:41174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:40286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -41302,7 +40411,7 @@
done
echo $ac_n "checking for gdImageCreateFromPng in -lgd""... $ac_c" 1>&6
-echo "configure:41303: checking for gdImageCreateFromPng in -lgd" >&5
+echo "configure:40415: checking for gdImageCreateFromPng in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageCreateFromPng | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -41310,7 +40419,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 41311 "configure"
+#line 40423 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -41321,7 +40430,7 @@
gdImageCreateFromPng()
; return 0; }
EOF
-if { (eval echo configure:41322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:40434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -41450,7 +40559,7 @@
done
echo $ac_n "checking for gdImageCreateFromGif in -lgd""... $ac_c" 1>&6
-echo "configure:41451: checking for gdImageCreateFromGif in -lgd" >&5
+echo "configure:40563: checking for gdImageCreateFromGif in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageCreateFromGif | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -41458,7 +40567,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 41459 "configure"
+#line 40571 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -41469,7 +40578,7 @@
gdImageCreateFromGif()
; return 0; }
EOF
-if { (eval echo configure:41470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:40582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -41598,7 +40707,7 @@
done
echo $ac_n "checking for gdImageGif in -lgd""... $ac_c" 1>&6
-echo "configure:41599: checking for gdImageGif in -lgd" >&5
+echo "configure:40711: checking for gdImageGif in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageGif | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -41606,7 +40715,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 41607 "configure"
+#line 40719 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -41617,7 +40726,7 @@
gdImageGif()
; return 0; }
EOF
-if { (eval echo configure:41618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:40730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -41746,7 +40855,7 @@
done
echo $ac_n "checking for gdImageWBMP in -lgd""... $ac_c" 1>&6
-echo "configure:41747: checking for gdImageWBMP in -lgd" >&5
+echo "configure:40859: checking for gdImageWBMP in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageWBMP | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -41754,7 +40863,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 41755 "configure"
+#line 40867 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -41765,7 +40874,7 @@
gdImageWBMP()
; return 0; }
EOF
-if { (eval echo configure:41766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:40878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -41894,7 +41003,7 @@
done
echo $ac_n "checking for gdImageCreateFromJpeg in -lgd""... $ac_c" 1>&6
-echo "configure:41895: checking for gdImageCreateFromJpeg in -lgd" >&5
+echo "configure:41007: checking for gdImageCreateFromJpeg in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageCreateFromJpeg | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -41902,7 +41011,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 41903 "configure"
+#line 41015 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -41913,7 +41022,7 @@
gdImageCreateFromJpeg()
; return 0; }
EOF
-if { (eval echo configure:41914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:41026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -42042,7 +41151,7 @@
done
echo $ac_n "checking for gdImageCreateFromXpm in -lgd""... $ac_c" 1>&6
-echo "configure:42043: checking for gdImageCreateFromXpm in -lgd" >&5
+echo "configure:41155: checking for gdImageCreateFromXpm in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageCreateFromXpm | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -42050,7 +41159,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 42051 "configure"
+#line 41163 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -42061,7 +41170,7 @@
gdImageCreateFromXpm()
; return 0; }
EOF
-if { (eval echo configure:42062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:41174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -42190,7 +41299,7 @@
done
echo $ac_n "checking for gdImageCreateFromGd2 in -lgd""... $ac_c" 1>&6
-echo "configure:42191: checking for gdImageCreateFromGd2 in -lgd" >&5
+echo "configure:41303: checking for gdImageCreateFromGd2 in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageCreateFromGd2 | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -42198,7 +41307,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 42199 "configure"
+#line 41311 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -42209,7 +41318,7 @@
gdImageCreateFromGd2()
; return 0; }
EOF
-if { (eval echo configure:42210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:41322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -42338,7 +41447,7 @@
done
echo $ac_n "checking for gdImageCreateTrueColor in -lgd""... $ac_c" 1>&6
-echo "configure:42339: checking for gdImageCreateTrueColor in -lgd" >&5
+echo "configure:41451: checking for gdImageCreateTrueColor in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageCreateTrueColor | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -42346,7 +41455,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 42347 "configure"
+#line 41459 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -42357,7 +41466,7 @@
gdImageCreateTrueColor()
; return 0; }
EOF
-if { (eval echo configure:42358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:41470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -42486,7 +41595,7 @@
done
echo $ac_n "checking for gdImageSetTile in -lgd""... $ac_c" 1>&6
-echo "configure:42487: checking for gdImageSetTile in -lgd" >&5
+echo "configure:41599: checking for gdImageSetTile in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageSetTile | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -42494,7 +41603,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 42495 "configure"
+#line 41607 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -42505,7 +41614,7 @@
gdImageSetTile()
; return 0; }
EOF
-if { (eval echo configure:42506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:41618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -42634,7 +41743,7 @@
done
echo $ac_n "checking for gdImageEllipse in -lgd""... $ac_c" 1>&6
-echo "configure:42635: checking for gdImageEllipse in -lgd" >&5
+echo "configure:41747: checking for gdImageEllipse in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageEllipse | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -42642,7 +41751,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 42643 "configure"
+#line 41755 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -42653,7 +41762,7 @@
gdImageEllipse()
; return 0; }
EOF
-if { (eval echo configure:42654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:41766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -42782,7 +41891,7 @@
done
echo $ac_n "checking for gdImageSetBrush in -lgd""... $ac_c" 1>&6
-echo "configure:42783: checking for gdImageSetBrush in -lgd" >&5
+echo "configure:41895: checking for gdImageSetBrush in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageSetBrush | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -42790,7 +41899,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 42791 "configure"
+#line 41903 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -42801,7 +41910,7 @@
gdImageSetBrush()
; return 0; }
EOF
-if { (eval echo configure:42802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:41914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -42930,7 +42039,7 @@
done
echo $ac_n "checking for gdImageStringTTF in -lgd""... $ac_c" 1>&6
-echo "configure:42931: checking for gdImageStringTTF in -lgd" >&5
+echo "configure:42043: checking for gdImageStringTTF in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageStringTTF | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -42938,7 +42047,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 42939 "configure"
+#line 42051 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -42949,7 +42058,7 @@
gdImageStringTTF()
; return 0; }
EOF
-if { (eval echo configure:42950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:42062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -43078,7 +42187,7 @@
done
echo $ac_n "checking for gdImageStringFT in -lgd""... $ac_c" 1>&6
-echo "configure:43079: checking for gdImageStringFT in -lgd" >&5
+echo "configure:42191: checking for gdImageStringFT in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageStringFT | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -43086,7 +42195,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 43087 "configure"
+#line 42199 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -43097,7 +42206,7 @@
gdImageStringFT()
; return 0; }
EOF
-if { (eval echo configure:43098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:42210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -43226,7 +42335,7 @@
done
echo $ac_n "checking for gdImageStringFTEx in -lgd""... $ac_c" 1>&6
-echo "configure:43227: checking for gdImageStringFTEx in -lgd" >&5
+echo "configure:42339: checking for gdImageStringFTEx in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageStringFTEx | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -43234,7 +42343,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 43235 "configure"
+#line 42347 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -43245,7 +42354,7 @@
gdImageStringFTEx()
; return 0; }
EOF
-if { (eval echo configure:43246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:42358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -43374,7 +42483,7 @@
done
echo $ac_n "checking for gdImageColorClosestHWB in -lgd""... $ac_c" 1>&6
-echo "configure:43375: checking for gdImageColorClosestHWB in -lgd" >&5
+echo "configure:42487: checking for gdImageColorClosestHWB in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageColorClosestHWB | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -43382,7 +42491,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 43383 "configure"
+#line 42495 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -43393,7 +42502,7 @@
gdImageColorClosestHWB()
; return 0; }
EOF
-if { (eval echo configure:43394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:42506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -43522,7 +42631,7 @@
done
echo $ac_n "checking for gdImageColorResolve in -lgd""... $ac_c" 1>&6
-echo "configure:43523: checking for gdImageColorResolve in -lgd" >&5
+echo "configure:42635: checking for gdImageColorResolve in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageColorResolve | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -43530,7 +42639,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 43531 "configure"
+#line 42643 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -43541,7 +42650,7 @@
gdImageColorResolve()
; return 0; }
EOF
-if { (eval echo configure:43542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:42654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -43670,7 +42779,7 @@
done
echo $ac_n "checking for gdImageGifCtx in -lgd""... $ac_c" 1>&6
-echo "configure:43671: checking for gdImageGifCtx in -lgd" >&5
+echo "configure:42783: checking for gdImageGifCtx in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageGifCtx | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -43678,7 +42787,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 43679 "configure"
+#line 42791 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -43689,7 +42798,7 @@
gdImageGifCtx()
; return 0; }
EOF
-if { (eval echo configure:43690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:42802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -43818,7 +42927,7 @@
done
echo $ac_n "checking for gdCacheCreate in -lgd""... $ac_c" 1>&6
-echo "configure:43819: checking for gdCacheCreate in -lgd" >&5
+echo "configure:42931: checking for gdCacheCreate in -lgd" >&5
ac_lib_var=`echo gd'_'gdCacheCreate | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -43826,7 +42935,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 43827 "configure"
+#line 42939 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -43837,7 +42946,7 @@
gdCacheCreate()
; return 0; }
EOF
-if { (eval echo configure:43838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:42950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -43966,7 +43075,7 @@
done
echo $ac_n "checking for gdFontCacheShutdown in -lgd""... $ac_c" 1>&6
-echo "configure:43967: checking for gdFontCacheShutdown in -lgd" >&5
+echo "configure:43079: checking for gdFontCacheShutdown in -lgd" >&5
ac_lib_var=`echo gd'_'gdFontCacheShutdown | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -43974,7 +43083,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 43975 "configure"
+#line 43087 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -43985,7 +43094,7 @@
gdFontCacheShutdown()
; return 0; }
EOF
-if { (eval echo configure:43986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:43098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -44114,7 +43223,7 @@
done
echo $ac_n "checking for gdFreeFontCache in -lgd""... $ac_c" 1>&6
-echo "configure:44115: checking for gdFreeFontCache in -lgd" >&5
+echo "configure:43227: checking for gdFreeFontCache in -lgd" >&5
ac_lib_var=`echo gd'_'gdFreeFontCache | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -44122,7 +43231,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 44123 "configure"
+#line 43235 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -44133,7 +43242,7 @@
gdFreeFontCache()
; return 0; }
EOF
-if { (eval echo configure:44134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:43246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -44262,7 +43371,7 @@
done
echo $ac_n "checking for gdFontCacheMutexSetup in -lgd""... $ac_c" 1>&6
-echo "configure:44263: checking for gdFontCacheMutexSetup in -lgd" >&5
+echo "configure:43375: checking for gdFontCacheMutexSetup in -lgd" >&5
ac_lib_var=`echo gd'_'gdFontCacheMutexSetup | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -44270,7 +43379,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 44271 "configure"
+#line 43383 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -44281,7 +43390,7 @@
gdFontCacheMutexSetup()
; return 0; }
EOF
-if { (eval echo configure:44282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:43394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -44410,7 +43519,7 @@
done
echo $ac_n "checking for gdNewDynamicCtxEx in -lgd""... $ac_c" 1>&6
-echo "configure:44411: checking for gdNewDynamicCtxEx in -lgd" >&5
+echo "configure:43523: checking for gdNewDynamicCtxEx in -lgd" >&5
ac_lib_var=`echo gd'_'gdNewDynamicCtxEx | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -44418,7 +43527,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 44419 "configure"
+#line 43531 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -44429,7 +43538,7 @@
gdNewDynamicCtxEx()
; return 0; }
EOF
-if { (eval echo configure:44430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:43542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -44484,7 +43593,7 @@
old_CPPFLAGS=$CPPFLAGS
CPPFLAGS=-I$GD_INCLUDE
cat > conftest.$ac_ext <<EOF
-#line 44485 "configure"
+#line 43597 "configure"
#include "confdefs.h"
#include <gd.h>
@@ -44498,7 +43607,7 @@
; return 0; }
EOF
-if { (eval echo configure:44499: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:43611: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
@@ -44776,7 +43885,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -44829,7 +43938,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 44830 "configure"
+#line 43942 "configure"
#include "confdefs.h"
char foobar () {}
@@ -44840,7 +43949,7 @@
}
EOF
-if { (eval echo configure:44841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:43953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
LIBS=$old_LIBS
@@ -44991,7 +44100,7 @@
done
echo $ac_n "checking for gdImageCreate in -lgd""... $ac_c" 1>&6
-echo "configure:44992: checking for gdImageCreate in -lgd" >&5
+echo "configure:44104: checking for gdImageCreate in -lgd" >&5
ac_lib_var=`echo gd'_'gdImageCreate | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -44999,7 +44108,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 45000 "configure"
+#line 44112 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -45010,7 +44119,7 @@
gdImageCreate()
; return 0; }
EOF
-if { (eval echo configure:45011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:44123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -45075,7 +44184,7 @@
php_with_gettext=no
echo $ac_n "checking for GNU gettext support""... $ac_c" 1>&6
-echo "configure:45076: checking for GNU gettext support" >&5
+echo "configure:44188: checking for GNU gettext support" >&5
# Check whether --with-gettext or --without-gettext was given.
if test "${with_gettext+set}" = set; then
withval="$with_gettext"
@@ -45130,7 +44239,7 @@
O_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -L$GETTEXT_LIBDIR"
echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
-echo "configure:45131: checking for bindtextdomain in -lintl" >&5
+echo "configure:44243: checking for bindtextdomain in -lintl" >&5
ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -45138,7 +44247,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lintl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 45139 "configure"
+#line 44251 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -45149,7 +44258,7 @@
bindtextdomain()
; return 0; }
EOF
-if { (eval echo configure:45150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:44262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -45171,7 +44280,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for bindtextdomain in -lc""... $ac_c" 1>&6
-echo "configure:45172: checking for bindtextdomain in -lc" >&5
+echo "configure:44284: checking for bindtextdomain in -lc" >&5
ac_lib_var=`echo c'_'bindtextdomain | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -45179,7 +44288,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 45180 "configure"
+#line 44292 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -45190,7 +44299,7 @@
bindtextdomain()
; return 0; }
EOF
-if { (eval echo configure:45191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:44303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -45484,7 +44593,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -45654,7 +44763,7 @@
echo $ac_n "checking for ngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6
-echo "configure:45655: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
+echo "configure:44767: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'ngettext | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -45662,7 +44771,7 @@
ac_save_LIBS="$LIBS"
LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 45663 "configure"
+#line 44775 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -45673,7 +44782,7 @@
ngettext()
; return 0; }
EOF
-if { (eval echo configure:45674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:44786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -45697,7 +44806,7 @@
fi
echo $ac_n "checking for dngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6
-echo "configure:45698: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
+echo "configure:44810: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'dngettext | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -45705,7 +44814,7 @@
ac_save_LIBS="$LIBS"
LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 45706 "configure"
+#line 44818 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -45716,7 +44825,7 @@
dngettext()
; return 0; }
EOF
-if { (eval echo configure:45717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:44829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -45740,7 +44849,7 @@
fi
echo $ac_n "checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6
-echo "configure:45741: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
+echo "configure:44853: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'dcngettext | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -45748,7 +44857,7 @@
ac_save_LIBS="$LIBS"
LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 45749 "configure"
+#line 44861 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -45759,7 +44868,7 @@
dcngettext()
; return 0; }
EOF
-if { (eval echo configure:45760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:44872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -45783,7 +44892,7 @@
fi
echo $ac_n "checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6
-echo "configure:45784: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5
+echo "configure:44896: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5
ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'bind_textdomain_codeset | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -45791,7 +44900,7 @@
ac_save_LIBS="$LIBS"
LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 45792 "configure"
+#line 44904 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -45802,7 +44911,7 @@
bind_textdomain_codeset()
; return 0; }
EOF
-if { (eval echo configure:45803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:44915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -45833,7 +44942,7 @@
php_with_gmp=no
echo $ac_n "checking for GNU MP support""... $ac_c" 1>&6
-echo "configure:45834: checking for GNU MP support" >&5
+echo "configure:44946: checking for GNU MP support" >&5
# Check whether --with-gmp or --without-gmp was given.
if test "${with_gmp+set}" = set; then
withval="$with_gmp"
@@ -45981,7 +45090,7 @@
done
echo $ac_n "checking for __gmp_randinit_lc_2exp_size in -lgmp""... $ac_c" 1>&6
-echo "configure:45982: checking for __gmp_randinit_lc_2exp_size in -lgmp" >&5
+echo "configure:45094: checking for __gmp_randinit_lc_2exp_size in -lgmp" >&5
ac_lib_var=`echo gmp'_'__gmp_randinit_lc_2exp_size | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -45989,7 +45098,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lgmp $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 45990 "configure"
+#line 45102 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -46000,7 +45109,7 @@
__gmp_randinit_lc_2exp_size()
; return 0; }
EOF
-if { (eval echo configure:46001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:45113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -46125,7 +45234,7 @@
done
echo $ac_n "checking for gmp_randinit_lc_2exp_size in -lgmp""... $ac_c" 1>&6
-echo "configure:46126: checking for gmp_randinit_lc_2exp_size in -lgmp" >&5
+echo "configure:45238: checking for gmp_randinit_lc_2exp_size in -lgmp" >&5
ac_lib_var=`echo gmp'_'gmp_randinit_lc_2exp_size | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -46133,7 +45242,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lgmp $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 46134 "configure"
+#line 45246 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -46144,7 +45253,7 @@
gmp_randinit_lc_2exp_size()
; return 0; }
EOF
-if { (eval echo configure:46145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:45257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -46569,7 +45678,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -46616,7 +45725,7 @@
php_with_mhash=no
echo $ac_n "checking for mhash support""... $ac_c" 1>&6
-echo "configure:46617: checking for mhash support" >&5
+echo "configure:45729: checking for mhash support" >&5
# Check whether --with-mhash or --without-mhash was given.
if test "${with_mhash+set}" = set; then
withval="$with_mhash"
@@ -46660,7 +45769,7 @@
php_enable_hash=yes
echo $ac_n "checking whether to enable hash support""... $ac_c" 1>&6
-echo "configure:46661: checking whether to enable hash support" >&5
+echo "configure:45773: checking whether to enable hash support" >&5
# Check whether --enable-hash or --disable-hash was given.
if test "${enable_hash+set}" = set; then
enableval="$enable_hash"
@@ -46718,7 +45827,7 @@
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:46719: checking whether byte ordering is bigendian" >&5
+echo "configure:45831: checking whether byte ordering is bigendian" >&5
if eval "test \"`echo '$''{'ac_cv_c_bigendian_php'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -46728,7 +45837,7 @@
ac_cv_c_bigendian_php=unknown
else
cat > conftest.$ac_ext <<EOF
-#line 46729 "configure"
+#line 45841 "configure"
#include "confdefs.h"
int main(void)
@@ -46744,7 +45853,7 @@
}
EOF
-if { (eval echo configure:46745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:45857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_bigendian_php=yes
else
@@ -46769,7 +45878,7 @@
echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:46770: checking size of short" >&5
+echo "configure:45882: checking size of short" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -46777,7 +45886,7 @@
ac_cv_sizeof_short=2
else
cat > conftest.$ac_ext <<EOF
-#line 46778 "configure"
+#line 45890 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -46788,7 +45897,7 @@
exit(0);
}
EOF
-if { (eval echo configure:46789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:45901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_short=`cat conftestval`
else
@@ -46808,7 +45917,7 @@
echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:46809: checking size of int" >&5
+echo "configure:45921: checking size of int" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -46816,7 +45925,7 @@
ac_cv_sizeof_int=4
else
cat > conftest.$ac_ext <<EOF
-#line 46817 "configure"
+#line 45929 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -46827,7 +45936,7 @@
exit(0);
}
EOF
-if { (eval echo configure:46828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:45940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_int=`cat conftestval`
else
@@ -46847,7 +45956,7 @@
echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:46848: checking size of long" >&5
+echo "configure:45960: checking size of long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -46855,7 +45964,7 @@
ac_cv_sizeof_long=4
else
cat > conftest.$ac_ext <<EOF
-#line 46856 "configure"
+#line 45968 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -46866,7 +45975,7 @@
exit(0);
}
EOF
-if { (eval echo configure:46867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:45979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long=`cat conftestval`
else
@@ -46886,7 +45995,7 @@
echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:46887: checking size of long long" >&5
+echo "configure:45999: checking size of long long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -46894,7 +46003,7 @@
ac_cv_sizeof_long_long=8
else
cat > conftest.$ac_ext <<EOF
-#line 46895 "configure"
+#line 46007 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -46905,7 +46014,7 @@
exit(0);
}
EOF
-if { (eval echo configure:46906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:46018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long_long=`cat conftestval`
else
@@ -47192,7 +46301,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -47254,7 +46363,7 @@
php_with_iconv=yes
echo $ac_n "checking for iconv support""... $ac_c" 1>&6
-echo "configure:47255: checking for iconv support" >&5
+echo "configure:46367: checking for iconv support" >&5
# Check whether --with-iconv or --without-iconv was given.
if test "${with_iconv+set}" = set; then
withval="$with_iconv"
@@ -47318,12 +46427,12 @@
LIBS_save="$LIBS"
LIBS=
echo $ac_n "checking for iconv""... $ac_c" 1>&6
-echo "configure:47319: checking for iconv" >&5
+echo "configure:46431: checking for iconv" >&5
if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 47324 "configure"
+#line 46436 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char iconv(); below. */
@@ -47346,7 +46455,7 @@
; return 0; }
EOF
-if { (eval echo configure:47347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:46459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_iconv=yes"
else
@@ -47367,12 +46476,12 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for libiconv""... $ac_c" 1>&6
-echo "configure:47368: checking for libiconv" >&5
+echo "configure:46480: checking for libiconv" >&5
if eval "test \"`echo '$''{'ac_cv_func_libiconv'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 47373 "configure"
+#line 46485 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char libiconv(); below. */
@@ -47395,7 +46504,7 @@
; return 0; }
EOF
-if { (eval echo configure:47396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:46508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_libiconv=yes"
else
@@ -47552,7 +46661,7 @@
done
echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6
-echo "configure:47553: checking for libiconv in -l$iconv_lib_name" >&5
+echo "configure:46665: checking for libiconv in -l$iconv_lib_name" >&5
ac_lib_var=`echo $iconv_lib_name'_'libiconv | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -47560,7 +46669,7 @@
ac_save_LIBS="$LIBS"
LIBS="-l$iconv_lib_name $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 47561 "configure"
+#line 46673 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -47571,7 +46680,7 @@
libiconv()
; return 0; }
EOF
-if { (eval echo configure:47572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:46684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -47712,7 +46821,7 @@
done
echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6
-echo "configure:47713: checking for iconv in -l$iconv_lib_name" >&5
+echo "configure:46825: checking for iconv in -l$iconv_lib_name" >&5
ac_lib_var=`echo $iconv_lib_name'_'iconv | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -47720,7 +46829,7 @@
ac_save_LIBS="$LIBS"
LIBS="-l$iconv_lib_name $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 47721 "configure"
+#line 46833 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -47731,7 +46840,7 @@
iconv()
; return 0; }
EOF
-if { (eval echo configure:47732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:46844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -47942,16 +47051,16 @@
fi
echo $ac_n "checking if iconv is glibc's""... $ac_c" 1>&6
-echo "configure:47943: checking if iconv is glibc's" >&5
+echo "configure:47055: checking if iconv is glibc's" >&5
cat > conftest.$ac_ext <<EOF
-#line 47945 "configure"
+#line 47057 "configure"
#include "confdefs.h"
#include <gnu/libc-version.h>
int main() {
gnu_get_libc_version();
; return 0; }
EOF
-if { (eval echo configure:47952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:47064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
@@ -47969,7 +47078,7 @@
if test -z "$iconv_impl_name"; then
echo $ac_n "checking if using GNU libiconv""... $ac_c" 1>&6
-echo "configure:47970: checking if using GNU libiconv" >&5
+echo "configure:47082: checking if using GNU libiconv" >&5
php_iconv_old_ld="$LDFLAGS"
LDFLAGS="-liconv $LDFLAGS"
if test "$cross_compiling" = yes; then
@@ -47979,7 +47088,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 47980 "configure"
+#line 47092 "configure"
#include "confdefs.h"
#include <$PHP_ICONV_H_PATH>
@@ -47989,7 +47098,7 @@
}
EOF
-if { (eval echo configure:47990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:47102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
echo "$ac_t""yes" 1>&6
@@ -48011,16 +47120,16 @@
if test -z "$iconv_impl_name"; then
echo $ac_n "checking if iconv is Konstantin Chuguev's""... $ac_c" 1>&6
-echo "configure:48012: checking if iconv is Konstantin Chuguev's" >&5
+echo "configure:47124: checking if iconv is Konstantin Chuguev's" >&5
cat > conftest.$ac_ext <<EOF
-#line 48014 "configure"
+#line 47126 "configure"
#include "confdefs.h"
#include <iconv.h>
int main() {
iconv_ccs_init(NULL, NULL);
; return 0; }
EOF
-if { (eval echo configure:48021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:47133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
@@ -48039,18 +47148,18 @@
if test -z "$iconv_impl_name"; then
echo $ac_n "checking if using IBM iconv""... $ac_c" 1>&6
-echo "configure:48040: checking if using IBM iconv" >&5
+echo "configure:47152: checking if using IBM iconv" >&5
php_iconv_old_ld="$LDFLAGS"
LDFLAGS="-liconv $LDFLAGS"
cat > conftest.$ac_ext <<EOF
-#line 48044 "configure"
+#line 47156 "configure"
#include "confdefs.h"
#include <iconv.h>
int main() {
cstoccsid("");
; return 0; }
EOF
-if { (eval echo configure:48051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:47163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
@@ -48236,7 +47345,7 @@
esac
echo $ac_n "checking if iconv supports errno""... $ac_c" 1>&6
-echo "configure:48237: checking if iconv supports errno" >&5
+echo "configure:47349: checking if iconv supports errno" >&5
if test "$cross_compiling" = yes; then
echo "$ac_t""no" 1>&6
@@ -48250,7 +47359,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 48251 "configure"
+#line 47363 "configure"
#include "confdefs.h"
#include <$PHP_ICONV_H_PATH>
@@ -48271,7 +47380,7 @@
}
EOF
-if { (eval echo configure:48272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:47384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
echo "$ac_t""yes" 1>&6
@@ -48303,9 +47412,9 @@
echo $ac_n "checking if your cpp allows macro usage in include lines""... $ac_c" 1>&6
-echo "configure:48304: checking if your cpp allows macro usage in include lines" >&5
+echo "configure:47416: checking if your cpp allows macro usage in include lines" >&5
cat > conftest.$ac_ext <<EOF
-#line 48306 "configure"
+#line 47418 "configure"
#include "confdefs.h"
#define FOO <$PHP_ICONV_H_PATH>
@@ -48315,7 +47424,7 @@
; return 0; }
EOF
-if { (eval echo configure:48316: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:47428: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
@@ -48596,7 +47705,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -48671,7 +47780,7 @@
php_with_imap=no
echo $ac_n "checking for IMAP support""... $ac_c" 1>&6
-echo "configure:48672: checking for IMAP support" >&5
+echo "configure:47784: checking for IMAP support" >&5
# Check whether --with-imap or --without-imap was given.
if test "${with_imap+set}" = set; then
withval="$with_imap"
@@ -48715,7 +47824,7 @@
php_with_kerberos=no
echo $ac_n "checking for IMAP Kerberos support""... $ac_c" 1>&6
-echo "configure:48716: checking for IMAP Kerberos support" >&5
+echo "configure:47828: checking for IMAP Kerberos support" >&5
# Check whether --with-kerberos or --without-kerberos was given.
if test "${with_kerberos+set}" = set; then
withval="$with_kerberos"
@@ -48738,7 +47847,7 @@
php_with_imap_ssl=no
echo $ac_n "checking for IMAP SSL support""... $ac_c" 1>&6
-echo "configure:48739: checking for IMAP SSL support" >&5
+echo "configure:47851: checking for IMAP SSL support" >&5
# Check whether --with-imap-ssl or --without-imap-ssl was given.
if test "${with_imap_ssl+set}" = set; then
withval="$with_imap_ssl"
@@ -49021,7 +48130,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -49142,7 +48251,7 @@
done
cat > conftest.$ac_ext <<EOF
-#line 49143 "configure"
+#line 48255 "configure"
#include "confdefs.h"
#include <$IMAP_INC_DIR/mail.h>
EOF
@@ -49162,12 +48271,12 @@
old_CFLAGS=$CFLAGS
CFLAGS="-I$IMAP_INC_DIR"
echo $ac_n "checking for utf8_mime2text signature""... $ac_c" 1>&6
-echo "configure:49163: checking for utf8_mime2text signature" >&5
+echo "configure:48275: checking for utf8_mime2text signature" >&5
if eval "test \"`echo '$''{'ac_cv_utf8_mime2text'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 49168 "configure"
+#line 48280 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -49180,7 +48289,7 @@
; return 0; }
EOF
-if { (eval echo configure:49181: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:48293: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_utf8_mime2text=old
@@ -49209,12 +48318,12 @@
old_CFLAGS=$CFLAGS
CFLAGS="-I$IMAP_INC_DIR"
echo $ac_n "checking for U8T_DECOMPOSE""... $ac_c" 1>&6
-echo "configure:49210: checking for U8T_DECOMPOSE" >&5
+echo "configure:48322: checking for U8T_DECOMPOSE" >&5
if eval "test \"`echo '$''{'ac_cv_u8t_canonical'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 49215 "configure"
+#line 48327 "configure"
#include "confdefs.h"
#include <c-client.h>
@@ -49225,7 +48334,7 @@
; return 0; }
EOF
-if { (eval echo configure:49226: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:48338: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_u8t_decompose=yes
@@ -49255,7 +48364,7 @@
old_CPPFLAGS=$CPPFLAGS
CPPFLAGS=-I$IMAP_INC_DIR
cat > conftest.$ac_ext <<EOF
-#line 49256 "configure"
+#line 48368 "configure"
#include "confdefs.h"
#include "imap4r1.h"
@@ -49374,7 +48483,7 @@
done
echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6
-echo "configure:49375: checking for pam_start in -lpam" >&5
+echo "configure:48487: checking for pam_start in -lpam" >&5
ac_lib_var=`echo pam'_'pam_start | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -49382,7 +48491,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpam $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 49383 "configure"
+#line 48495 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -49393,7 +48502,7 @@
pam_start()
; return 0; }
EOF
-if { (eval echo configure:49394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:48506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -49548,7 +48657,7 @@
done
echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:49549: checking for crypt in -lcrypt" >&5
+echo "configure:48661: checking for crypt in -lcrypt" >&5
ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -49556,7 +48665,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lcrypt $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 49557 "configure"
+#line 48669 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -49567,7 +48676,7 @@
crypt()
; return 0; }
EOF
-if { (eval echo configure:49568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:48680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -49771,7 +48880,7 @@
# Extract the first word of "krb5-config", so it can be a program name with args.
set dummy krb5-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:49772: checking for $ac_word" >&5
+echo "configure:48884: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_KRB5_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -50140,7 +49249,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 50141 "configure"
+#line 49253 "configure"
#include "confdefs.h"
#include <$IMAP_INC_DIR/linkage.h>
EOF
@@ -50181,7 +49290,7 @@
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:50182: checking for $ac_word" >&5
+echo "configure:49294: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -50386,9 +49495,9 @@
old_CPPFLAGS=$CPPFLAGS
CPPFLAGS=-I$OPENSSL_INCDIR
echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
-echo "configure:50387: checking for OpenSSL version" >&5
+echo "configure:49499: checking for OpenSSL version" >&5
cat > conftest.$ac_ext <<EOF
-#line 50389 "configure"
+#line 49501 "configure"
#include "confdefs.h"
#include <openssl/opensslv.h>
@@ -50543,7 +49652,7 @@
done
echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
-echo "configure:50544: checking for CRYPTO_free in -lcrypto" >&5
+echo "configure:49656: checking for CRYPTO_free in -lcrypto" >&5
ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -50551,7 +49660,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lcrypto $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 50552 "configure"
+#line 49664 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -50562,7 +49671,7 @@
CRYPTO_free()
; return 0; }
EOF
-if { (eval echo configure:50563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:49675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -50719,7 +49828,7 @@
done
echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
-echo "configure:50720: checking for SSL_CTX_set_ssl_version in -lssl" >&5
+echo "configure:49832: checking for SSL_CTX_set_ssl_version in -lssl" >&5
ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -50727,7 +49836,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lssl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 50728 "configure"
+#line 49840 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -50738,7 +49847,7 @@
SSL_CTX_set_ssl_version()
; return 0; }
EOF
-if { (eval echo configure:50739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:49851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -50880,7 +49989,7 @@
elif test -f "$IMAP_INC_DIR/linkage.c"; then
cat > conftest.$ac_ext <<EOF
-#line 50881 "configure"
+#line 49993 "configure"
#include "confdefs.h"
#include <$IMAP_INC_DIR/linkage.c>
EOF
@@ -50911,7 +50020,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 50912 "configure"
+#line 50024 "configure"
#include "confdefs.h"
@@ -50944,7 +50053,7 @@
}
EOF
-if { (eval echo configure:50945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:50057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
LIBS=$old_LIBS
@@ -50980,7 +50089,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 50981 "configure"
+#line 50093 "configure"
#include "confdefs.h"
@@ -51013,7 +50122,7 @@
}
EOF
-if { (eval echo configure:51014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:50126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
LIBS=$old_LIBS
@@ -51040,7 +50149,7 @@
echo $ac_n "checking whether rfc822_output_address_list function present""... $ac_c" 1>&6
-echo "configure:51041: checking whether rfc822_output_address_list function present" >&5
+echo "configure:50153: checking whether rfc822_output_address_list function present" >&5
old_LIBS=$LIBS
LIBS="
@@ -51052,7 +50161,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 51053 "configure"
+#line 50165 "configure"
#include "confdefs.h"
@@ -51088,7 +50197,7 @@
}
EOF
-if { (eval echo configure:51089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:50201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
LIBS=$old_LIBS
@@ -51117,7 +50226,7 @@
echo $ac_n "checking whether build with IMAP works""... $ac_c" 1>&6
-echo "configure:51118: checking whether build with IMAP works" >&5
+echo "configure:50230: checking whether build with IMAP works" >&5
old_LIBS=$LIBS
@@ -51128,7 +50237,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 51129 "configure"
+#line 50241 "configure"
#include "confdefs.h"
@@ -51161,7 +50270,7 @@
}
EOF
-if { (eval echo configure:51162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:50274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
LIBS=$old_LIBS
@@ -51193,7 +50302,7 @@
php_with_interbase=no
echo $ac_n "checking for InterBase support""... $ac_c" 1>&6
-echo "configure:51194: checking for InterBase support" >&5
+echo "configure:50306: checking for InterBase support" >&5
# Check whether --with-interbase or --without-interbase was given.
if test "${with_interbase+set}" = set; then
withval="$with_interbase"
@@ -51340,7 +50449,7 @@
done
echo $ac_n "checking for isc_detach_database in -lfbclient""... $ac_c" 1>&6
-echo "configure:51341: checking for isc_detach_database in -lfbclient" >&5
+echo "configure:50453: checking for isc_detach_database in -lfbclient" >&5
ac_lib_var=`echo fbclient'_'isc_detach_database | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -51348,7 +50457,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lfbclient $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 51349 "configure"
+#line 50461 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -51359,7 +50468,7 @@
isc_detach_database()
; return 0; }
EOF
-if { (eval echo configure:51360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:50472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -51486,7 +50595,7 @@
done
echo $ac_n "checking for isc_detach_database in -lgds""... $ac_c" 1>&6
-echo "configure:51487: checking for isc_detach_database in -lgds" >&5
+echo "configure:50599: checking for isc_detach_database in -lgds" >&5
ac_lib_var=`echo gds'_'isc_detach_database | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -51494,7 +50603,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lgds $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 51495 "configure"
+#line 50607 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -51505,7 +50614,7 @@
isc_detach_database()
; return 0; }
EOF
-if { (eval echo configure:51506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:50618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -51632,7 +50741,7 @@
done
echo $ac_n "checking for isc_detach_database in -lib_util""... $ac_c" 1>&6
-echo "configure:51633: checking for isc_detach_database in -lib_util" >&5
+echo "configure:50745: checking for isc_detach_database in -lib_util" >&5
ac_lib_var=`echo ib_util'_'isc_detach_database | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -51640,7 +50749,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lib_util $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 51641 "configure"
+#line 50753 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -51651,7 +50760,7 @@
isc_detach_database()
; return 0; }
EOF
-if { (eval echo configure:51652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:50764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -52085,7 +51194,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -52128,7 +51237,7 @@
php_enable_intl=no
echo $ac_n "checking whether to enable internationalization support""... $ac_c" 1>&6
-echo "configure:52129: checking whether to enable internationalization support" >&5
+echo "configure:51241: checking whether to enable internationalization support" >&5
# Check whether --enable-intl or --disable-intl was given.
if test "${enable_intl+set}" = set; then
enableval="$enable_intl"
@@ -52200,7 +51309,7 @@
# Extract the first word of "icu-config", so it can be a program name with args.
set dummy icu-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:52201: checking for $ac_word" >&5
+echo "configure:51313: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_ICU_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -52238,7 +51347,7 @@
fi
echo $ac_n "checking for location of ICU headers and libraries""... $ac_c" 1>&6
-echo "configure:52239: checking for location of ICU headers and libraries" >&5
+echo "configure:51351: checking for location of ICU headers and libraries" >&5
icu_install_prefix=`$ICU_CONFIG --prefix 2> /dev/null`
if test "$?" != "0" || test -z "$icu_install_prefix"; then
@@ -52248,7 +51357,7 @@
echo "$ac_t""$icu_install_prefix" 1>&6
echo $ac_n "checking for ICU 3.4 or greater""... $ac_c" 1>&6
-echo "configure:52249: checking for ICU 3.4 or greater" >&5
+echo "configure:51361: checking for ICU 3.4 or greater" >&5
icu_version_full=`$ICU_CONFIG --version`
ac_IFS=$IFS
IFS="."
@@ -52405,7 +51514,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:52406: checking for $ac_word" >&5
+echo "configure:51518: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -52437,7 +51546,7 @@
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:52438: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:51550: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -52448,12 +51557,12 @@
cat > conftest.$ac_ext << EOF
-#line 52449 "configure"
+#line 51561 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:52454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:51566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cxx_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -52479,12 +51588,12 @@
{ echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:52480: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:51592: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:52485: checking whether we are using GNU C++" >&5
+echo "configure:51597: checking whether we are using GNU C++" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -52493,7 +51602,7 @@
yes;
#endif
EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:52494: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:51606: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gxx=yes
else
ac_cv_prog_gxx=no
@@ -52512,7 +51621,7 @@
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:52513: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:51625: checking whether ${CXX-g++} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -52544,7 +51653,7 @@
fi
echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:52545: checking how to run the C++ preprocessor" >&5
+echo "configure:51657: checking how to run the C++ preprocessor" >&5
if test -z "$CXXCPP"; then
if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -52557,12 +51666,12 @@
cross_compiling=$ac_cv_prog_cxx_cross
CXXCPP="${CXX-g++} -E"
cat > conftest.$ac_ext <<EOF
-#line 52558 "configure"
+#line 51670 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:52563: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:51675: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -53029,7 +52138,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -53120,7 +52229,7 @@
php_enable_json=yes
echo $ac_n "checking whether to enable JavaScript Object Serialization support""... $ac_c" 1>&6
-echo "configure:53121: checking whether to enable JavaScript Object Serialization support" >&5
+echo "configure:52233: checking whether to enable JavaScript Object Serialization support" >&5
# Check whether --enable-json or --disable-json was given.
if test "${enable_json+set}" = set; then
enableval="$enable_json"
@@ -53166,12 +52275,12 @@
EOF
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:53167: checking for ANSI C header files" >&5
+echo "configure:52279: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 53172 "configure"
+#line 52284 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -53179,7 +52288,7 @@
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:53180: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:52292: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -53196,7 +52305,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 53197 "configure"
+#line 52309 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -53214,7 +52323,7 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 53215 "configure"
+#line 52327 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -53235,7 +52344,7 @@
:
else
cat > conftest.$ac_ext <<EOF
-#line 53236 "configure"
+#line 52348 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -53246,7 +52355,7 @@
exit (0); }
EOF
-if { (eval echo configure:53247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:52359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -53529,7 +52638,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -53596,7 +52705,7 @@
php_with_ldap=no
echo $ac_n "checking for LDAP support""... $ac_c" 1>&6
-echo "configure:53597: checking for LDAP support" >&5
+echo "configure:52709: checking for LDAP support" >&5
# Check whether --with-ldap or --without-ldap was given.
if test "${with_ldap+set}" = set; then
withval="$with_ldap"
@@ -53640,7 +52749,7 @@
php_with_ldap_sasl=no
echo $ac_n "checking for LDAP Cyrus SASL support""... $ac_c" 1>&6
-echo "configure:53641: checking for LDAP Cyrus SASL support" >&5
+echo "configure:52753: checking for LDAP Cyrus SASL support" >&5
# Check whether --with-ldap-sasl or --without-ldap-sasl was given.
if test "${with_ldap_sasl+set}" = set; then
withval="$with_ldap_sasl"
@@ -53920,7 +53029,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -55982,19 +55091,19 @@
LIBS="$LIBS $LDAP_SHARED_LIBADD"
echo $ac_n "checking for 3 arg ldap_set_rebind_proc""... $ac_c" 1>&6
-echo "configure:55983: checking for 3 arg ldap_set_rebind_proc" >&5
+echo "configure:55095: checking for 3 arg ldap_set_rebind_proc" >&5
if eval "test \"`echo '$''{'ac_cv_3arg_setrebindproc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 55988 "configure"
+#line 55100 "configure"
#include "confdefs.h"
#include <ldap.h>
int main() {
ldap_set_rebind_proc(0,0,0)
; return 0; }
EOF
-if { (eval echo configure:55995: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:55107: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_3arg_setrebindproc=yes
else
@@ -56017,12 +55126,12 @@
for ac_func in ldap_parse_result ldap_parse_reference ldap_start_tls_s
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:56018: checking for $ac_func" >&5
+echo "configure:55130: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 56023 "configure"
+#line 55135 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -56045,7 +55154,7 @@
; return 0; }
EOF
-if { (eval echo configure:56046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:55158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -56207,7 +55316,7 @@
done
echo $ac_n "checking for sasl_version in -lsasl2""... $ac_c" 1>&6
-echo "configure:56208: checking for sasl_version in -lsasl2" >&5
+echo "configure:55320: checking for sasl_version in -lsasl2" >&5
ac_lib_var=`echo sasl2'_'sasl_version | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -56215,7 +55324,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsasl2 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 56216 "configure"
+#line 55328 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -56226,7 +55335,7 @@
sasl_version()
; return 0; }
EOF
-if { (eval echo configure:56227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:55339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -56395,12 +55504,12 @@
fi
echo $ac_n "checking for ldap_bind_s""... $ac_c" 1>&6
-echo "configure:56396: checking for ldap_bind_s" >&5
+echo "configure:55508: checking for ldap_bind_s" >&5
if eval "test \"`echo '$''{'ac_cv_func_ldap_bind_s'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 56401 "configure"
+#line 55513 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char ldap_bind_s(); below. */
@@ -56423,7 +55532,7 @@
; return 0; }
EOF
-if { (eval echo configure:56424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:55536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_ldap_bind_s=yes"
else
@@ -56476,7 +55585,7 @@
php_enable_mbstring=no
echo $ac_n "checking whether to enable multibyte string support""... $ac_c" 1>&6
-echo "configure:56477: checking whether to enable multibyte string support" >&5
+echo "configure:55589: checking whether to enable multibyte string support" >&5
# Check whether --enable-mbstring or --disable-mbstring was given.
if test "${enable_mbstring+set}" = set; then
enableval="$enable_mbstring"
@@ -56520,7 +55629,7 @@
php_enable_mbregex=yes
echo $ac_n "checking whether to enable multibyte regex support""... $ac_c" 1>&6
-echo "configure:56521: checking whether to enable multibyte regex support" >&5
+echo "configure:55633: checking whether to enable multibyte regex support" >&5
# Check whether --enable-mbregex or --disable-mbregex was given.
if test "${enable_mbregex+set}" = set; then
enableval="$enable_mbregex"
@@ -56543,7 +55652,7 @@
php_enable_mbregex_backtrack=yes
echo $ac_n "checking whether to check multibyte regex backtrack""... $ac_c" 1>&6
-echo "configure:56544: checking whether to check multibyte regex backtrack" >&5
+echo "configure:55656: checking whether to check multibyte regex backtrack" >&5
# Check whether --enable-mbregex_backtrack or --disable-mbregex_backtrack was given.
if test "${enable_mbregex_backtrack+set}" = set; then
enableval="$enable_mbregex_backtrack"
@@ -56566,7 +55675,7 @@
php_with_libmbfl=no
echo $ac_n "checking for external libmbfl""... $ac_c" 1>&6
-echo "configure:56567: checking for external libmbfl" >&5
+echo "configure:55679: checking for external libmbfl" >&5
# Check whether --with-libmbfl or --without-libmbfl was given.
if test "${with_libmbfl+set}" = set; then
withval="$with_libmbfl"
@@ -56589,7 +55698,7 @@
php_with_onig=no
echo $ac_n "checking for external oniguruma""... $ac_c" 1>&6
-echo "configure:56590: checking for external oniguruma" >&5
+echo "configure:55702: checking for external oniguruma" >&5
# Check whether --with-onig or --without-onig was given.
if test "${with_onig+set}" = set; then
withval="$with_onig"
@@ -56630,7 +55739,7 @@
fi
echo $ac_n "checking for variable length prototypes and stdarg.h""... $ac_c" 1>&6
-echo "configure:56631: checking for variable length prototypes and stdarg.h" >&5
+echo "configure:55743: checking for variable length prototypes and stdarg.h" >&5
if eval "test \"`echo '$''{'php_cv_mbstring_stdarg'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -56648,7 +55757,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 56649 "configure"
+#line 55761 "configure"
#include "confdefs.h"
#include <stdarg.h>
@@ -56663,7 +55772,7 @@
int main() { return foo(10, "", 3.14); }
EOF
-if { (eval echo configure:56664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:55776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
php_cv_mbstring_stdarg=yes
else
@@ -56684,17 +55793,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:56685: checking for $ac_hdr" >&5
+echo "configure:55797: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 56690 "configure"
+#line 55802 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:56695: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:55807: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -56721,7 +55830,7 @@
done
echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:56722: checking size of int" >&5
+echo "configure:55834: checking size of int" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -56729,7 +55838,7 @@
ac_cv_sizeof_int=4
else
cat > conftest.$ac_ext <<EOF
-#line 56730 "configure"
+#line 55842 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -56740,7 +55849,7 @@
exit(0);
}
EOF
-if { (eval echo configure:56741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:55853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_int=`cat conftestval`
else
@@ -56760,7 +55869,7 @@
echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:56761: checking size of short" >&5
+echo "configure:55873: checking size of short" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -56768,7 +55877,7 @@
ac_cv_sizeof_short=2
else
cat > conftest.$ac_ext <<EOF
-#line 56769 "configure"
+#line 55881 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -56779,7 +55888,7 @@
exit(0);
}
EOF
-if { (eval echo configure:56780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:55892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_short=`cat conftestval`
else
@@ -56799,7 +55908,7 @@
echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:56800: checking size of long" >&5
+echo "configure:55912: checking size of long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -56807,7 +55916,7 @@
ac_cv_sizeof_long=4
else
cat > conftest.$ac_ext <<EOF
-#line 56808 "configure"
+#line 55920 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -56818,7 +55927,7 @@
exit(0);
}
EOF
-if { (eval echo configure:56819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:55931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long=`cat conftestval`
else
@@ -56838,12 +55947,12 @@
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:56839: checking for working const" >&5
+echo "configure:55951: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 56844 "configure"
+#line 55956 "configure"
#include "confdefs.h"
int main() {
@@ -56892,7 +56001,7 @@
; return 0; }
EOF
-if { (eval echo configure:56893: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:56005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -56913,12 +56022,12 @@
fi
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:56914: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:56026: checking whether time.h and sys/time.h may both be included" >&5
if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 56919 "configure"
+#line 56031 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -56927,7 +56036,7 @@
struct tm *tp;
; return 0; }
EOF
-if { (eval echo configure:56928: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:56040: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
@@ -56950,19 +56059,19 @@
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
# for constant arguments. Useless!
echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:56951: checking for working alloca.h" >&5
+echo "configure:56063: checking for working alloca.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 56956 "configure"
+#line 56068 "configure"
#include "confdefs.h"
#include <alloca.h>
int main() {
char *p = alloca(2 * sizeof(int));
; return 0; }
EOF
-if { (eval echo configure:56963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:56075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_header_alloca_h=yes
else
@@ -56983,12 +56092,12 @@
fi
echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:56984: checking for alloca" >&5
+echo "configure:56096: checking for alloca" >&5
if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 56989 "configure"
+#line 56101 "configure"
#include "confdefs.h"
#ifdef __GNUC__
@@ -57016,7 +56125,7 @@
char *p = (char *) alloca(1);
; return 0; }
EOF
-if { (eval echo configure:57017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:56129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_func_alloca_works=yes
else
@@ -57048,12 +56157,12 @@
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:57049: checking whether alloca needs Cray hooks" >&5
+echo "configure:56161: checking whether alloca needs Cray hooks" >&5
if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 57054 "configure"
+#line 56166 "configure"
#include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2)
webecray
@@ -57078,12 +56187,12 @@
if test $ac_cv_os_cray = yes; then
for ac_func in _getb67 GETB67 getb67; do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:57079: checking for $ac_func" >&5
+echo "configure:56191: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 57084 "configure"
+#line 56196 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -57106,7 +56215,7 @@
; return 0; }
EOF
-if { (eval echo configure:57107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:56219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -57133,7 +56242,7 @@
fi
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:57134: checking stack direction for C alloca" >&5
+echo "configure:56246: checking stack direction for C alloca" >&5
if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -57141,7 +56250,7 @@
ac_cv_c_stack_direction=0
else
cat > conftest.$ac_ext <<EOF
-#line 57142 "configure"
+#line 56254 "configure"
#include "confdefs.h"
find_stack_direction ()
{
@@ -57160,7 +56269,7 @@
exit (find_stack_direction() < 0);
}
EOF
-if { (eval echo configure:57161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:56273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_stack_direction=1
else
@@ -57182,7 +56291,7 @@
fi
echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
-echo "configure:57183: checking for 8-bit clean memcmp" >&5
+echo "configure:56295: checking for 8-bit clean memcmp" >&5
if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -57190,7 +56299,7 @@
ac_cv_func_memcmp_clean=no
else
cat > conftest.$ac_ext <<EOF
-#line 57191 "configure"
+#line 56303 "configure"
#include "confdefs.h"
main()
@@ -57200,7 +56309,7 @@
}
EOF
-if { (eval echo configure:57201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:56313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_memcmp_clean=yes
else
@@ -57219,17 +56328,17 @@
ac_safe=`echo "stdarg.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for stdarg.h""... $ac_c" 1>&6
-echo "configure:57220: checking for stdarg.h" >&5
+echo "configure:56332: checking for stdarg.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 57225 "configure"
+#line 56337 "configure"
#include "confdefs.h"
#include <stdarg.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:57230: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:56342: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -57459,7 +56568,7 @@
done
echo $ac_n "checking for onig_init in -lonig""... $ac_c" 1>&6
-echo "configure:57460: checking for onig_init in -lonig" >&5
+echo "configure:56572: checking for onig_init in -lonig" >&5
ac_lib_var=`echo onig'_'onig_init | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -57467,7 +56576,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lonig $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 57468 "configure"
+#line 56580 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -57478,7 +56587,7 @@
onig_init()
; return 0; }
EOF
-if { (eval echo configure:57479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:56591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -57704,9 +56813,9 @@
done
echo $ac_n "checking if oniguruma has an invalid entry for KOI8 encoding""... $ac_c" 1>&6
-echo "configure:57705: checking if oniguruma has an invalid entry for KOI8 encoding" >&5
+echo "configure:56817: checking if oniguruma has an invalid entry for KOI8 encoding" >&5
cat > conftest.$ac_ext <<EOF
-#line 57707 "configure"
+#line 56819 "configure"
#include "confdefs.h"
#include <oniguruma.h>
@@ -57717,7 +56826,7 @@
; return 0; }
EOF
-if { (eval echo configure:57718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:56830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""no" 1>&6
@@ -58015,7 +57124,7 @@
done
echo $ac_n "checking for mbfl_buffer_converter_new in -lmbfl""... $ac_c" 1>&6
-echo "configure:58016: checking for mbfl_buffer_converter_new in -lmbfl" >&5
+echo "configure:57128: checking for mbfl_buffer_converter_new in -lmbfl" >&5
ac_lib_var=`echo mbfl'_'mbfl_buffer_converter_new | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -58023,7 +57132,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lmbfl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 58024 "configure"
+#line 57136 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -58034,7 +57143,7 @@
mbfl_buffer_converter_new()
; return 0; }
EOF
-if { (eval echo configure:58035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:57147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -58426,7 +57535,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -58671,7 +57780,7 @@
php_with_mcrypt=no
echo $ac_n "checking for mcrypt support""... $ac_c" 1>&6
-echo "configure:58672: checking for mcrypt support" >&5
+echo "configure:57784: checking for mcrypt support" >&5
# Check whether --with-mcrypt or --without-mcrypt was given.
if test "${with_mcrypt+set}" = set; then
withval="$with_mcrypt"
@@ -58724,9 +57833,9 @@
old_CPPFLAGS=$CPPFLAGS
CPPFLAGS=-I$MCRYPT_DIR/include
echo $ac_n "checking for libmcrypt version""... $ac_c" 1>&6
-echo "configure:58725: checking for libmcrypt version" >&5
+echo "configure:57837: checking for libmcrypt version" >&5
cat > conftest.$ac_ext <<EOF
-#line 58727 "configure"
+#line 57839 "configure"
#include "confdefs.h"
#include <mcrypt.h>
@@ -58850,7 +57959,7 @@
done
echo $ac_n "checking for mcrypt_module_open in -lmcrypt""... $ac_c" 1>&6
-echo "configure:58851: checking for mcrypt_module_open in -lmcrypt" >&5
+echo "configure:57963: checking for mcrypt_module_open in -lmcrypt" >&5
ac_lib_var=`echo mcrypt'_'mcrypt_module_open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -58858,7 +57967,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lmcrypt $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 58859 "configure"
+#line 57971 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -58869,7 +57978,7 @@
mcrypt_module_open()
; return 0; }
EOF
-if { (eval echo configure:58870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:57982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -59022,7 +58131,7 @@
done
echo $ac_n "checking for mcrypt_module_open in -lmcrypt""... $ac_c" 1>&6
-echo "configure:59023: checking for mcrypt_module_open in -lmcrypt" >&5
+echo "configure:58135: checking for mcrypt_module_open in -lmcrypt" >&5
ac_lib_var=`echo mcrypt'_'mcrypt_module_open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -59030,7 +58139,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lmcrypt $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 59031 "configure"
+#line 58143 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -59041,7 +58150,7 @@
mcrypt_module_open()
; return 0; }
EOF
-if { (eval echo configure:59042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:58154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -59474,7 +58583,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -59514,7 +58623,7 @@
php_with_mssql=no
echo $ac_n "checking for MSSQL support via FreeTDS""... $ac_c" 1>&6
-echo "configure:59515: checking for MSSQL support via FreeTDS" >&5
+echo "configure:58627: checking for MSSQL support via FreeTDS" >&5
# Check whether --with-mssql or --without-mssql was given.
if test "${with_mssql+set}" = set; then
withval="$with_mssql"
@@ -59978,7 +59087,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -60012,7 +59121,7 @@
fi
echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:60013: checking for dnet_addr in -ldnet_stub" >&5
+echo "configure:59125: checking for dnet_addr in -ldnet_stub" >&5
ac_lib_var=`echo dnet_stub'_'dnet_addr | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -60020,7 +59129,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldnet_stub $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 60021 "configure"
+#line 59133 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -60031,7 +59140,7 @@
dnet_addr()
; return 0; }
EOF
-if { (eval echo configure:60032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:59144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -60175,7 +59284,7 @@
php_with_mysql=no
echo $ac_n "checking for MySQL support""... $ac_c" 1>&6
-echo "configure:60176: checking for MySQL support" >&5
+echo "configure:59288: checking for MySQL support" >&5
# Check whether --with-mysql or --without-mysql was given.
if test "${with_mysql+set}" = set; then
withval="$with_mysql"
@@ -60219,7 +59328,7 @@
php_with_mysql_sock=no
echo $ac_n "checking for specified location of the MySQL UNIX socket""... $ac_c" 1>&6
-echo "configure:60220: checking for specified location of the MySQL UNIX socket" >&5
+echo "configure:59332: checking for specified location of the MySQL UNIX socket" >&5
# Check whether --with-mysql-sock or --without-mysql-sock was given.
if test "${with_mysql_sock+set}" = set; then
withval="$with_mysql_sock"
@@ -60243,7 +59352,7 @@
php_with_zlib_dir=no
echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
-echo "configure:60244: checking for the location of libz" >&5
+echo "configure:59356: checking for the location of libz" >&5
# Check whether --with-zlib-dir or --without-zlib-dir was given.
if test "${with_zlib_dir+set}" = set; then
withval="$with_zlib_dir"
@@ -60417,7 +59526,7 @@
done
echo $ac_n "checking for mysql_close in -l$MYSQL_LIBNAME""... $ac_c" 1>&6
-echo "configure:60418: checking for mysql_close in -l$MYSQL_LIBNAME" >&5
+echo "configure:59530: checking for mysql_close in -l$MYSQL_LIBNAME" >&5
ac_lib_var=`echo $MYSQL_LIBNAME'_'mysql_close | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -60425,7 +59534,7 @@
ac_save_LIBS="$LIBS"
LIBS="-l$MYSQL_LIBNAME $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 60426 "configure"
+#line 59538 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -60436,7 +59545,7 @@
mysql_close()
; return 0; }
EOF
-if { (eval echo configure:60437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:59549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -60659,7 +59768,7 @@
done
echo $ac_n "checking for mysql_error in -l$MYSQL_LIBNAME""... $ac_c" 1>&6
-echo "configure:60660: checking for mysql_error in -l$MYSQL_LIBNAME" >&5
+echo "configure:59772: checking for mysql_error in -l$MYSQL_LIBNAME" >&5
ac_lib_var=`echo $MYSQL_LIBNAME'_'mysql_error | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -60667,7 +59776,7 @@
ac_save_LIBS="$LIBS"
LIBS="-l$MYSQL_LIBNAME $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 60668 "configure"
+#line 59780 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -60678,7 +59787,7 @@
mysql_error()
; return 0; }
EOF
-if { (eval echo configure:60679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:59791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -60833,7 +59942,7 @@
done
echo $ac_n "checking for mysql_errno in -l$MYSQL_LIBNAME""... $ac_c" 1>&6
-echo "configure:60834: checking for mysql_errno in -l$MYSQL_LIBNAME" >&5
+echo "configure:59946: checking for mysql_errno in -l$MYSQL_LIBNAME" >&5
ac_lib_var=`echo $MYSQL_LIBNAME'_'mysql_errno | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -60841,7 +59950,7 @@
ac_save_LIBS="$LIBS"
LIBS="-l$MYSQL_LIBNAME $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 60842 "configure"
+#line 59954 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -60852,7 +59961,7 @@
mysql_errno()
; return 0; }
EOF
-if { (eval echo configure:60853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:59965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -61046,7 +60155,7 @@
if test "$PHP_MYSQL" != "no"; then
echo $ac_n "checking for MySQL UNIX socket location""... $ac_c" 1>&6
-echo "configure:61047: checking for MySQL UNIX socket location" >&5
+echo "configure:60159: checking for MySQL UNIX socket location" >&5
if test "$PHP_MYSQL_SOCK" != "no" && test "$PHP_MYSQL_SOCK" != "yes"; then
MYSQL_SOCK=$PHP_MYSQL_SOCK
cat >> confdefs.h <<EOF
@@ -61350,7 +60459,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -61419,7 +60528,7 @@
php_with_mysqli=no
echo $ac_n "checking for MySQLi support""... $ac_c" 1>&6
-echo "configure:61420: checking for MySQLi support" >&5
+echo "configure:60532: checking for MySQLi support" >&5
# Check whether --with-mysqli or --without-mysqli was given.
if test "${with_mysqli+set}" = set; then
withval="$with_mysqli"
@@ -61463,7 +60572,7 @@
php_enable_embedded_mysqli=no
echo $ac_n "checking whether to enable embedded MySQLi support""... $ac_c" 1>&6
-echo "configure:61464: checking whether to enable embedded MySQLi support" >&5
+echo "configure:60576: checking whether to enable embedded MySQLi support" >&5
# Check whether --enable-embedded_mysqli or --disable-embedded_mysqli was given.
if test "${enable_embedded_mysqli+set}" = set; then
enableval="$enable_embedded_mysqli"
@@ -61614,7 +60723,7 @@
done
echo $ac_n "checking for mysql_set_server_option in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6
-echo "configure:61615: checking for mysql_set_server_option in -l$MYSQL_LIB_NAME" >&5
+echo "configure:60727: checking for mysql_set_server_option in -l$MYSQL_LIB_NAME" >&5
ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_set_server_option | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -61622,7 +60731,7 @@
ac_save_LIBS="$LIBS"
LIBS="-l$MYSQL_LIB_NAME $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 61623 "configure"
+#line 60735 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -61633,7 +60742,7 @@
mysql_set_server_option()
; return 0; }
EOF
-if { (eval echo configure:61634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:60746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -61881,7 +60990,7 @@
done
echo $ac_n "checking for mysql_set_character_set in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6
-echo "configure:61882: checking for mysql_set_character_set in -l$MYSQL_LIB_NAME" >&5
+echo "configure:60994: checking for mysql_set_character_set in -l$MYSQL_LIB_NAME" >&5
ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_set_character_set | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -61889,7 +60998,7 @@
ac_save_LIBS="$LIBS"
LIBS="-l$MYSQL_LIB_NAME $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 61890 "configure"
+#line 61002 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -61900,7 +61009,7 @@
mysql_set_character_set()
; return 0; }
EOF
-if { (eval echo configure:61901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:61013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -62044,7 +61153,7 @@
done
echo $ac_n "checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6
-echo "configure:62045: checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME" >&5
+echo "configure:61157: checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME" >&5
ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_stmt_next_result | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -62052,7 +61161,7 @@
ac_save_LIBS="$LIBS"
LIBS="-l$MYSQL_LIB_NAME $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 62053 "configure"
+#line 61165 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -62063,7 +61172,7 @@
mysql_stmt_next_result()
; return 0; }
EOF
-if { (eval echo configure:62064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:61176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -62364,7 +61473,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -62466,7 +61575,7 @@
php_with_oci8=no
echo $ac_n "checking for Oracle Database OCI8 support""... $ac_c" 1>&6
-echo "configure:62467: checking for Oracle Database OCI8 support" >&5
+echo "configure:61579: checking for Oracle Database OCI8 support" >&5
# Check whether --with-oci8 or --without-oci8 was given.
if test "${with_oci8+set}" = set; then
withval="$with_oci8"
@@ -62514,7 +61623,7 @@
echo $ac_n "checking PHP version""... $ac_c" 1>&6
-echo "configure:62515: checking PHP version" >&5
+echo "configure:61627: checking PHP version" >&5
tmp_version=$PHP_VERSION
if test -z "$tmp_version"; then
@@ -62546,7 +61655,7 @@
echo $ac_n "checking size of long int""... $ac_c" 1>&6
-echo "configure:62547: checking size of long int" >&5
+echo "configure:61659: checking size of long int" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -62554,7 +61663,7 @@
ac_cv_sizeof_long_int=4
else
cat > conftest.$ac_ext <<EOF
-#line 62555 "configure"
+#line 61667 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -62565,7 +61674,7 @@
exit(0);
}
EOF
-if { (eval echo configure:62566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:61678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long_int=`cat conftestval`
else
@@ -62585,7 +61694,7 @@
echo $ac_n "checking checking if we're on a 64-bit platform""... $ac_c" 1>&6
-echo "configure:62586: checking checking if we're on a 64-bit platform" >&5
+echo "configure:61698: checking checking if we're on a 64-bit platform" >&5
if test "$ac_cv_sizeof_long_int" = "4"; then
echo "$ac_t""no" 1>&6
PHP_OCI8_OH_LIBDIR=lib32
@@ -62629,7 +61738,7 @@
if test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then
echo $ac_n "checking Oracle ORACLE_HOME install directory""... $ac_c" 1>&6
-echo "configure:62630: checking Oracle ORACLE_HOME install directory" >&5
+echo "configure:61742: checking Oracle ORACLE_HOME install directory" >&5
if test "$PHP_OCI8" = "yes"; then
OCI8_DIR=$ORACLE_HOME
@@ -62640,7 +61749,7 @@
echo $ac_n "checking ORACLE_HOME library validity""... $ac_c" 1>&6
-echo "configure:62641: checking ORACLE_HOME library validity" >&5
+echo "configure:61753: checking ORACLE_HOME library validity" >&5
if test ! -d "$OCI8_DIR"; then
{ echo "configure: error: ${OCI8_DIR} is not a directory" 1>&2; exit 1; }
fi
@@ -62981,7 +62090,7 @@
echo $ac_n "checking Oracle library version compatibility""... $ac_c" 1>&6
-echo "configure:62982: checking Oracle library version compatibility" >&5
+echo "configure:62094: checking Oracle library version compatibility" >&5
OCI8_LCS_BASE=$OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME
OCI8_LCS=`ls $OCI8_LCS_BASE.*.1 2> /dev/null | tail -1` # Oracle 10g, 11g etc
if test -s "$OCI8_DIR/orainst/unix.rgs"; then
@@ -63111,7 +62220,7 @@
done
echo $ac_n "checking for OCIEnvNlsCreate in -lclntsh""... $ac_c" 1>&6
-echo "configure:63112: checking for OCIEnvNlsCreate in -lclntsh" >&5
+echo "configure:62224: checking for OCIEnvNlsCreate in -lclntsh" >&5
ac_lib_var=`echo clntsh'_'OCIEnvNlsCreate | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -63119,7 +62228,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lclntsh $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 63120 "configure"
+#line 62232 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -63130,7 +62239,7 @@
OCIEnvNlsCreate()
; return 0; }
EOF
-if { (eval echo configure:63131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:62243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -63494,7 +62603,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -63563,7 +62672,7 @@
else
echo $ac_n "checking Oracle Instant Client directory""... $ac_c" 1>&6
-echo "configure:63564: checking Oracle Instant Client directory" >&5
+echo "configure:62676: checking Oracle Instant Client directory" >&5
if test "$PHP_OCI8_INSTANT_CLIENT" = "yes"; then
PHP_OCI8_INSTANT_CLIENT=`ls -d /usr/lib/oracle/*/client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib/libclntsh.* 2> /dev/null | tail -1 | $PHP_OCI8_SED -e 's#/libclntsh[^/]*##'`
@@ -63576,7 +62685,7 @@
OCI8_DIR=$PHP_OCI8_INSTANT_CLIENT
echo $ac_n "checking Oracle Instant Client SDK header directory""... $ac_c" 1>&6
-echo "configure:63577: checking Oracle Instant Client SDK header directory" >&5
+echo "configure:62689: checking Oracle Instant Client SDK header directory" >&5
OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!^/usr/lib/oracle/\(.*\)/client\('${PHP_OCI8_IC_LIBDIR_SUFFIX}'\)*/lib/*$!/usr/include/oracle/\1/client\2!'`
@@ -63785,7 +62894,7 @@
echo $ac_n "checking Oracle Instant Client library version compatibility""... $ac_c" 1>&6
-echo "configure:63786: checking Oracle Instant Client library version compatibility" >&5
+echo "configure:62898: checking Oracle Instant Client library version compatibility" >&5
OCI8_LCS_BASE=$PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME
OCI8_LCS=`ls $OCI8_LCS_BASE.*.1 2> /dev/null | tail -1` # Oracle 10g, 11g etc
OCI8_NNZ=`ls $PHP_OCI8_INSTANT_CLIENT/libnnz*.$SHLIB_SUFFIX_NAME 2> /dev/null | tail -1`
@@ -64129,7 +63238,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -64246,7 +63355,7 @@
if test "$PHP_ADABAS" != "no"; then
echo $ac_n "checking for Adabas support""... $ac_c" 1>&6
-echo "configure:64247: checking for Adabas support" >&5
+echo "configure:63359: checking for Adabas support" >&5
if test "$PHP_ADABAS" = "yes"; then
PHP_ADABAS=/usr/local
fi
@@ -64449,7 +63558,7 @@
if test "$PHP_SAPDB" != "no"; then
echo $ac_n "checking for SAP DB support""... $ac_c" 1>&6
-echo "configure:64450: checking for SAP DB support" >&5
+echo "configure:63562: checking for SAP DB support" >&5
if test "$PHP_SAPDB" = "yes"; then
PHP_SAPDB=/usr/local
fi
@@ -64582,7 +63691,7 @@
if test "$PHP_SOLID" != "no"; then
echo $ac_n "checking for Solid support""... $ac_c" 1>&6
-echo "configure:64583: checking for Solid support" >&5
+echo "configure:63695: checking for Solid support" >&5
if test "$PHP_SOLID" = "yes"; then
PHP_SOLID=/usr/local/solid
fi
@@ -64609,7 +63718,7 @@
echo "$ac_t""$ext_output" 1>&6
echo $ac_n "checking Solid library file""... $ac_c" 1>&6
-echo "configure:64610: checking Solid library file" >&5
+echo "configure:63722: checking Solid library file" >&5
ac_solid_uname_r=`uname -r 2>/dev/null`
ac_solid_uname_s=`uname -s 2>/dev/null`
case $ac_solid_uname_s in
@@ -64730,7 +63839,7 @@
if test "$PHP_IBM_DB2" != "no"; then
echo $ac_n "checking for IBM DB2 support""... $ac_c" 1>&6
-echo "configure:64731: checking for IBM DB2 support" >&5
+echo "configure:63843: checking for IBM DB2 support" >&5
if test "$PHP_IBM_DB2" = "yes"; then
ODBC_INCDIR=/home/db2inst1/sqllib/include
ODBC_LIBDIR=/home/db2inst1/sqllib/lib
@@ -64761,7 +63870,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 64762 "configure"
+#line 63874 "configure"
#include "confdefs.h"
@@ -64772,7 +63881,7 @@
}
EOF
-if { (eval echo configure:64773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:63885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
LIBS=$old_LIBS
@@ -64853,7 +63962,7 @@
if test "$PHP_ODBCROUTER" != "no"; then
echo $ac_n "checking for ODBCRouter.com support""... $ac_c" 1>&6
-echo "configure:64854: checking for ODBCRouter.com support" >&5
+echo "configure:63966: checking for ODBCRouter.com support" >&5
if test "$PHP_ODBCROUTER" = "yes"; then
PHP_ODBCROUTER=/usr
fi
@@ -64917,7 +64026,7 @@
if test "$PHP_EMPRESS" != "no"; then
echo $ac_n "checking for Empress support""... $ac_c" 1>&6
-echo "configure:64918: checking for Empress support" >&5
+echo "configure:64030: checking for Empress support" >&5
if test "$PHP_EMPRESS" = "yes"; then
ODBC_INCDIR=$EMPRESSPATH/include/odbc
ODBC_LIBDIR=$EMPRESSPATH/shlib
@@ -64935,7 +64044,7 @@
echo "$ac_t""$ext_output" 1>&6
echo $ac_n "checking Empress library file""... $ac_c" 1>&6
-echo "configure:64936: checking Empress library file" >&5
+echo "configure:64048: checking Empress library file" >&5
ODBC_LIBS=`echo $ODBC_LIBDIR/libempodbccl.so | cut -d' ' -f1`
if test ! -f $ODBC_LIBS; then
ODBC_LIBS=`echo $ODBC_LIBDIR/libempodbccl.so | cut -d' ' -f1`
@@ -64991,7 +64100,7 @@
if test "$PHP_EMPRESS_BCS" != "no"; then
echo $ac_n "checking for Empress local access support""... $ac_c" 1>&6
-echo "configure:64992: checking for Empress local access support" >&5
+echo "configure:64104: checking for Empress local access support" >&5
if test "$PHP_EMPRESS_BCS" = "yes"; then
ODBC_INCDIR=$EMPRESSPATH/include/odbc
ODBC_LIBDIR=$EMPRESSPATH/shlib
@@ -65025,7 +64134,7 @@
echo "$ac_t""$ext_output" 1>&6
echo $ac_n "checking Empress local access library file""... $ac_c" 1>&6
-echo "configure:65026: checking Empress local access library file" >&5
+echo "configure:64138: checking Empress local access library file" >&5
ODBCBCS_LIBS=`echo $ODBC_LIBDIR/libempodbcbcs.a | cut -d' ' -f1`
if test ! -f $ODBCBCS_LIBS; then
ODBCBCS_LIBS=`echo $ODBC_LIBDIR/libempodbcbcs.a | cut -d' ' -f1`
@@ -65081,7 +64190,7 @@
if test "$PHP_BIRDSTEP" != "no"; then
echo $ac_n "checking for Birdstep support""... $ac_c" 1>&6
-echo "configure:65082: checking for Birdstep support" >&5
+echo "configure:64194: checking for Birdstep support" >&5
if test "$PHP_BIRDSTEP" = "yes"; then
ODBC_INCDIR=/usr/local/birdstep/include
ODBC_LIBDIR=/usr/local/birdstep/lib
@@ -65193,7 +64302,7 @@
if test "$PHP_CUSTOM_ODBC" != "no"; then
echo $ac_n "checking for a custom ODBC support""... $ac_c" 1>&6
-echo "configure:65194: checking for a custom ODBC support" >&5
+echo "configure:64306: checking for a custom ODBC support" >&5
if test "$PHP_CUSTOM_ODBC" = "yes"; then
PHP_CUSTOM_ODBC=/usr/local
fi
@@ -65257,7 +64366,7 @@
if test "$PHP_IODBC" != "no"; then
echo $ac_n "checking for iODBC support""... $ac_c" 1>&6
-echo "configure:65258: checking for iODBC support" >&5
+echo "configure:64370: checking for iODBC support" >&5
if test "$PHP_IODBC" = "yes"; then
PHP_IODBC=/usr/local
fi
@@ -65403,7 +64512,7 @@
if test "$PHP_ESOOB" != "no"; then
echo $ac_n "checking for Easysoft ODBC-ODBC Bridge support""... $ac_c" 1>&6
-echo "configure:65404: checking for Easysoft ODBC-ODBC Bridge support" >&5
+echo "configure:64516: checking for Easysoft ODBC-ODBC Bridge support" >&5
if test "$PHP_ESOOB" = "yes"; then
PHP_ESOOB=/usr/local/easysoft/oob/client
fi
@@ -65467,7 +64576,7 @@
if test "$PHP_UNIXODBC" != "no"; then
echo $ac_n "checking for unixODBC support""... $ac_c" 1>&6
-echo "configure:65468: checking for unixODBC support" >&5
+echo "configure:64580: checking for unixODBC support" >&5
if test "$PHP_UNIXODBC" = "yes"; then
PHP_UNIXODBC=/usr/local
fi
@@ -65536,7 +64645,7 @@
if test "$PHP_DBMAKER" != "no"; then
echo $ac_n "checking for DBMaker support""... $ac_c" 1>&6
-echo "configure:65537: checking for DBMaker support" >&5
+echo "configure:64649: checking for DBMaker support" >&5
if test "$PHP_DBMAKER" = "yes"; then
# find dbmaker's home directory
DBMAKER_HOME=`grep "^dbmaker:" /etc/passwd | $AWK -F: '{print $6}'`
@@ -66058,7 +65167,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -66098,7 +65207,7 @@
php_enable_pcntl=no
echo $ac_n "checking whether to enable pcntl support""... $ac_c" 1>&6
-echo "configure:66099: checking whether to enable pcntl support" >&5
+echo "configure:65211: checking whether to enable pcntl support" >&5
# Check whether --enable-pcntl or --disable-pcntl was given.
if test "${enable_pcntl+set}" = set; then
enableval="$enable_pcntl"
@@ -66142,12 +65251,12 @@
for ac_func in fork
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:66143: checking for $ac_func" >&5
+echo "configure:65255: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 66148 "configure"
+#line 65260 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -66170,7 +65279,7 @@
; return 0; }
EOF
-if { (eval echo configure:66171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:65283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -66201,12 +65310,12 @@
for ac_func in waitpid
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:66202: checking for $ac_func" >&5
+echo "configure:65314: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 66207 "configure"
+#line 65319 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -66229,7 +65338,7 @@
; return 0; }
EOF
-if { (eval echo configure:66230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:65342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -66260,12 +65369,12 @@
for ac_func in sigaction
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:66261: checking for $ac_func" >&5
+echo "configure:65373: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 66266 "configure"
+#line 65378 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -66288,7 +65397,7 @@
; return 0; }
EOF
-if { (eval echo configure:66289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:65401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -66319,12 +65428,12 @@
for ac_func in getpriority setpriority wait3 sigprocmask sigwaitinfo sigtimedwait
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:66320: checking for $ac_func" >&5
+echo "configure:65432: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 66325 "configure"
+#line 65437 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -66347,7 +65456,7 @@
; return 0; }
EOF
-if { (eval echo configure:66348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:65460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -66630,7 +65739,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -66672,7 +65781,7 @@
php_enable_pdo=yes
echo $ac_n "checking whether to enable PDO support""... $ac_c" 1>&6
-echo "configure:66673: checking whether to enable PDO support" >&5
+echo "configure:65785: checking whether to enable PDO support" >&5
# Check whether --enable-pdo or --disable-pdo was given.
if test "${enable_pdo+set}" = set; then
enableval="$enable_pdo"
@@ -67014,7 +66123,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -67106,7 +66215,7 @@
php_with_pdo_dblib=no
echo $ac_n "checking for PDO_DBLIB support via FreeTDS""... $ac_c" 1>&6
-echo "configure:67107: checking for PDO_DBLIB support via FreeTDS" >&5
+echo "configure:66219: checking for PDO_DBLIB support via FreeTDS" >&5
# Check whether --with-pdo-dblib or --without-pdo-dblib was given.
if test "${with_pdo_dblib+set}" = set; then
withval="$with_pdo_dblib"
@@ -67323,13 +66432,13 @@
echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-echo "configure:67324: checking for PDO includes" >&5
+echo "configure:66436: checking for PDO includes" >&5
if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-echo "configure:67330: checking for PDO includes" >&5
+echo "configure:66442: checking for PDO includes" >&5
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
pdo_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
@@ -67609,7 +66718,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -67643,7 +66752,7 @@
fi
echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:67644: checking for dnet_addr in -ldnet_stub" >&5
+echo "configure:66756: checking for dnet_addr in -ldnet_stub" >&5
ac_lib_var=`echo dnet_stub'_'dnet_addr | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -67651,7 +66760,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldnet_stub $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 67652 "configure"
+#line 66764 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -67662,7 +66771,7 @@
dnet_addr()
; return 0; }
EOF
-if { (eval echo configure:67663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:66775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -67823,7 +66932,7 @@
php_with_pdo_firebird=no
echo $ac_n "checking for Firebird support for PDO""... $ac_c" 1>&6
-echo "configure:67824: checking for Firebird support for PDO" >&5
+echo "configure:66936: checking for Firebird support for PDO" >&5
# Check whether --with-pdo-firebird or --without-pdo-firebird was given.
if test "${with_pdo_firebird+set}" = set; then
withval="$with_pdo_firebird"
@@ -67977,7 +67086,7 @@
done
echo $ac_n "checking for isc_detach_database in -lfbclient""... $ac_c" 1>&6
-echo "configure:67978: checking for isc_detach_database in -lfbclient" >&5
+echo "configure:67090: checking for isc_detach_database in -lfbclient" >&5
ac_lib_var=`echo fbclient'_'isc_detach_database | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -67985,7 +67094,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lfbclient $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 67986 "configure"
+#line 67098 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -67996,7 +67105,7 @@
isc_detach_database()
; return 0; }
EOF
-if { (eval echo configure:67997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:67109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -68123,7 +67232,7 @@
done
echo $ac_n "checking for isc_detach_database in -lgds""... $ac_c" 1>&6
-echo "configure:68124: checking for isc_detach_database in -lgds" >&5
+echo "configure:67236: checking for isc_detach_database in -lgds" >&5
ac_lib_var=`echo gds'_'isc_detach_database | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -68131,7 +67240,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lgds $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 68132 "configure"
+#line 67244 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -68142,7 +67251,7 @@
isc_detach_database()
; return 0; }
EOF
-if { (eval echo configure:68143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:67255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -68269,7 +67378,7 @@
done
echo $ac_n "checking for isc_detach_database in -lib_util""... $ac_c" 1>&6
-echo "configure:68270: checking for isc_detach_database in -lib_util" >&5
+echo "configure:67382: checking for isc_detach_database in -lib_util" >&5
ac_lib_var=`echo ib_util'_'isc_detach_database | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -68277,7 +67386,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lib_util $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 68278 "configure"
+#line 67390 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -68288,7 +67397,7 @@
isc_detach_database()
; return 0; }
EOF
-if { (eval echo configure:68289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:67401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -68333,13 +67442,13 @@
echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-echo "configure:68334: checking for PDO includes" >&5
+echo "configure:67446: checking for PDO includes" >&5
if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-echo "configure:68340: checking for PDO includes" >&5
+echo "configure:67452: checking for PDO includes" >&5
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
pdo_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
@@ -68749,7 +67858,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -68811,7 +67920,7 @@
php_with_pdo_mysql=no
echo $ac_n "checking for MySQL support for PDO""... $ac_c" 1>&6
-echo "configure:68812: checking for MySQL support for PDO" >&5
+echo "configure:67924: checking for MySQL support for PDO" >&5
# Check whether --with-pdo-mysql or --without-pdo-mysql was given.
if test "${with_pdo_mysql+set}" = set; then
withval="$with_pdo_mysql"
@@ -68856,7 +67965,7 @@
php_with_zlib_dir=no
echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
-echo "configure:68857: checking for the location of libz" >&5
+echo "configure:67969: checking for the location of libz" >&5
# Check whether --with-zlib-dir or --without-zlib-dir was given.
if test "${with_zlib_dir+set}" = set; then
withval="$with_zlib_dir"
@@ -68920,14 +68029,14 @@
echo $ac_n "checking for mysql_config""... $ac_c" 1>&6
-echo "configure:68921: checking for mysql_config" >&5
+echo "configure:68033: checking for mysql_config" >&5
if test -n "$PDO_MYSQL_CONFIG"; then
echo "$ac_t""$PDO_MYSQL_CONFIG" 1>&6
if test "x$SED" = "x"; then
# Extract the first word of "sed", so it can be a program name with args.
set dummy sed; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:68928: checking for $ac_word" >&5
+echo "configure:68040: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_SED'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -68971,7 +68080,7 @@
elif test -n "$PDO_MYSQL_DIR"; then
echo "$ac_t""not found" 1>&6
echo $ac_n "checking for mysql install under $PDO_MYSQL_DIR""... $ac_c" 1>&6
-echo "configure:68972: checking for mysql install under $PDO_MYSQL_DIR" >&5
+echo "configure:68084: checking for mysql install under $PDO_MYSQL_DIR" >&5
if test -r $PDO_MYSQL_DIR/include/mysql; then
PDO_MYSQL_INC_DIR=$PDO_MYSQL_DIR/include/mysql
else
@@ -69125,7 +68234,7 @@
done
echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6
-echo "configure:69126: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
+echo "configure:68238: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
ac_lib_var=`echo $PDO_MYSQL_LIBNAME'_'mysql_query | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -69133,7 +68242,7 @@
ac_save_LIBS="$LIBS"
LIBS="-l$PDO_MYSQL_LIBNAME $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 69134 "configure"
+#line 68246 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -69144,7 +68253,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:69145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:68257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -69497,7 +68606,7 @@
done
echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6
-echo "configure:69498: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
+echo "configure:68610: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
ac_lib_var=`echo $PDO_MYSQL_LIBNAME'_'mysql_query | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -69505,7 +68614,7 @@
ac_save_LIBS="$LIBS"
LIBS="-l$PDO_MYSQL_LIBNAME $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 69506 "configure"
+#line 68618 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -69516,7 +68625,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:69517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:68629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -69671,7 +68780,7 @@
done
echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6
-echo "configure:69672: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
+echo "configure:68784: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
ac_lib_var=`echo $PDO_MYSQL_LIBNAME'_'mysql_query | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -69679,7 +68788,7 @@
ac_save_LIBS="$LIBS"
LIBS="-l$PDO_MYSQL_LIBNAME $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 69680 "configure"
+#line 68792 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -69690,7 +68799,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:69691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:68803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -69864,12 +68973,12 @@
for ac_func in mysql_commit mysql_stmt_prepare mysql_next_result mysql_sqlstate
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:69865: checking for $ac_func" >&5
+echo "configure:68977: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 69870 "configure"
+#line 68982 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -69892,7 +69001,7 @@
; return 0; }
EOF
-if { (eval echo configure:69893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:69005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -69922,13 +69031,13 @@
echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-echo "configure:69923: checking for PDO includes" >&5
+echo "configure:69035: checking for PDO includes" >&5
if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-echo "configure:69929: checking for PDO includes" >&5
+echo "configure:69041: checking for PDO includes" >&5
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
pdo_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
@@ -70215,7 +69324,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -70313,7 +69422,7 @@
php_with_pdo_oci=no
echo $ac_n "checking Oracle OCI support for PDO""... $ac_c" 1>&6
-echo "configure:70314: checking Oracle OCI support for PDO" >&5
+echo "configure:69426: checking Oracle OCI support for PDO" >&5
# Check whether --with-pdo-oci or --without-pdo-oci was given.
if test "${with_pdo_oci+set}" = set; then
withval="$with_pdo_oci"
@@ -70360,7 +69469,7 @@
fi
echo $ac_n "checking Oracle Install-Dir""... $ac_c" 1>&6
-echo "configure:70361: checking Oracle Install-Dir" >&5
+echo "configure:69473: checking Oracle Install-Dir" >&5
if test "$PHP_PDO_OCI" = "yes" || test -z "$PHP_PDO_OCI"; then
PDO_OCI_DIR=$ORACLE_HOME
else
@@ -70369,7 +69478,7 @@
echo "$ac_t""$PHP_PDO_OCI" 1>&6
echo $ac_n "checking if that is sane""... $ac_c" 1>&6
-echo "configure:70370: checking if that is sane" >&5
+echo "configure:69482: checking if that is sane" >&5
if test -z "$PDO_OCI_DIR"; then
{ echo "configure: error:
You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_HOME.
@@ -70380,7 +69489,7 @@
if test "instantclient" = "`echo $PDO_OCI_DIR | cut -d, -f1`" ; then
echo $ac_n "checking size of long int""... $ac_c" 1>&6
-echo "configure:70381: checking size of long int" >&5
+echo "configure:69493: checking size of long int" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -70388,7 +69497,7 @@
ac_cv_sizeof_long_int=4
else
cat > conftest.$ac_ext <<EOF
-#line 70389 "configure"
+#line 69501 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -70399,7 +69508,7 @@
exit(0);
}
EOF
-if { (eval echo configure:70400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:69512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long_int=`cat conftestval`
else
@@ -70433,7 +69542,7 @@
fi
fi
echo $ac_n "checking for oci.h""... $ac_c" 1>&6
-echo "configure:70434: checking for oci.h" >&5
+echo "configure:69546: checking for oci.h" >&5
if test -f $PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/oci.h ; then
if test "$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR" != "/usr/include"; then
@@ -70582,7 +69691,7 @@
else
echo $ac_n "checking size of long int""... $ac_c" 1>&6
-echo "configure:70583: checking size of long int" >&5
+echo "configure:69695: checking size of long int" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -70590,7 +69699,7 @@
ac_cv_sizeof_long_int=4
else
cat > conftest.$ac_ext <<EOF
-#line 70591 "configure"
+#line 69703 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -70601,7 +69710,7 @@
exit(0);
}
EOF
-if { (eval echo configure:70602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:69714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long_int=`cat conftestval`
else
@@ -70621,7 +69730,7 @@
echo $ac_n "checking if we're on a 64-bit platform""... $ac_c" 1>&6
-echo "configure:70622: checking if we're on a 64-bit platform" >&5
+echo "configure:69734: checking if we're on a 64-bit platform" >&5
if test "$ac_cv_sizeof_long_int" = "4" ; then
echo "$ac_t""no" 1>&6
TMP_PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib32"
@@ -70631,7 +69740,7 @@
fi
echo $ac_n "checking OCI8 libraries dir""... $ac_c" 1>&6
-echo "configure:70632: checking OCI8 libraries dir" >&5
+echo "configure:69744: checking OCI8 libraries dir" >&5
if test -d "$PDO_OCI_DIR/lib" && test ! -d "$PDO_OCI_DIR/lib32"; then
PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib"
elif test ! -d "$PDO_OCI_DIR/lib" && test -d "$PDO_OCI_DIR/lib32"; then
@@ -70998,7 +70107,7 @@
fi
echo $ac_n "checking Oracle version""... $ac_c" 1>&6
-echo "configure:70999: checking Oracle version" >&5
+echo "configure:70111: checking Oracle version" >&5
for OCI_VER in $SUPPORTED_LIB_VERS; do
if test -f $PDO_OCI_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.$OCI_VER; then
PDO_OCI_VERSION="$OCI_VER"
@@ -71180,7 +70289,7 @@
done
echo $ac_n "checking for OCIEnvCreate in -lclntsh""... $ac_c" 1>&6
-echo "configure:71181: checking for OCIEnvCreate in -lclntsh" >&5
+echo "configure:70293: checking for OCIEnvCreate in -lclntsh" >&5
ac_lib_var=`echo clntsh'_'OCIEnvCreate | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -71188,7 +70297,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lclntsh $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 71189 "configure"
+#line 70301 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -71199,7 +70308,7 @@
OCIEnvCreate()
; return 0; }
EOF
-if { (eval echo configure:71200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:70312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -71333,7 +70442,7 @@
done
echo $ac_n "checking for OCIEnvNlsCreate in -lclntsh""... $ac_c" 1>&6
-echo "configure:71334: checking for OCIEnvNlsCreate in -lclntsh" >&5
+echo "configure:70446: checking for OCIEnvNlsCreate in -lclntsh" >&5
ac_lib_var=`echo clntsh'_'OCIEnvNlsCreate | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -71341,7 +70450,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lclntsh $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 71342 "configure"
+#line 70454 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -71352,7 +70461,7 @@
OCIEnvNlsCreate()
; return 0; }
EOF
-if { (eval echo configure:71353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:70465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -71486,7 +70595,7 @@
done
echo $ac_n "checking for OCILobIsTemporary in -lclntsh""... $ac_c" 1>&6
-echo "configure:71487: checking for OCILobIsTemporary in -lclntsh" >&5
+echo "configure:70599: checking for OCILobIsTemporary in -lclntsh" >&5
ac_lib_var=`echo clntsh'_'OCILobIsTemporary | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -71494,7 +70603,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lclntsh $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 71495 "configure"
+#line 70607 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -71505,7 +70614,7 @@
OCILobIsTemporary()
; return 0; }
EOF
-if { (eval echo configure:71506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:70618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -71635,7 +70744,7 @@
done
echo $ac_n "checking for OCILobIsTemporary in -locijdbc8""... $ac_c" 1>&6
-echo "configure:71636: checking for OCILobIsTemporary in -locijdbc8" >&5
+echo "configure:70748: checking for OCILobIsTemporary in -locijdbc8" >&5
ac_lib_var=`echo ocijdbc8'_'OCILobIsTemporary | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -71643,7 +70752,7 @@
ac_save_LIBS="$LIBS"
LIBS="-locijdbc8 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 71644 "configure"
+#line 70756 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -71654,7 +70763,7 @@
OCILobIsTemporary()
; return 0; }
EOF
-if { (eval echo configure:71655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:70767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -71815,7 +70924,7 @@
done
echo $ac_n "checking for OCICollAssign in -lclntsh""... $ac_c" 1>&6
-echo "configure:71816: checking for OCICollAssign in -lclntsh" >&5
+echo "configure:70928: checking for OCICollAssign in -lclntsh" >&5
ac_lib_var=`echo clntsh'_'OCICollAssign | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -71823,7 +70932,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lclntsh $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 71824 "configure"
+#line 70936 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -71834,7 +70943,7 @@
OCICollAssign()
; return 0; }
EOF
-if { (eval echo configure:71835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:70947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -71968,7 +71077,7 @@
done
echo $ac_n "checking for OCIStmtFetch2 in -lclntsh""... $ac_c" 1>&6
-echo "configure:71969: checking for OCIStmtFetch2 in -lclntsh" >&5
+echo "configure:71081: checking for OCIStmtFetch2 in -lclntsh" >&5
ac_lib_var=`echo clntsh'_'OCIStmtFetch2 | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -71976,7 +71085,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lclntsh $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 71977 "configure"
+#line 71089 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -71987,7 +71096,7 @@
OCIStmtFetch2()
; return 0; }
EOF
-if { (eval echo configure:71988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:71100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -72026,13 +71135,13 @@
echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-echo "configure:72027: checking for PDO includes" >&5
+echo "configure:71139: checking for PDO includes" >&5
if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-echo "configure:72033: checking for PDO includes" >&5
+echo "configure:71145: checking for PDO includes" >&5
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
pdo_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
@@ -72311,7 +71420,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -72400,7 +71509,7 @@
php_with_pdo_odbc=no
echo $ac_n "checking for ODBC v3 support for PDO""... $ac_c" 1>&6
-echo "configure:72401: checking for ODBC v3 support for PDO" >&5
+echo "configure:71513: checking for ODBC v3 support for PDO" >&5
# Check whether --with-pdo-odbc or --without-pdo-odbc was given.
if test "${with_pdo_odbc+set}" = set; then
withval="$with_pdo_odbc"
@@ -72452,13 +71561,13 @@
echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-echo "configure:72453: checking for PDO includes" >&5
+echo "configure:71565: checking for PDO includes" >&5
if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-echo "configure:72459: checking for PDO includes" >&5
+echo "configure:71571: checking for PDO includes" >&5
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
pdo_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
@@ -72479,7 +71588,7 @@
echo $ac_n "checking for selected PDO ODBC flavour""... $ac_c" 1>&6
-echo "configure:72480: checking for selected PDO ODBC flavour" >&5
+echo "configure:71592: checking for selected PDO ODBC flavour" >&5
pdo_odbc_flavour="`echo $PHP_PDO_ODBC | cut -d, -f1`"
pdo_odbc_dir="`echo $PHP_PDO_ODBC | cut -d, -f2`"
@@ -72558,7 +71667,7 @@
echo $ac_n "checking for odbc.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-echo "configure:72559: checking for odbc.h in $PDO_ODBC_INCDIR" >&5
+echo "configure:71671: checking for odbc.h in $PDO_ODBC_INCDIR" >&5
if test -f "$PDO_ODBC_INCDIR/odbc.h"; then
php_pdo_have_header=yes
cat >> confdefs.h <<\EOF
@@ -72572,7 +71681,7 @@
echo $ac_n "checking for odbcsdk.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-echo "configure:72573: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5
+echo "configure:71685: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5
if test -f "$PDO_ODBC_INCDIR/odbcsdk.h"; then
php_pdo_have_header=yes
cat >> confdefs.h <<\EOF
@@ -72586,7 +71695,7 @@
echo $ac_n "checking for iodbc.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-echo "configure:72587: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5
+echo "configure:71699: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5
if test -f "$PDO_ODBC_INCDIR/iodbc.h"; then
php_pdo_have_header=yes
cat >> confdefs.h <<\EOF
@@ -72600,7 +71709,7 @@
echo $ac_n "checking for sqlunix.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-echo "configure:72601: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5
+echo "configure:71713: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5
if test -f "$PDO_ODBC_INCDIR/sqlunix.h"; then
php_pdo_have_header=yes
cat >> confdefs.h <<\EOF
@@ -72614,7 +71723,7 @@
echo $ac_n "checking for sqltypes.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-echo "configure:72615: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5
+echo "configure:71727: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5
if test -f "$PDO_ODBC_INCDIR/sqltypes.h"; then
php_pdo_have_header=yes
cat >> confdefs.h <<\EOF
@@ -72628,7 +71737,7 @@
echo $ac_n "checking for sqlucode.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-echo "configure:72629: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5
+echo "configure:71741: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5
if test -f "$PDO_ODBC_INCDIR/sqlucode.h"; then
php_pdo_have_header=yes
cat >> confdefs.h <<\EOF
@@ -72642,7 +71751,7 @@
echo $ac_n "checking for sql.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-echo "configure:72643: checking for sql.h in $PDO_ODBC_INCDIR" >&5
+echo "configure:71755: checking for sql.h in $PDO_ODBC_INCDIR" >&5
if test -f "$PDO_ODBC_INCDIR/sql.h"; then
php_pdo_have_header=yes
cat >> confdefs.h <<\EOF
@@ -72656,7 +71765,7 @@
echo $ac_n "checking for isql.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-echo "configure:72657: checking for isql.h in $PDO_ODBC_INCDIR" >&5
+echo "configure:71769: checking for isql.h in $PDO_ODBC_INCDIR" >&5
if test -f "$PDO_ODBC_INCDIR/isql.h"; then
php_pdo_have_header=yes
cat >> confdefs.h <<\EOF
@@ -72670,7 +71779,7 @@
echo $ac_n "checking for sqlext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-echo "configure:72671: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5
+echo "configure:71783: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5
if test -f "$PDO_ODBC_INCDIR/sqlext.h"; then
php_pdo_have_header=yes
cat >> confdefs.h <<\EOF
@@ -72684,7 +71793,7 @@
echo $ac_n "checking for isqlext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-echo "configure:72685: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5
+echo "configure:71797: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5
if test -f "$PDO_ODBC_INCDIR/isqlext.h"; then
php_pdo_have_header=yes
cat >> confdefs.h <<\EOF
@@ -72698,7 +71807,7 @@
echo $ac_n "checking for udbcext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-echo "configure:72699: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5
+echo "configure:71811: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5
if test -f "$PDO_ODBC_INCDIR/udbcext.h"; then
php_pdo_have_header=yes
cat >> confdefs.h <<\EOF
@@ -72712,7 +71821,7 @@
echo $ac_n "checking for sqlcli1.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-echo "configure:72713: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5
+echo "configure:71825: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5
if test -f "$PDO_ODBC_INCDIR/sqlcli1.h"; then
php_pdo_have_header=yes
cat >> confdefs.h <<\EOF
@@ -72726,7 +71835,7 @@
echo $ac_n "checking for LibraryManager.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-echo "configure:72727: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5
+echo "configure:71839: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5
if test -f "$PDO_ODBC_INCDIR/LibraryManager.h"; then
php_pdo_have_header=yes
cat >> confdefs.h <<\EOF
@@ -72740,7 +71849,7 @@
echo $ac_n "checking for cli0core.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-echo "configure:72741: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5
+echo "configure:71853: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5
if test -f "$PDO_ODBC_INCDIR/cli0core.h"; then
php_pdo_have_header=yes
cat >> confdefs.h <<\EOF
@@ -72754,7 +71863,7 @@
echo $ac_n "checking for cli0ext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-echo "configure:72755: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5
+echo "configure:71867: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5
if test -f "$PDO_ODBC_INCDIR/cli0ext.h"; then
php_pdo_have_header=yes
cat >> confdefs.h <<\EOF
@@ -72768,7 +71877,7 @@
echo $ac_n "checking for cli0cli.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-echo "configure:72769: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5
+echo "configure:71881: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5
if test -f "$PDO_ODBC_INCDIR/cli0cli.h"; then
php_pdo_have_header=yes
cat >> confdefs.h <<\EOF
@@ -72782,7 +71891,7 @@
echo $ac_n "checking for cli0defs.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-echo "configure:72783: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5
+echo "configure:71895: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5
if test -f "$PDO_ODBC_INCDIR/cli0defs.h"; then
php_pdo_have_header=yes
cat >> confdefs.h <<\EOF
@@ -72796,7 +71905,7 @@
echo $ac_n "checking for cli0env.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
-echo "configure:72797: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5
+echo "configure:71909: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5
if test -f "$PDO_ODBC_INCDIR/cli0env.h"; then
php_pdo_have_header=yes
cat >> confdefs.h <<\EOF
@@ -73002,7 +72111,7 @@
done
echo $ac_n "checking for SQLBindCol in -l$pdo_odbc_def_lib""... $ac_c" 1>&6
-echo "configure:73003: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5
+echo "configure:72115: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5
ac_lib_var=`echo $pdo_odbc_def_lib'_'SQLBindCol | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -73010,7 +72119,7 @@
ac_save_LIBS="$LIBS"
LIBS="-l$pdo_odbc_def_lib $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 73011 "configure"
+#line 72123 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -73021,7 +72130,7 @@
SQLBindCol()
; return 0; }
EOF
-if { (eval echo configure:73022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:72134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -73136,7 +72245,7 @@
done
echo $ac_n "checking for SQLAllocHandle in -l$pdo_odbc_def_lib""... $ac_c" 1>&6
-echo "configure:73137: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5
+echo "configure:72249: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5
ac_lib_var=`echo $pdo_odbc_def_lib'_'SQLAllocHandle | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -73144,7 +72253,7 @@
ac_save_LIBS="$LIBS"
LIBS="-l$pdo_odbc_def_lib $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 73145 "configure"
+#line 72257 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -73155,7 +72264,7 @@
SQLAllocHandle()
; return 0; }
EOF
-if { (eval echo configure:73156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:72268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -73465,7 +72574,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -73529,7 +72638,7 @@
php_with_pdo_pgsql=no
echo $ac_n "checking for PostgreSQL support for PDO""... $ac_c" 1>&6
-echo "configure:73530: checking for PostgreSQL support for PDO" >&5
+echo "configure:72642: checking for PostgreSQL support for PDO" >&5
# Check whether --with-pdo-pgsql or --without-pdo-pgsql was given.
if test "${with_pdo_pgsql+set}" = set; then
withval="$with_pdo_pgsql"
@@ -73588,7 +72697,7 @@
echo $ac_n "checking for pg_config""... $ac_c" 1>&6
-echo "configure:73589: checking for pg_config" >&5
+echo "configure:72701: checking for pg_config" >&5
for i in $PHP_PDO_PGSQL $PHP_PDO_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do
if test -x $i/pg_config; then
PG_CONFIG="$i/pg_config"
@@ -73652,14 +72761,14 @@
echo $ac_n "checking for openssl dependencies""... $ac_c" 1>&6
-echo "configure:73653: checking for openssl dependencies" >&5
+echo "configure:72765: checking for openssl dependencies" >&5
grep openssl $PGSQL_INCLUDE/libpq-fe.h >/dev/null 2>&1
if test $? -eq 0 ; then
echo "$ac_t""yes" 1>&6
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:73660: checking for $ac_word" >&5
+echo "configure:72772: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -73703,7 +72812,7 @@
old_LDFLAGS=$LDFLAGS
LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS"
echo $ac_n "checking for PQparameterStatus in -lpq""... $ac_c" 1>&6
-echo "configure:73704: checking for PQparameterStatus in -lpq" >&5
+echo "configure:72816: checking for PQparameterStatus in -lpq" >&5
ac_lib_var=`echo pq'_'PQparameterStatus | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -73711,7 +72820,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 73712 "configure"
+#line 72824 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -73722,7 +72831,7 @@
PQparameterStatus()
; return 0; }
EOF
-if { (eval echo configure:73723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:72835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -73751,7 +72860,7 @@
echo $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6
-echo "configure:73752: checking for PQprepare in -lpq" >&5
+echo "configure:72864: checking for PQprepare in -lpq" >&5
ac_lib_var=`echo pq'_'PQprepare | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -73759,7 +72868,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 73760 "configure"
+#line 72872 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -73770,7 +72879,7 @@
PQprepare()
; return 0; }
EOF
-if { (eval echo configure:73771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:72883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -73794,7 +72903,7 @@
fi
echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6
-echo "configure:73795: checking for PQescapeStringConn in -lpq" >&5
+echo "configure:72907: checking for PQescapeStringConn in -lpq" >&5
ac_lib_var=`echo pq'_'PQescapeStringConn | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -73802,7 +72911,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 73803 "configure"
+#line 72915 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -73813,7 +72922,7 @@
PQescapeStringConn()
; return 0; }
EOF
-if { (eval echo configure:73814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:72926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -73837,7 +72946,7 @@
fi
echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6
-echo "configure:73838: checking for PQescapeByteaConn in -lpq" >&5
+echo "configure:72950: checking for PQescapeByteaConn in -lpq" >&5
ac_lib_var=`echo pq'_'PQescapeByteaConn | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -73845,7 +72954,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 73846 "configure"
+#line 72958 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -73856,7 +72965,7 @@
PQescapeByteaConn()
; return 0; }
EOF
-if { (eval echo configure:73857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:72969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -73881,7 +72990,7 @@
echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6
-echo "configure:73882: checking for pg_encoding_to_char in -lpq" >&5
+echo "configure:72994: checking for pg_encoding_to_char in -lpq" >&5
ac_lib_var=`echo pq'_'pg_encoding_to_char | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -73889,7 +72998,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 73890 "configure"
+#line 73002 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -73900,7 +73009,7 @@
pg_encoding_to_char()
; return 0; }
EOF
-if { (eval echo configure:73901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:73013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -74064,13 +73173,13 @@
echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-echo "configure:74065: checking for PDO includes" >&5
+echo "configure:73177: checking for PDO includes" >&5
if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-echo "configure:74071: checking for PDO includes" >&5
+echo "configure:73183: checking for PDO includes" >&5
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
pdo_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
@@ -74349,7 +73458,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -74410,7 +73519,7 @@
php_with_pdo_sqlite=$PHP_PDO
echo $ac_n "checking for sqlite 3 support for PDO""... $ac_c" 1>&6
-echo "configure:74411: checking for sqlite 3 support for PDO" >&5
+echo "configure:73523: checking for sqlite 3 support for PDO" >&5
# Check whether --with-pdo-sqlite or --without-pdo-sqlite was given.
if test "${with_pdo_sqlite+set}" = set; then
withval="$with_pdo_sqlite"
@@ -74459,13 +73568,13 @@
echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-echo "configure:74460: checking for PDO includes" >&5
+echo "configure:73572: checking for PDO includes" >&5
if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-echo "configure:74466: checking for PDO includes" >&5
+echo "configure:73578: checking for PDO includes" >&5
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
pdo_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
@@ -74494,7 +73603,7 @@
PDO_SQLITE_DIR=$PHP_PDO_SQLITE
else # search default path list
echo $ac_n "checking for sqlite3 files in default path""... $ac_c" 1>&6
-echo "configure:74495: checking for sqlite3 files in default path" >&5
+echo "configure:73607: checking for sqlite3 files in default path" >&5
for i in $SEARCH_PATH ; do
if test -r $i/$SEARCH_FOR; then
PDO_SQLITE_DIR=$i
@@ -74640,7 +73749,7 @@
done
echo $ac_n "checking for $LIBSYMBOL in -l$LIBNAME""... $ac_c" 1>&6
-echo "configure:74641: checking for $LIBSYMBOL in -l$LIBNAME" >&5
+echo "configure:73753: checking for $LIBSYMBOL in -l$LIBNAME" >&5
ac_lib_var=`echo $LIBNAME'_'$LIBSYMBOL | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -74648,7 +73757,7 @@
ac_save_LIBS="$LIBS"
LIBS="-l$LIBNAME $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 74649 "configure"
+#line 73761 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -74659,7 +73768,7 @@
$LIBSYMBOL()
; return 0; }
EOF
-if { (eval echo configure:74660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:73772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -74889,7 +73998,7 @@
done
echo $ac_n "checking for sqlite3_key in -lsqlite3""... $ac_c" 1>&6
-echo "configure:74890: checking for sqlite3_key in -lsqlite3" >&5
+echo "configure:74002: checking for sqlite3_key in -lsqlite3" >&5
ac_lib_var=`echo sqlite3'_'sqlite3_key | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -74897,7 +74006,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsqlite3 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 74898 "configure"
+#line 74010 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -74908,7 +74017,7 @@
sqlite3_key()
; return 0; }
EOF
-if { (eval echo configure:74909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:74021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -75206,7 +74315,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -75558,7 +74667,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -75649,12 +74758,12 @@
for ac_func in usleep nanosleep
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:75650: checking for $ac_func" >&5
+echo "configure:74762: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 75655 "configure"
+#line 74767 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -75677,7 +74786,7 @@
; return 0; }
EOF
-if { (eval echo configure:75678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:74790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -75705,17 +74814,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:75706: checking for $ac_hdr" >&5
+echo "configure:74818: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 75711 "configure"
+#line 74823 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:75716: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:74828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -75839,7 +74948,7 @@
done
echo $ac_n "checking for fdatasync in -lrt""... $ac_c" 1>&6
-echo "configure:75840: checking for fdatasync in -lrt" >&5
+echo "configure:74952: checking for fdatasync in -lrt" >&5
ac_lib_var=`echo rt'_'fdatasync | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -75847,7 +74956,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lrt $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 75848 "configure"
+#line 74960 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -75858,7 +74967,7 @@
fdatasync()
; return 0; }
EOF
-if { (eval echo configure:75859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:74971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -75939,7 +75048,7 @@
php_with_pgsql=no
echo $ac_n "checking for PostgreSQL support""... $ac_c" 1>&6
-echo "configure:75940: checking for PostgreSQL support" >&5
+echo "configure:75052: checking for PostgreSQL support" >&5
# Check whether --with-pgsql or --without-pgsql was given.
if test "${with_pgsql+set}" = set; then
withval="$with_pgsql"
@@ -75993,7 +75102,7 @@
echo $ac_n "checking for pg_config""... $ac_c" 1>&6
-echo "configure:75994: checking for pg_config" >&5
+echo "configure:75106: checking for pg_config" >&5
for i in $PHP_PGSQL $PHP_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do
if test -x $i/pg_config; then
PG_CONFIG="$i/pg_config"
@@ -76061,7 +75170,7 @@
old_LDFLAGS=$LDFLAGS
LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS"
echo $ac_n "checking for PQescapeString in -lpq""... $ac_c" 1>&6
-echo "configure:76062: checking for PQescapeString in -lpq" >&5
+echo "configure:75174: checking for PQescapeString in -lpq" >&5
ac_lib_var=`echo pq'_'PQescapeString | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -76069,7 +75178,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 76070 "configure"
+#line 75182 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -76080,7 +75189,7 @@
PQescapeString()
; return 0; }
EOF
-if { (eval echo configure:76081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:75193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -76104,7 +75213,7 @@
fi
echo $ac_n "checking for PQunescapeBytea in -lpq""... $ac_c" 1>&6
-echo "configure:76105: checking for PQunescapeBytea in -lpq" >&5
+echo "configure:75217: checking for PQunescapeBytea in -lpq" >&5
ac_lib_var=`echo pq'_'PQunescapeBytea | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -76112,7 +75221,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 76113 "configure"
+#line 75225 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -76123,7 +75232,7 @@
PQunescapeBytea()
; return 0; }
EOF
-if { (eval echo configure:76124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:75236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -76147,7 +75256,7 @@
fi
echo $ac_n "checking for PQsetnonblocking in -lpq""... $ac_c" 1>&6
-echo "configure:76148: checking for PQsetnonblocking in -lpq" >&5
+echo "configure:75260: checking for PQsetnonblocking in -lpq" >&5
ac_lib_var=`echo pq'_'PQsetnonblocking | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -76155,7 +75264,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 76156 "configure"
+#line 75268 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -76166,7 +75275,7 @@
PQsetnonblocking()
; return 0; }
EOF
-if { (eval echo configure:76167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:75279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -76190,7 +75299,7 @@
fi
echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6
-echo "configure:76191: checking for PQcmdTuples in -lpq" >&5
+echo "configure:75303: checking for PQcmdTuples in -lpq" >&5
ac_lib_var=`echo pq'_'PQcmdTuples | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -76198,7 +75307,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 76199 "configure"
+#line 75311 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -76209,7 +75318,7 @@
PQcmdTuples()
; return 0; }
EOF
-if { (eval echo configure:76210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:75322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -76233,7 +75342,7 @@
fi
echo $ac_n "checking for PQoidValue in -lpq""... $ac_c" 1>&6
-echo "configure:76234: checking for PQoidValue in -lpq" >&5
+echo "configure:75346: checking for PQoidValue in -lpq" >&5
ac_lib_var=`echo pq'_'PQoidValue | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -76241,7 +75350,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 76242 "configure"
+#line 75354 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -76252,7 +75361,7 @@
PQoidValue()
; return 0; }
EOF
-if { (eval echo configure:76253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:75365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -76276,7 +75385,7 @@
fi
echo $ac_n "checking for PQclientEncoding in -lpq""... $ac_c" 1>&6
-echo "configure:76277: checking for PQclientEncoding in -lpq" >&5
+echo "configure:75389: checking for PQclientEncoding in -lpq" >&5
ac_lib_var=`echo pq'_'PQclientEncoding | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -76284,7 +75393,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 76285 "configure"
+#line 75397 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -76295,7 +75404,7 @@
PQclientEncoding()
; return 0; }
EOF
-if { (eval echo configure:76296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:75408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -76319,7 +75428,7 @@
fi
echo $ac_n "checking for PQparameterStatus in -lpq""... $ac_c" 1>&6
-echo "configure:76320: checking for PQparameterStatus in -lpq" >&5
+echo "configure:75432: checking for PQparameterStatus in -lpq" >&5
ac_lib_var=`echo pq'_'PQparameterStatus | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -76327,7 +75436,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 76328 "configure"
+#line 75440 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -76338,7 +75447,7 @@
PQparameterStatus()
; return 0; }
EOF
-if { (eval echo configure:76339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:75451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -76362,7 +75471,7 @@
fi
echo $ac_n "checking for PQprotocolVersion in -lpq""... $ac_c" 1>&6
-echo "configure:76363: checking for PQprotocolVersion in -lpq" >&5
+echo "configure:75475: checking for PQprotocolVersion in -lpq" >&5
ac_lib_var=`echo pq'_'PQprotocolVersion | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -76370,7 +75479,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 76371 "configure"
+#line 75483 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -76381,7 +75490,7 @@
PQprotocolVersion()
; return 0; }
EOF
-if { (eval echo configure:76382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:75494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -76405,7 +75514,7 @@
fi
echo $ac_n "checking for PQtransactionStatus in -lpq""... $ac_c" 1>&6
-echo "configure:76406: checking for PQtransactionStatus in -lpq" >&5
+echo "configure:75518: checking for PQtransactionStatus in -lpq" >&5
ac_lib_var=`echo pq'_'PQtransactionStatus | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -76413,7 +75522,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 76414 "configure"
+#line 75526 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -76424,7 +75533,7 @@
PQtransactionStatus()
; return 0; }
EOF
-if { (eval echo configure:76425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:75537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -76448,7 +75557,7 @@
fi
echo $ac_n "checking for PQexecParams in -lpq""... $ac_c" 1>&6
-echo "configure:76449: checking for PQexecParams in -lpq" >&5
+echo "configure:75561: checking for PQexecParams in -lpq" >&5
ac_lib_var=`echo pq'_'PQexecParams | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -76456,7 +75565,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 76457 "configure"
+#line 75569 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -76467,7 +75576,7 @@
PQexecParams()
; return 0; }
EOF
-if { (eval echo configure:76468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:75580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -76491,7 +75600,7 @@
fi
echo $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6
-echo "configure:76492: checking for PQprepare in -lpq" >&5
+echo "configure:75604: checking for PQprepare in -lpq" >&5
ac_lib_var=`echo pq'_'PQprepare | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -76499,7 +75608,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 76500 "configure"
+#line 75612 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -76510,7 +75619,7 @@
PQprepare()
; return 0; }
EOF
-if { (eval echo configure:76511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:75623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -76534,7 +75643,7 @@
fi
echo $ac_n "checking for PQexecPrepared in -lpq""... $ac_c" 1>&6
-echo "configure:76535: checking for PQexecPrepared in -lpq" >&5
+echo "configure:75647: checking for PQexecPrepared in -lpq" >&5
ac_lib_var=`echo pq'_'PQexecPrepared | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -76542,7 +75651,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 76543 "configure"
+#line 75655 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -76553,7 +75662,7 @@
PQexecPrepared()
; return 0; }
EOF
-if { (eval echo configure:76554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:75666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -76577,7 +75686,7 @@
fi
echo $ac_n "checking for PQresultErrorField in -lpq""... $ac_c" 1>&6
-echo "configure:76578: checking for PQresultErrorField in -lpq" >&5
+echo "configure:75690: checking for PQresultErrorField in -lpq" >&5
ac_lib_var=`echo pq'_'PQresultErrorField | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -76585,7 +75694,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 76586 "configure"
+#line 75698 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -76596,7 +75705,7 @@
PQresultErrorField()
; return 0; }
EOF
-if { (eval echo configure:76597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:75709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -76620,7 +75729,7 @@
fi
echo $ac_n "checking for PQsendQueryParams in -lpq""... $ac_c" 1>&6
-echo "configure:76621: checking for PQsendQueryParams in -lpq" >&5
+echo "configure:75733: checking for PQsendQueryParams in -lpq" >&5
ac_lib_var=`echo pq'_'PQsendQueryParams | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -76628,7 +75737,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 76629 "configure"
+#line 75741 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -76639,7 +75748,7 @@
PQsendQueryParams()
; return 0; }
EOF
-if { (eval echo configure:76640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:75752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -76663,7 +75772,7 @@
fi
echo $ac_n "checking for PQsendPrepare in -lpq""... $ac_c" 1>&6
-echo "configure:76664: checking for PQsendPrepare in -lpq" >&5
+echo "configure:75776: checking for PQsendPrepare in -lpq" >&5
ac_lib_var=`echo pq'_'PQsendPrepare | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -76671,7 +75780,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 76672 "configure"
+#line 75784 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -76682,7 +75791,7 @@
PQsendPrepare()
; return 0; }
EOF
-if { (eval echo configure:76683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:75795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -76706,7 +75815,7 @@
fi
echo $ac_n "checking for PQsendQueryPrepared in -lpq""... $ac_c" 1>&6
-echo "configure:76707: checking for PQsendQueryPrepared in -lpq" >&5
+echo "configure:75819: checking for PQsendQueryPrepared in -lpq" >&5
ac_lib_var=`echo pq'_'PQsendQueryPrepared | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -76714,7 +75823,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 76715 "configure"
+#line 75827 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -76725,7 +75834,7 @@
PQsendQueryPrepared()
; return 0; }
EOF
-if { (eval echo configure:76726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:75838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -76749,7 +75858,7 @@
fi
echo $ac_n "checking for PQputCopyData in -lpq""... $ac_c" 1>&6
-echo "configure:76750: checking for PQputCopyData in -lpq" >&5
+echo "configure:75862: checking for PQputCopyData in -lpq" >&5
ac_lib_var=`echo pq'_'PQputCopyData | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -76757,7 +75866,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 76758 "configure"
+#line 75870 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -76768,7 +75877,7 @@
PQputCopyData()
; return 0; }
EOF
-if { (eval echo configure:76769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:75881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -76792,7 +75901,7 @@
fi
echo $ac_n "checking for PQputCopyEnd in -lpq""... $ac_c" 1>&6
-echo "configure:76793: checking for PQputCopyEnd in -lpq" >&5
+echo "configure:75905: checking for PQputCopyEnd in -lpq" >&5
ac_lib_var=`echo pq'_'PQputCopyEnd | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -76800,7 +75909,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 76801 "configure"
+#line 75913 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -76811,7 +75920,7 @@
PQputCopyEnd()
; return 0; }
EOF
-if { (eval echo configure:76812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:75924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -76835,7 +75944,7 @@
fi
echo $ac_n "checking for PQgetCopyData in -lpq""... $ac_c" 1>&6
-echo "configure:76836: checking for PQgetCopyData in -lpq" >&5
+echo "configure:75948: checking for PQgetCopyData in -lpq" >&5
ac_lib_var=`echo pq'_'PQgetCopyData | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -76843,7 +75952,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 76844 "configure"
+#line 75956 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -76854,7 +75963,7 @@
PQgetCopyData()
; return 0; }
EOF
-if { (eval echo configure:76855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:75967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -76878,7 +75987,7 @@
fi
echo $ac_n "checking for PQfreemem in -lpq""... $ac_c" 1>&6
-echo "configure:76879: checking for PQfreemem in -lpq" >&5
+echo "configure:75991: checking for PQfreemem in -lpq" >&5
ac_lib_var=`echo pq'_'PQfreemem | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -76886,7 +75995,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 76887 "configure"
+#line 75999 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -76897,7 +76006,7 @@
PQfreemem()
; return 0; }
EOF
-if { (eval echo configure:76898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:76010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -76921,7 +76030,7 @@
fi
echo $ac_n "checking for PQsetErrorVerbosity in -lpq""... $ac_c" 1>&6
-echo "configure:76922: checking for PQsetErrorVerbosity in -lpq" >&5
+echo "configure:76034: checking for PQsetErrorVerbosity in -lpq" >&5
ac_lib_var=`echo pq'_'PQsetErrorVerbosity | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -76929,7 +76038,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 76930 "configure"
+#line 76042 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -76940,7 +76049,7 @@
PQsetErrorVerbosity()
; return 0; }
EOF
-if { (eval echo configure:76941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:76053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -76964,7 +76073,7 @@
fi
echo $ac_n "checking for PQftable in -lpq""... $ac_c" 1>&6
-echo "configure:76965: checking for PQftable in -lpq" >&5
+echo "configure:76077: checking for PQftable in -lpq" >&5
ac_lib_var=`echo pq'_'PQftable | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -76972,7 +76081,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 76973 "configure"
+#line 76085 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -76983,7 +76092,7 @@
PQftable()
; return 0; }
EOF
-if { (eval echo configure:76984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:76096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -77007,7 +76116,7 @@
fi
echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6
-echo "configure:77008: checking for PQescapeStringConn in -lpq" >&5
+echo "configure:76120: checking for PQescapeStringConn in -lpq" >&5
ac_lib_var=`echo pq'_'PQescapeStringConn | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -77015,7 +76124,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 77016 "configure"
+#line 76128 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -77026,7 +76135,7 @@
PQescapeStringConn()
; return 0; }
EOF
-if { (eval echo configure:77027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:76139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -77050,7 +76159,7 @@
fi
echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6
-echo "configure:77051: checking for PQescapeByteaConn in -lpq" >&5
+echo "configure:76163: checking for PQescapeByteaConn in -lpq" >&5
ac_lib_var=`echo pq'_'PQescapeByteaConn | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -77058,7 +76167,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 77059 "configure"
+#line 76171 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -77069,7 +76178,7 @@
PQescapeByteaConn()
; return 0; }
EOF
-if { (eval echo configure:77070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:76182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -77093,7 +76202,7 @@
fi
echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6
-echo "configure:77094: checking for pg_encoding_to_char in -lpq" >&5
+echo "configure:76206: checking for pg_encoding_to_char in -lpq" >&5
ac_lib_var=`echo pq'_'pg_encoding_to_char | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -77101,7 +76210,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 77102 "configure"
+#line 76214 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -77112,7 +76221,7 @@
pg_encoding_to_char()
; return 0; }
EOF
-if { (eval echo configure:77113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:76225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -77136,7 +76245,7 @@
fi
echo $ac_n "checking for lo_create in -lpq""... $ac_c" 1>&6
-echo "configure:77137: checking for lo_create in -lpq" >&5
+echo "configure:76249: checking for lo_create in -lpq" >&5
ac_lib_var=`echo pq'_'lo_create | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -77144,7 +76253,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 77145 "configure"
+#line 76257 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -77155,7 +76264,7 @@
lo_create()
; return 0; }
EOF
-if { (eval echo configure:77156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:76268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -77179,7 +76288,7 @@
fi
echo $ac_n "checking for lo_import_with_oid in -lpq""... $ac_c" 1>&6
-echo "configure:77180: checking for lo_import_with_oid in -lpq" >&5
+echo "configure:76292: checking for lo_import_with_oid in -lpq" >&5
ac_lib_var=`echo pq'_'lo_import_with_oid | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -77187,7 +76296,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 77188 "configure"
+#line 76300 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -77198,7 +76307,7 @@
lo_import_with_oid()
; return 0; }
EOF
-if { (eval echo configure:77199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:76311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -77616,7 +76725,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -77658,7 +76767,7 @@
php_enable_phar=yes
echo $ac_n "checking for phar archive support""... $ac_c" 1>&6
-echo "configure:77659: checking for phar archive support" >&5
+echo "configure:76771: checking for phar archive support" >&5
# Check whether --enable-phar or --disable-phar was given.
if test "${enable_phar+set}" = set; then
enableval="$enable_phar"
@@ -77958,7 +77067,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -77992,7 +77101,7 @@
fi
echo $ac_n "checking for phar openssl support""... $ac_c" 1>&6
-echo "configure:77993: checking for phar openssl support" >&5
+echo "configure:77105: checking for phar openssl support" >&5
if test "$PHP_HASH_SHARED" != "yes"; then
if test "$PHP_HASH" != "no"; then
cat >> confdefs.h <<\EOF
@@ -78067,7 +77176,7 @@
php_enable_posix=yes
echo $ac_n "checking whether to enable POSIX-like functions""... $ac_c" 1>&6
-echo "configure:78068: checking whether to enable POSIX-like functions" >&5
+echo "configure:77180: checking whether to enable POSIX-like functions" >&5
# Check whether --enable-posix or --disable-posix was given.
if test "${enable_posix+set}" = set; then
enableval="$enable_posix"
@@ -78371,7 +77480,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -78409,17 +77518,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:78410: checking for $ac_hdr" >&5
+echo "configure:77522: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 78415 "configure"
+#line 77527 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:78420: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:77532: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -78449,12 +77558,12 @@
for ac_func in seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo mknod getrlimit getlogin getgroups makedev initgroups getpwuid_r getgrgid_r
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:78450: checking for $ac_func" >&5
+echo "configure:77562: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 78455 "configure"
+#line 77567 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -78477,7 +77586,7 @@
; return 0; }
EOF
-if { (eval echo configure:78478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:77590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -78503,14 +77612,14 @@
echo $ac_n "checking for working ttyname_r() implementation""... $ac_c" 1>&6
-echo "configure:78504: checking for working ttyname_r() implementation" >&5
+echo "configure:77616: checking for working ttyname_r() implementation" >&5
if test "$cross_compiling" = yes; then
echo "$ac_t""no, cannot detect working ttyname_r() when cross compiling. posix_ttyname() will be thread-unsafe" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 78511 "configure"
+#line 77623 "configure"
#include "confdefs.h"
#include <unistd.h>
@@ -78523,7 +77632,7 @@
}
EOF
-if { (eval echo configure:78524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:77636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
echo "$ac_t""yes" 1>&6
@@ -78545,13 +77654,13 @@
echo $ac_n "checking for utsname.domainname""... $ac_c" 1>&6
-echo "configure:78546: checking for utsname.domainname" >&5
+echo "configure:77658: checking for utsname.domainname" >&5
if eval "test \"`echo '$''{'ac_cv_have_utsname_domainname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 78552 "configure"
+#line 77664 "configure"
#include "confdefs.h"
#define _GNU_SOURCE
@@ -78563,7 +77672,7 @@
; return 0; }
EOF
-if { (eval echo configure:78564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:77676: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_have_utsname_domainname=yes
@@ -78594,7 +77703,7 @@
php_with_pspell=no
echo $ac_n "checking for PSPELL support""... $ac_c" 1>&6
-echo "configure:78595: checking for PSPELL support" >&5
+echo "configure:77707: checking for PSPELL support" >&5
# Check whether --with-pspell or --without-pspell was given.
if test "${with_pspell+set}" = set; then
withval="$with_pspell"
@@ -78894,7 +78003,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -79144,7 +78253,7 @@
done
echo $ac_n "checking for new_aspell_config in -laspell""... $ac_c" 1>&6
-echo "configure:79145: checking for new_aspell_config in -laspell" >&5
+echo "configure:78257: checking for new_aspell_config in -laspell" >&5
ac_lib_var=`echo aspell'_'new_aspell_config | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -79152,7 +78261,7 @@
ac_save_LIBS="$LIBS"
LIBS="-laspell $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 79153 "configure"
+#line 78265 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -79163,7 +78272,7 @@
new_aspell_config()
; return 0; }
EOF
-if { (eval echo configure:79164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:78276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -79337,7 +78446,7 @@
php_with_libedit=no
echo $ac_n "checking for libedit readline replacement""... $ac_c" 1>&6
-echo "configure:79338: checking for libedit readline replacement" >&5
+echo "configure:78450: checking for libedit readline replacement" >&5
# Check whether --with-libedit or --without-libedit was given.
if test "${with_libedit+set}" = set; then
withval="$with_libedit"
@@ -79382,7 +78491,7 @@
php_with_readline=no
echo $ac_n "checking for readline support""... $ac_c" 1>&6
-echo "configure:79383: checking for readline support" >&5
+echo "configure:78495: checking for readline support" >&5
# Check whether --with-readline or --without-readline was given.
if test "${with_readline+set}" = set; then
withval="$with_readline"
@@ -79468,7 +78577,7 @@
PHP_READLINE_LIBS=""
echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:79469: checking for tgetent in -lncurses" >&5
+echo "configure:78581: checking for tgetent in -lncurses" >&5
ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -79476,7 +78585,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lncurses $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 79477 "configure"
+#line 78589 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -79487,7 +78596,7 @@
tgetent()
; return 0; }
EOF
-if { (eval echo configure:79488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:78600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -79532,7 +78641,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:79533: checking for tgetent in -ltermcap" >&5
+echo "configure:78645: checking for tgetent in -ltermcap" >&5
ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -79540,7 +78649,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ltermcap $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 79541 "configure"
+#line 78653 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -79551,7 +78660,7 @@
tgetent()
; return 0; }
EOF
-if { (eval echo configure:79552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:78664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -79698,7 +78807,7 @@
done
echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
-echo "configure:79699: checking for readline in -lreadline" >&5
+echo "configure:78811: checking for readline in -lreadline" >&5
ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -79706,7 +78815,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lreadline $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 79707 "configure"
+#line 78819 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -79717,7 +78826,7 @@
readline()
; return 0; }
EOF
-if { (eval echo configure:79718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:78830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -79946,7 +79055,7 @@
done
echo $ac_n "checking for rl_pending_input in -lreadline""... $ac_c" 1>&6
-echo "configure:79947: checking for rl_pending_input in -lreadline" >&5
+echo "configure:79059: checking for rl_pending_input in -lreadline" >&5
ac_lib_var=`echo readline'_'rl_pending_input | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -79954,7 +79063,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lreadline $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 79955 "configure"
+#line 79067 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -79965,7 +79074,7 @@
rl_pending_input()
; return 0; }
EOF
-if { (eval echo configure:79966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:79078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -80096,7 +79205,7 @@
done
echo $ac_n "checking for rl_callback_read_char in -lreadline""... $ac_c" 1>&6
-echo "configure:80097: checking for rl_callback_read_char in -lreadline" >&5
+echo "configure:79209: checking for rl_callback_read_char in -lreadline" >&5
ac_lib_var=`echo readline'_'rl_callback_read_char | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -80104,7 +79213,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lreadline $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 80105 "configure"
+#line 79217 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -80115,7 +79224,7 @@
rl_callback_read_char()
; return 0; }
EOF
-if { (eval echo configure:80116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:79228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -80199,7 +79308,7 @@
echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:80200: checking for tgetent in -lncurses" >&5
+echo "configure:79312: checking for tgetent in -lncurses" >&5
ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -80207,7 +79316,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lncurses $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 80208 "configure"
+#line 79320 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -80218,7 +79327,7 @@
tgetent()
; return 0; }
EOF
-if { (eval echo configure:80219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:79331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -80262,7 +79371,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:80263: checking for tgetent in -ltermcap" >&5
+echo "configure:79375: checking for tgetent in -ltermcap" >&5
ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -80270,7 +79379,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ltermcap $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 80271 "configure"
+#line 79383 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -80281,7 +79390,7 @@
tgetent()
; return 0; }
EOF
-if { (eval echo configure:80282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:79394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -80427,7 +79536,7 @@
done
echo $ac_n "checking for readline in -ledit""... $ac_c" 1>&6
-echo "configure:80428: checking for readline in -ledit" >&5
+echo "configure:79540: checking for readline in -ledit" >&5
ac_lib_var=`echo edit'_'readline | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -80435,7 +79544,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ledit $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 80436 "configure"
+#line 79548 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -80446,7 +79555,7 @@
readline()
; return 0; }
EOF
-if { (eval echo configure:80447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:79559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -80587,12 +79696,12 @@
for ac_func in rl_completion_matches
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:80588: checking for $ac_func" >&5
+echo "configure:79700: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 80593 "configure"
+#line 79705 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -80615,7 +79724,7 @@
; return 0; }
EOF
-if { (eval echo configure:80616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:79728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -80898,7 +80007,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -80941,7 +80050,7 @@
php_with_recode=no
echo $ac_n "checking for recode support""... $ac_c" 1>&6
-echo "configure:80942: checking for recode support" >&5
+echo "configure:80054: checking for recode support" >&5
# Check whether --with-recode or --without-recode was given.
if test "${with_recode+set}" = set; then
withval="$with_recode"
@@ -81105,7 +80214,7 @@
done
echo $ac_n "checking for recode_format_table in -lrecode""... $ac_c" 1>&6
-echo "configure:81106: checking for recode_format_table in -lrecode" >&5
+echo "configure:80218: checking for recode_format_table in -lrecode" >&5
ac_lib_var=`echo recode'_'recode_format_table | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -81113,7 +80222,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lrecode $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 81114 "configure"
+#line 80226 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -81124,7 +80233,7 @@
recode_format_table()
; return 0; }
EOF
-if { (eval echo configure:81125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:80237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -81254,7 +80363,7 @@
LDFLAGS="$LDFLAGS -L$RECODE_DIR/$RECODE_LIB"
LIBS="$LIBS -lrecode"
cat > conftest.$ac_ext <<EOF
-#line 81255 "configure"
+#line 80367 "configure"
#include "confdefs.h"
char *program_name;
@@ -81265,7 +80374,7 @@
; return 0; }
EOF
-if { (eval echo configure:81266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:80378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
@@ -81428,17 +80537,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:81429: checking for $ac_hdr" >&5
+echo "configure:80541: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 81434 "configure"
+#line 80546 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:81439: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:80551: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -81723,7 +80832,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -82022,7 +81131,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -82061,7 +81170,7 @@
php_enable_session=yes
echo $ac_n "checking whether to enable PHP sessions""... $ac_c" 1>&6
-echo "configure:82062: checking whether to enable PHP sessions" >&5
+echo "configure:81174: checking whether to enable PHP sessions" >&5
# Check whether --enable-session or --disable-session was given.
if test "${enable_session+set}" = set; then
enableval="$enable_session"
@@ -82105,7 +81214,7 @@
php_with_mm=no
echo $ac_n "checking for mm support""... $ac_c" 1>&6
-echo "configure:82106: checking for mm support" >&5
+echo "configure:81218: checking for mm support" >&5
# Check whether --with-mm or --without-mm was given.
if test "${with_mm+set}" = set; then
withval="$with_mm"
@@ -82127,7 +81236,7 @@
if test "$PHP_SESSION" != "no"; then
echo $ac_n "checking whether pwrite works""... $ac_c" 1>&6
-echo "configure:82128: checking whether pwrite works" >&5
+echo "configure:81240: checking whether pwrite works" >&5
if eval "test \"`echo '$''{'ac_cv_pwrite'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -82139,7 +81248,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 82140 "configure"
+#line 81252 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -82160,7 +81269,7 @@
EOF
-if { (eval echo configure:82161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:81273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_pwrite=yes
@@ -82185,7 +81294,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 82186 "configure"
+#line 81298 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -82206,7 +81315,7 @@
EOF
-if { (eval echo configure:82207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:81319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_pwrite=yes
@@ -82247,7 +81356,7 @@
echo $ac_n "checking whether pread works""... $ac_c" 1>&6
-echo "configure:82248: checking whether pread works" >&5
+echo "configure:81360: checking whether pread works" >&5
if eval "test \"`echo '$''{'ac_cv_pread'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -82260,7 +81369,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 82261 "configure"
+#line 81373 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -82280,7 +81389,7 @@
}
EOF
-if { (eval echo configure:82281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:81393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_pread=yes
@@ -82307,7 +81416,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 82308 "configure"
+#line 81420 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -82327,7 +81436,7 @@
}
EOF
-if { (eval echo configure:82328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:81440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_pread=yes
@@ -82626,7 +81735,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -82891,7 +82000,7 @@
php_enable_shmop=no
echo $ac_n "checking whether to enable shmop support""... $ac_c" 1>&6
-echo "configure:82892: checking whether to enable shmop support" >&5
+echo "configure:82004: checking whether to enable shmop support" >&5
# Check whether --enable-shmop or --disable-shmop was given.
if test "${enable_shmop+set}" = set; then
enableval="$enable_shmop"
@@ -83195,7 +82304,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -83235,7 +82344,7 @@
php_enable_simplexml=yes
echo $ac_n "checking whether to enable SimpleXML support""... $ac_c" 1>&6
-echo "configure:83236: checking whether to enable SimpleXML support" >&5
+echo "configure:82348: checking whether to enable SimpleXML support" >&5
# Check whether --enable-simplexml or --disable-simplexml was given.
if test "${enable_simplexml+set}" = set; then
enableval="$enable_simplexml"
@@ -83280,7 +82389,7 @@
php_with_libxml_dir=no
echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
-echo "configure:83281: checking libxml2 install dir" >&5
+echo "configure:82393: checking libxml2 install dir" >&5
# Check whether --with-libxml-dir or --without-libxml-dir was given.
if test "${with_libxml_dir+set}" = set; then
withval="$with_libxml_dir"
@@ -83308,7 +82417,7 @@
echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
-echo "configure:83309: checking for xml2-config path" >&5
+echo "configure:82421: checking for xml2-config path" >&5
if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -83466,7 +82575,7 @@
echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
-echo "configure:83467: checking whether libxml build works" >&5
+echo "configure:82579: checking whether libxml build works" >&5
if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -83482,7 +82591,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 83483 "configure"
+#line 82595 "configure"
#include "confdefs.h"
@@ -83493,7 +82602,7 @@
}
EOF
-if { (eval echo configure:83494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:82606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
LIBS=$old_LIBS
@@ -83791,7 +82900,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -83881,7 +82990,7 @@
php_with_snmp=no
echo $ac_n "checking for SNMP support""... $ac_c" 1>&6
-echo "configure:83882: checking for SNMP support" >&5
+echo "configure:82994: checking for SNMP support" >&5
# Check whether --with-snmp or --without-snmp was given.
if test "${with_snmp+set}" = set; then
withval="$with_snmp"
@@ -83925,7 +83034,7 @@
php_with_openssl_dir=no
echo $ac_n "checking OpenSSL dir for SNMP""... $ac_c" 1>&6
-echo "configure:83926: checking OpenSSL dir for SNMP" >&5
+echo "configure:83038: checking OpenSSL dir for SNMP" >&5
# Check whether --with-openssl-dir or --without-openssl-dir was given.
if test "${with_openssl_dir+set}" = set; then
withval="$with_openssl_dir"
@@ -83948,7 +83057,7 @@
php_enable_ucd_snmp_hack=no
echo $ac_n "checking whether to enable UCD SNMP hack""... $ac_c" 1>&6
-echo "configure:83949: checking whether to enable UCD SNMP hack" >&5
+echo "configure:83061: checking whether to enable UCD SNMP hack" >&5
# Check whether --enable-ucd-snmp-hack or --disable-ucd-snmp-hack was given.
if test "${enable_ucd_snmp_hack+set}" = set; then
enableval="$enable_ucd_snmp_hack"
@@ -83973,7 +83082,7 @@
# Extract the first word of "net-snmp-config", so it can be a program name with args.
set dummy net-snmp-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:83974: checking for $ac_word" >&5
+echo "configure:83086: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_SNMP_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -84174,17 +83283,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:84175: checking for $ac_hdr" >&5
+echo "configure:83287: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 84180 "configure"
+#line 83292 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:84185: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:83297: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -84212,9 +83321,9 @@
if test "$ac_cv_header_default_store_h" = "yes"; then
echo $ac_n "checking for OpenSSL support in SNMP libraries""... $ac_c" 1>&6
-echo "configure:84213: checking for OpenSSL support in SNMP libraries" >&5
+echo "configure:83325: checking for OpenSSL support in SNMP libraries" >&5
cat > conftest.$ac_ext <<EOF
-#line 84215 "configure"
+#line 83327 "configure"
#include "confdefs.h"
#include <ucd-snmp-config.h>
@@ -84269,7 +83378,7 @@
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:84270: checking for $ac_word" >&5
+echo "configure:83382: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -84474,9 +83583,9 @@
old_CPPFLAGS=$CPPFLAGS
CPPFLAGS=-I$OPENSSL_INCDIR
echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
-echo "configure:84475: checking for OpenSSL version" >&5
+echo "configure:83587: checking for OpenSSL version" >&5
cat > conftest.$ac_ext <<EOF
-#line 84477 "configure"
+#line 83589 "configure"
#include "confdefs.h"
#include <openssl/opensslv.h>
@@ -84631,7 +83740,7 @@
done
echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
-echo "configure:84632: checking for CRYPTO_free in -lcrypto" >&5
+echo "configure:83744: checking for CRYPTO_free in -lcrypto" >&5
ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -84639,7 +83748,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lcrypto $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 84640 "configure"
+#line 83752 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -84650,7 +83759,7 @@
CRYPTO_free()
; return 0; }
EOF
-if { (eval echo configure:84651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:83763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -84807,7 +83916,7 @@
done
echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
-echo "configure:84808: checking for SSL_CTX_set_ssl_version in -lssl" >&5
+echo "configure:83920: checking for SSL_CTX_set_ssl_version in -lssl" >&5
ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -84815,7 +83924,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lssl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 84816 "configure"
+#line 83928 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -84826,7 +83935,7 @@
SSL_CTX_set_ssl_version()
; return 0; }
EOF
-if { (eval echo configure:84827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:83939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -84962,7 +84071,7 @@
fi
echo $ac_n "checking for kstat_read in -lkstat""... $ac_c" 1>&6
-echo "configure:84963: checking for kstat_read in -lkstat" >&5
+echo "configure:84075: checking for kstat_read in -lkstat" >&5
ac_lib_var=`echo kstat'_'kstat_read | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -84970,7 +84079,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lkstat $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 84971 "configure"
+#line 84083 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -84981,7 +84090,7 @@
kstat_read()
; return 0; }
EOF
-if { (eval echo configure:84982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:84094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -85252,7 +84361,7 @@
done
echo $ac_n "checking for snmp_parse_oid in -l$SNMP_LIBNAME""... $ac_c" 1>&6
-echo "configure:85253: checking for snmp_parse_oid in -l$SNMP_LIBNAME" >&5
+echo "configure:84365: checking for snmp_parse_oid in -l$SNMP_LIBNAME" >&5
ac_lib_var=`echo $SNMP_LIBNAME'_'snmp_parse_oid | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -85260,7 +84369,7 @@
ac_save_LIBS="$LIBS"
LIBS="-l$SNMP_LIBNAME $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 85261 "configure"
+#line 84373 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -85271,7 +84380,7 @@
snmp_parse_oid()
; return 0; }
EOF
-if { (eval echo configure:85272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:84384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -85405,7 +84514,7 @@
done
echo $ac_n "checking for init_snmp in -l$SNMP_LIBNAME""... $ac_c" 1>&6
-echo "configure:85406: checking for init_snmp in -l$SNMP_LIBNAME" >&5
+echo "configure:84518: checking for init_snmp in -l$SNMP_LIBNAME" >&5
ac_lib_var=`echo $SNMP_LIBNAME'_'init_snmp | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -85413,7 +84522,7 @@
ac_save_LIBS="$LIBS"
LIBS="-l$SNMP_LIBNAME $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 85414 "configure"
+#line 84526 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -85424,7 +84533,7 @@
init_snmp()
; return 0; }
EOF
-if { (eval echo configure:85425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:84537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -85728,7 +84837,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -85771,7 +84880,7 @@
php_enable_soap=no
echo $ac_n "checking whether to enable SOAP support""... $ac_c" 1>&6
-echo "configure:85772: checking whether to enable SOAP support" >&5
+echo "configure:84884: checking whether to enable SOAP support" >&5
# Check whether --enable-soap or --disable-soap was given.
if test "${enable_soap+set}" = set; then
enableval="$enable_soap"
@@ -85816,7 +84925,7 @@
php_with_libxml_dir=no
echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
-echo "configure:85817: checking libxml2 install dir" >&5
+echo "configure:84929: checking libxml2 install dir" >&5
# Check whether --with-libxml-dir or --without-libxml-dir was given.
if test "${with_libxml_dir+set}" = set; then
withval="$with_libxml_dir"
@@ -85844,7 +84953,7 @@
echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
-echo "configure:85845: checking for xml2-config path" >&5
+echo "configure:84957: checking for xml2-config path" >&5
if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -86002,7 +85111,7 @@
echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
-echo "configure:86003: checking whether libxml build works" >&5
+echo "configure:85115: checking whether libxml build works" >&5
if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -86018,7 +85127,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 86019 "configure"
+#line 85131 "configure"
#include "confdefs.h"
@@ -86029,7 +85138,7 @@
}
EOF
-if { (eval echo configure:86030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:85142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
LIBS=$old_LIBS
@@ -86327,7 +85436,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -86379,7 +85488,7 @@
php_enable_sockets=no
echo $ac_n "checking whether to enable sockets support""... $ac_c" 1>&6
-echo "configure:86380: checking whether to enable sockets support" >&5
+echo "configure:85492: checking whether to enable sockets support" >&5
# Check whether --enable-sockets or --disable-sockets was given.
if test "${enable_sockets+set}" = set; then
enableval="$enable_sockets"
@@ -86421,13 +85530,13 @@
if test "$PHP_SOCKETS" != "no"; then
echo $ac_n "checking for struct cmsghdr""... $ac_c" 1>&6
-echo "configure:86422: checking for struct cmsghdr" >&5
+echo "configure:85534: checking for struct cmsghdr" >&5
if eval "test \"`echo '$''{'ac_cv_cmsghdr'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 86428 "configure"
+#line 85540 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -86436,7 +85545,7 @@
struct cmsghdr s; s
; return 0; }
EOF
-if { (eval echo configure:86437: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:85549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_cmsghdr=yes
else
@@ -86461,12 +85570,12 @@
for ac_func in hstrerror socketpair
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:86462: checking for $ac_func" >&5
+echo "configure:85574: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 86467 "configure"
+#line 85579 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -86489,7 +85598,7 @@
; return 0; }
EOF
-if { (eval echo configure:86490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:85602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -86517,17 +85626,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:86518: checking for $ac_hdr" >&5
+echo "configure:85630: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 86523 "configure"
+#line 85635 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:86528: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:85640: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -86554,7 +85663,7 @@
done
cat > conftest.$ac_ext <<EOF
-#line 86555 "configure"
+#line 85667 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -86564,7 +85673,7 @@
static struct msghdr tp; int n = (int) tp.msg_flags; return n
; return 0; }
EOF
-if { (eval echo configure:86565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:85677: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -86841,7 +85950,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -86898,7 +86007,7 @@
echo $ac_n "checking whether zend_object_value is packed""... $ac_c" 1>&6
-echo "configure:86899: checking whether zend_object_value is packed" >&5
+echo "configure:86011: checking whether zend_object_value is packed" >&5
old_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$INCLUDES -I$abs_srcdir $CPPFLAGS"
if test "$cross_compiling" = yes; then
@@ -86908,7 +86017,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 86909 "configure"
+#line 86021 "configure"
#include "confdefs.h"
#include "Zend/zend_types.h"
@@ -86917,7 +86026,7 @@
}
EOF
-if { (eval echo configure:86918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:86030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_result=1
@@ -87203,7 +86312,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -87281,7 +86390,7 @@
php_with_sqlite=yes
echo $ac_n "checking for sqlite support""... $ac_c" 1>&6
-echo "configure:87282: checking for sqlite support" >&5
+echo "configure:86394: checking for sqlite support" >&5
# Check whether --with-sqlite or --without-sqlite was given.
if test "${with_sqlite+set}" = set; then
withval="$with_sqlite"
@@ -87325,7 +86434,7 @@
php_enable_sqlite_utf8=no
echo $ac_n "checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)""... $ac_c" 1>&6
-echo "configure:87326: checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)" >&5
+echo "configure:86438: checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)" >&5
# Check whether --enable-sqlite-utf8 or --disable-sqlite-utf8 was given.
if test "${enable_sqlite_utf8+set}" = set; then
enableval="$enable_sqlite_utf8"
@@ -87353,13 +86462,13 @@
if test "$PHP_PDO" != "no"; then
echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-echo "configure:87354: checking for PDO includes" >&5
+echo "configure:86466: checking for PDO includes" >&5
if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
-echo "configure:87360: checking for PDO includes" >&5
+echo "configure:86472: checking for PDO includes" >&5
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
pdo_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
@@ -87393,7 +86502,7 @@
SQLITE_DIR=$PHP_SQLITE
else # search default path list
echo $ac_n "checking for sqlite files in default path""... $ac_c" 1>&6
-echo "configure:87394: checking for sqlite files in default path" >&5
+echo "configure:86506: checking for sqlite files in default path" >&5
for i in $SEARCH_PATH ; do
if test -r $i/$SEARCH_FOR; then
SQLITE_DIR=$i
@@ -87505,7 +86614,7 @@
done
echo $ac_n "checking for sqlite_open in -lsqlite""... $ac_c" 1>&6
-echo "configure:87506: checking for sqlite_open in -lsqlite" >&5
+echo "configure:86618: checking for sqlite_open in -lsqlite" >&5
ac_lib_var=`echo sqlite'_'sqlite_open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -87513,7 +86622,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsqlite $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 87514 "configure"
+#line 86626 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -87524,7 +86633,7 @@
sqlite_open()
; return 0; }
EOF
-if { (eval echo configure:87525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:86637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -87697,7 +86806,7 @@
# Extract the first word of "lemon", so it can be a program name with args.
set dummy lemon; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:87698: checking for $ac_word" >&5
+echo "configure:86810: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LEMON'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -87725,7 +86834,7 @@
if test "$LEMON"; then
echo $ac_n "checking for lemon version""... $ac_c" 1>&6
-echo "configure:87726: checking for lemon version" >&5
+echo "configure:86838: checking for lemon version" >&5
if eval "test \"`echo '$''{'php_cv_lemon_version'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -88031,7 +87140,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -88138,7 +87247,7 @@
echo $ac_n "checking size of char *""... $ac_c" 1>&6
-echo "configure:88139: checking size of char *" >&5
+echo "configure:87251: checking size of char *" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_char_p'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -88146,7 +87255,7 @@
ac_cv_sizeof_char_p=4
else
cat > conftest.$ac_ext <<EOF
-#line 88147 "configure"
+#line 87259 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -88157,7 +87266,7 @@
exit(0);
}
EOF
-if { (eval echo configure:88158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:87270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_char_p=`cat conftestval`
else
@@ -88219,12 +87328,12 @@
for ac_func in usleep nanosleep
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:88220: checking for $ac_func" >&5
+echo "configure:87332: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 88225 "configure"
+#line 87337 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -88247,7 +87356,7 @@
; return 0; }
EOF
-if { (eval echo configure:88248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:87360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -88275,17 +87384,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:88276: checking for $ac_hdr" >&5
+echo "configure:87388: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 88281 "configure"
+#line 87393 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:88286: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:87398: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -88316,7 +87425,7 @@
echo $ac_n "checking whether flush should be called explicitly after a buffered io""... $ac_c" 1>&6
-echo "configure:88317: checking whether flush should be called explicitly after a buffered io" >&5
+echo "configure:87429: checking whether flush should be called explicitly after a buffered io" >&5
if eval "test \"`echo '$''{'ac_cv_flush_io'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -88327,7 +87436,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 88328 "configure"
+#line 87440 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -88365,7 +87474,7 @@
}
EOF
-if { (eval echo configure:88366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:87478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_flush_io=no
@@ -88393,7 +87502,7 @@
if test "$ac_cv_func_crypt" = "no"; then
echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:88394: checking for crypt in -lcrypt" >&5
+echo "configure:87506: checking for crypt in -lcrypt" >&5
ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -88401,7 +87510,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lcrypt $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 88402 "configure"
+#line 87514 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -88412,7 +87521,7 @@
crypt()
; return 0; }
EOF
-if { (eval echo configure:88413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:87525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -88441,7 +87550,7 @@
fi
echo $ac_n "checking for standard DES crypt""... $ac_c" 1>&6
-echo "configure:88442: checking for standard DES crypt" >&5
+echo "configure:87554: checking for standard DES crypt" >&5
if eval "test \"`echo '$''{'ac_cv_crypt_des'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -88452,7 +87561,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 88453 "configure"
+#line 87565 "configure"
#include "confdefs.h"
#if HAVE_UNISTD_H
@@ -88471,7 +87580,7 @@
#endif
}
EOF
-if { (eval echo configure:88472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:87584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_crypt_des=yes
@@ -88492,7 +87601,7 @@
echo "$ac_t""$ac_cv_crypt_des" 1>&6
echo $ac_n "checking for extended DES crypt""... $ac_c" 1>&6
-echo "configure:88493: checking for extended DES crypt" >&5
+echo "configure:87605: checking for extended DES crypt" >&5
if eval "test \"`echo '$''{'ac_cv_crypt_ext_des'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -88503,7 +87612,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 88504 "configure"
+#line 87616 "configure"
#include "confdefs.h"
#if HAVE_UNISTD_H
@@ -88522,7 +87631,7 @@
#endif
}
EOF
-if { (eval echo configure:88523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:87635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_crypt_ext_des=yes
@@ -88543,7 +87652,7 @@
echo "$ac_t""$ac_cv_crypt_ext_des" 1>&6
echo $ac_n "checking for MD5 crypt""... $ac_c" 1>&6
-echo "configure:88544: checking for MD5 crypt" >&5
+echo "configure:87656: checking for MD5 crypt" >&5
if eval "test \"`echo '$''{'ac_cv_crypt_md5'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -88554,7 +87663,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 88555 "configure"
+#line 87667 "configure"
#include "confdefs.h"
#if HAVE_UNISTD_H
@@ -88582,7 +87691,7 @@
#endif
}
EOF
-if { (eval echo configure:88583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:87695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_crypt_md5=yes
@@ -88603,7 +87712,7 @@
echo "$ac_t""$ac_cv_crypt_md5" 1>&6
echo $ac_n "checking for Blowfish crypt""... $ac_c" 1>&6
-echo "configure:88604: checking for Blowfish crypt" >&5
+echo "configure:87716: checking for Blowfish crypt" >&5
if eval "test \"`echo '$''{'ac_cv_crypt_blowfish'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -88614,7 +87723,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 88615 "configure"
+#line 87727 "configure"
#include "confdefs.h"
#if HAVE_UNISTD_H
@@ -88639,7 +87748,7 @@
#endif
}
EOF
-if { (eval echo configure:88640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:87752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_crypt_blowfish=yes
@@ -88660,7 +87769,7 @@
echo "$ac_t""$ac_cv_crypt_blowfish" 1>&6
echo $ac_n "checking for SHA512 crypt""... $ac_c" 1>&6
-echo "configure:88661: checking for SHA512 crypt" >&5
+echo "configure:87773: checking for SHA512 crypt" >&5
if eval "test \"`echo '$''{'ac_cv_crypt_SHA512'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -88671,7 +87780,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 88672 "configure"
+#line 87784 "configure"
#include "confdefs.h"
#if HAVE_UNISTD_H
@@ -88695,7 +87804,7 @@
#endif
}
EOF
-if { (eval echo configure:88696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:87808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_crypt_SHA512=yes
@@ -88716,7 +87825,7 @@
echo "$ac_t""$ac_cv_crypt_SHA512" 1>&6
echo $ac_n "checking for SHA256 crypt""... $ac_c" 1>&6
-echo "configure:88717: checking for SHA256 crypt" >&5
+echo "configure:87829: checking for SHA256 crypt" >&5
if eval "test \"`echo '$''{'ac_cv_crypt_SHA256'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -88727,7 +87836,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 88728 "configure"
+#line 87840 "configure"
#include "confdefs.h"
#if HAVE_UNISTD_H
@@ -88751,7 +87860,7 @@
#endif
}
EOF
-if { (eval echo configure:88752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:87864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_crypt_SHA256=yes
@@ -88775,13 +87884,13 @@
if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "x$php_crypt_r" = "x0"; then
echo $ac_n "checking whether the compiler supports __alignof__""... $ac_c" 1>&6
-echo "configure:88776: checking whether the compiler supports __alignof__" >&5
+echo "configure:87888: checking whether the compiler supports __alignof__" >&5
if eval "test \"`echo '$''{'ac_cv_alignof_exists'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 88782 "configure"
+#line 87894 "configure"
#include "confdefs.h"
@@ -88791,7 +87900,7 @@
; return 0; }
EOF
-if { (eval echo configure:88792: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:87904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_alignof_exists=yes
@@ -88816,13 +87925,13 @@
fi
echo $ac_n "checking whether the compiler supports aligned attribute""... $ac_c" 1>&6
-echo "configure:88817: checking whether the compiler supports aligned attribute" >&5
+echo "configure:87929: checking whether the compiler supports aligned attribute" >&5
if eval "test \"`echo '$''{'ac_cv_attribute_aligned'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 88823 "configure"
+#line 87935 "configure"
#include "confdefs.h"
@@ -88832,7 +87941,7 @@
; return 0; }
EOF
-if { (eval echo configure:88833: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:87945: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_attribute_aligned=yes
@@ -89011,12 +88120,12 @@
for ac_func in getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan mempcpy strpncpy
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:89012: checking for $ac_func" >&5
+echo "configure:88124: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 89017 "configure"
+#line 88129 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -89039,7 +88148,7 @@
; return 0; }
EOF
-if { (eval echo configure:89040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:88152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -89064,7 +88173,7 @@
done
echo $ac_n "checking for working fnmatch""... $ac_c" 1>&6
-echo "configure:89065: checking for working fnmatch" >&5
+echo "configure:88177: checking for working fnmatch" >&5
if eval "test \"`echo '$''{'ac_cv_func_fnmatch_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -89075,11 +88184,11 @@
ac_cv_func_fnmatch_works=no
else
cat > conftest.$ac_ext <<EOF
-#line 89076 "configure"
+#line 88188 "configure"
#include "confdefs.h"
main() { exit (fnmatch ("a*", "abc", 0) != 0); }
EOF
-if { (eval echo configure:89080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:88192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_fnmatch_works=yes
else
@@ -89106,12 +88215,12 @@
for ac_func in fork CreateProcess
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:89107: checking for $ac_func" >&5
+echo "configure:88219: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 89112 "configure"
+#line 88224 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -89134,7 +88243,7 @@
; return 0; }
EOF
-if { (eval echo configure:89135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:88247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -89164,7 +88273,7 @@
done
echo $ac_n "checking if your OS can spawn processes with inherited handles""... $ac_c" 1>&6
-echo "configure:89165: checking if your OS can spawn processes with inherited handles" >&5
+echo "configure:88277: checking if your OS can spawn processes with inherited handles" >&5
if test "$php_can_support_proc_open" = "yes"; then
echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
@@ -89188,12 +88297,12 @@
unset found
echo $ac_n "checking for res_nsearch""... $ac_c" 1>&6
-echo "configure:89189: checking for res_nsearch" >&5
+echo "configure:88301: checking for res_nsearch" >&5
if eval "test \"`echo '$''{'ac_cv_func_res_nsearch'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 89194 "configure"
+#line 88306 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char res_nsearch(); below. */
@@ -89216,7 +88325,7 @@
; return 0; }
EOF
-if { (eval echo configure:89217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:88329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_res_nsearch=yes"
else
@@ -89234,12 +88343,12 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __res_nsearch""... $ac_c" 1>&6
-echo "configure:89235: checking for __res_nsearch" >&5
+echo "configure:88347: checking for __res_nsearch" >&5
if eval "test \"`echo '$''{'ac_cv_func___res_nsearch'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 89240 "configure"
+#line 88352 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char __res_nsearch(); below. */
@@ -89262,7 +88371,7 @@
; return 0; }
EOF
-if { (eval echo configure:89263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:88375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func___res_nsearch=yes"
else
@@ -89300,7 +88409,7 @@
unset ac_cv_lib_resolv___res_nsearch
unset found
echo $ac_n "checking for res_nsearch in -lresolv""... $ac_c" 1>&6
-echo "configure:89301: checking for res_nsearch in -lresolv" >&5
+echo "configure:88413: checking for res_nsearch in -lresolv" >&5
ac_lib_var=`echo resolv'_'res_nsearch | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -89308,7 +88417,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 89309 "configure"
+#line 88421 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -89319,7 +88428,7 @@
res_nsearch()
; return 0; }
EOF
-if { (eval echo configure:89320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:88432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -89339,7 +88448,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __res_nsearch in -lresolv""... $ac_c" 1>&6
-echo "configure:89340: checking for __res_nsearch in -lresolv" >&5
+echo "configure:88452: checking for __res_nsearch in -lresolv" >&5
ac_lib_var=`echo resolv'_'__res_nsearch | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -89347,7 +88456,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 89348 "configure"
+#line 88460 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -89358,7 +88467,7 @@
__res_nsearch()
; return 0; }
EOF
-if { (eval echo configure:89359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:88471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -89390,11 +88499,11 @@
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 89391 "configure"
+#line 88503 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:89395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:88507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -89436,7 +88545,7 @@
unset ac_cv_lib_bind___res_nsearch
unset found
echo $ac_n "checking for res_nsearch in -lbind""... $ac_c" 1>&6
-echo "configure:89437: checking for res_nsearch in -lbind" >&5
+echo "configure:88549: checking for res_nsearch in -lbind" >&5
ac_lib_var=`echo bind'_'res_nsearch | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -89444,7 +88553,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lbind $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 89445 "configure"
+#line 88557 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -89455,7 +88564,7 @@
res_nsearch()
; return 0; }
EOF
-if { (eval echo configure:89456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:88568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -89475,7 +88584,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __res_nsearch in -lbind""... $ac_c" 1>&6
-echo "configure:89476: checking for __res_nsearch in -lbind" >&5
+echo "configure:88588: checking for __res_nsearch in -lbind" >&5
ac_lib_var=`echo bind'_'__res_nsearch | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -89483,7 +88592,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lbind $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 89484 "configure"
+#line 88596 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -89494,7 +88603,7 @@
__res_nsearch()
; return 0; }
EOF
-if { (eval echo configure:89495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:88607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -89526,11 +88635,11 @@
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 89527 "configure"
+#line 88639 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:89531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:88643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -89572,7 +88681,7 @@
unset ac_cv_lib_socket___res_nsearch
unset found
echo $ac_n "checking for res_nsearch in -lsocket""... $ac_c" 1>&6
-echo "configure:89573: checking for res_nsearch in -lsocket" >&5
+echo "configure:88685: checking for res_nsearch in -lsocket" >&5
ac_lib_var=`echo socket'_'res_nsearch | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -89580,7 +88689,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 89581 "configure"
+#line 88693 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -89591,7 +88700,7 @@
res_nsearch()
; return 0; }
EOF
-if { (eval echo configure:89592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:88704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -89611,7 +88720,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __res_nsearch in -lsocket""... $ac_c" 1>&6
-echo "configure:89612: checking for __res_nsearch in -lsocket" >&5
+echo "configure:88724: checking for __res_nsearch in -lsocket" >&5
ac_lib_var=`echo socket'_'__res_nsearch | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -89619,7 +88728,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 89620 "configure"
+#line 88732 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -89630,7 +88739,7 @@
__res_nsearch()
; return 0; }
EOF
-if { (eval echo configure:89631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:88743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -89662,11 +88771,11 @@
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 89663 "configure"
+#line 88775 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:89667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:88779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -89723,12 +88832,12 @@
unset found
echo $ac_n "checking for dns_search""... $ac_c" 1>&6
-echo "configure:89724: checking for dns_search" >&5
+echo "configure:88836: checking for dns_search" >&5
if eval "test \"`echo '$''{'ac_cv_func_dns_search'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 89729 "configure"
+#line 88841 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dns_search(); below. */
@@ -89751,7 +88860,7 @@
; return 0; }
EOF
-if { (eval echo configure:89752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:88864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_dns_search=yes"
else
@@ -89769,12 +88878,12 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __dns_search""... $ac_c" 1>&6
-echo "configure:89770: checking for __dns_search" >&5
+echo "configure:88882: checking for __dns_search" >&5
if eval "test \"`echo '$''{'ac_cv_func___dns_search'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 89775 "configure"
+#line 88887 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char __dns_search(); below. */
@@ -89797,7 +88906,7 @@
; return 0; }
EOF
-if { (eval echo configure:89798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:88910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func___dns_search=yes"
else
@@ -89835,7 +88944,7 @@
unset ac_cv_lib_resolv___dns_search
unset found
echo $ac_n "checking for dns_search in -lresolv""... $ac_c" 1>&6
-echo "configure:89836: checking for dns_search in -lresolv" >&5
+echo "configure:88948: checking for dns_search in -lresolv" >&5
ac_lib_var=`echo resolv'_'dns_search | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -89843,7 +88952,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 89844 "configure"
+#line 88956 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -89854,7 +88963,7 @@
dns_search()
; return 0; }
EOF
-if { (eval echo configure:89855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:88967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -89874,7 +88983,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __dns_search in -lresolv""... $ac_c" 1>&6
-echo "configure:89875: checking for __dns_search in -lresolv" >&5
+echo "configure:88987: checking for __dns_search in -lresolv" >&5
ac_lib_var=`echo resolv'_'__dns_search | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -89882,7 +88991,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 89883 "configure"
+#line 88995 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -89893,7 +89002,7 @@
__dns_search()
; return 0; }
EOF
-if { (eval echo configure:89894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:89006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -89925,11 +89034,11 @@
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 89926 "configure"
+#line 89038 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:89930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:89042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -89971,7 +89080,7 @@
unset ac_cv_lib_bind___dns_search
unset found
echo $ac_n "checking for dns_search in -lbind""... $ac_c" 1>&6
-echo "configure:89972: checking for dns_search in -lbind" >&5
+echo "configure:89084: checking for dns_search in -lbind" >&5
ac_lib_var=`echo bind'_'dns_search | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -89979,7 +89088,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lbind $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 89980 "configure"
+#line 89092 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -89990,7 +89099,7 @@
dns_search()
; return 0; }
EOF
-if { (eval echo configure:89991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:89103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -90010,7 +89119,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __dns_search in -lbind""... $ac_c" 1>&6
-echo "configure:90011: checking for __dns_search in -lbind" >&5
+echo "configure:89123: checking for __dns_search in -lbind" >&5
ac_lib_var=`echo bind'_'__dns_search | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -90018,7 +89127,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lbind $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 90019 "configure"
+#line 89131 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -90029,7 +89138,7 @@
__dns_search()
; return 0; }
EOF
-if { (eval echo configure:90030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:89142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -90061,11 +89170,11 @@
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 90062 "configure"
+#line 89174 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:90066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:89178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -90107,7 +89216,7 @@
unset ac_cv_lib_socket___dns_search
unset found
echo $ac_n "checking for dns_search in -lsocket""... $ac_c" 1>&6
-echo "configure:90108: checking for dns_search in -lsocket" >&5
+echo "configure:89220: checking for dns_search in -lsocket" >&5
ac_lib_var=`echo socket'_'dns_search | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -90115,7 +89224,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 90116 "configure"
+#line 89228 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -90126,7 +89235,7 @@
dns_search()
; return 0; }
EOF
-if { (eval echo configure:90127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:89239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -90146,7 +89255,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __dns_search in -lsocket""... $ac_c" 1>&6
-echo "configure:90147: checking for __dns_search in -lsocket" >&5
+echo "configure:89259: checking for __dns_search in -lsocket" >&5
ac_lib_var=`echo socket'_'__dns_search | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -90154,7 +89263,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 90155 "configure"
+#line 89267 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -90165,7 +89274,7 @@
__dns_search()
; return 0; }
EOF
-if { (eval echo configure:90166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:89278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -90197,11 +89306,11 @@
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 90198 "configure"
+#line 89310 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:90202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:89314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -90258,12 +89367,12 @@
unset found
echo $ac_n "checking for dn_expand""... $ac_c" 1>&6
-echo "configure:90259: checking for dn_expand" >&5
+echo "configure:89371: checking for dn_expand" >&5
if eval "test \"`echo '$''{'ac_cv_func_dn_expand'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 90264 "configure"
+#line 89376 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dn_expand(); below. */
@@ -90286,7 +89395,7 @@
; return 0; }
EOF
-if { (eval echo configure:90287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:89399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_dn_expand=yes"
else
@@ -90304,12 +89413,12 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __dn_expand""... $ac_c" 1>&6
-echo "configure:90305: checking for __dn_expand" >&5
+echo "configure:89417: checking for __dn_expand" >&5
if eval "test \"`echo '$''{'ac_cv_func___dn_expand'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 90310 "configure"
+#line 89422 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char __dn_expand(); below. */
@@ -90332,7 +89441,7 @@
; return 0; }
EOF
-if { (eval echo configure:90333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:89445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func___dn_expand=yes"
else
@@ -90370,7 +89479,7 @@
unset ac_cv_lib_resolv___dn_expand
unset found
echo $ac_n "checking for dn_expand in -lresolv""... $ac_c" 1>&6
-echo "configure:90371: checking for dn_expand in -lresolv" >&5
+echo "configure:89483: checking for dn_expand in -lresolv" >&5
ac_lib_var=`echo resolv'_'dn_expand | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -90378,7 +89487,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 90379 "configure"
+#line 89491 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -90389,7 +89498,7 @@
dn_expand()
; return 0; }
EOF
-if { (eval echo configure:90390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:89502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -90409,7 +89518,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __dn_expand in -lresolv""... $ac_c" 1>&6
-echo "configure:90410: checking for __dn_expand in -lresolv" >&5
+echo "configure:89522: checking for __dn_expand in -lresolv" >&5
ac_lib_var=`echo resolv'_'__dn_expand | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -90417,7 +89526,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 90418 "configure"
+#line 89530 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -90428,7 +89537,7 @@
__dn_expand()
; return 0; }
EOF
-if { (eval echo configure:90429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:89541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -90460,11 +89569,11 @@
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 90461 "configure"
+#line 89573 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:90465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:89577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -90506,7 +89615,7 @@
unset ac_cv_lib_bind___dn_expand
unset found
echo $ac_n "checking for dn_expand in -lbind""... $ac_c" 1>&6
-echo "configure:90507: checking for dn_expand in -lbind" >&5
+echo "configure:89619: checking for dn_expand in -lbind" >&5
ac_lib_var=`echo bind'_'dn_expand | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -90514,7 +89623,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lbind $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 90515 "configure"
+#line 89627 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -90525,7 +89634,7 @@
dn_expand()
; return 0; }
EOF
-if { (eval echo configure:90526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:89638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -90545,7 +89654,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __dn_expand in -lbind""... $ac_c" 1>&6
-echo "configure:90546: checking for __dn_expand in -lbind" >&5
+echo "configure:89658: checking for __dn_expand in -lbind" >&5
ac_lib_var=`echo bind'_'__dn_expand | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -90553,7 +89662,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lbind $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 90554 "configure"
+#line 89666 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -90564,7 +89673,7 @@
__dn_expand()
; return 0; }
EOF
-if { (eval echo configure:90565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:89677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -90596,11 +89705,11 @@
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 90597 "configure"
+#line 89709 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:90601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:89713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -90642,7 +89751,7 @@
unset ac_cv_lib_socket___dn_expand
unset found
echo $ac_n "checking for dn_expand in -lsocket""... $ac_c" 1>&6
-echo "configure:90643: checking for dn_expand in -lsocket" >&5
+echo "configure:89755: checking for dn_expand in -lsocket" >&5
ac_lib_var=`echo socket'_'dn_expand | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -90650,7 +89759,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 90651 "configure"
+#line 89763 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -90661,7 +89770,7 @@
dn_expand()
; return 0; }
EOF
-if { (eval echo configure:90662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:89774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -90681,7 +89790,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __dn_expand in -lsocket""... $ac_c" 1>&6
-echo "configure:90682: checking for __dn_expand in -lsocket" >&5
+echo "configure:89794: checking for __dn_expand in -lsocket" >&5
ac_lib_var=`echo socket'_'__dn_expand | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -90689,7 +89798,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 90690 "configure"
+#line 89802 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -90700,7 +89809,7 @@
__dn_expand()
; return 0; }
EOF
-if { (eval echo configure:90701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:89813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -90732,11 +89841,11 @@
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 90733 "configure"
+#line 89845 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:90737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:89849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -90793,12 +89902,12 @@
unset found
echo $ac_n "checking for dn_skipname""... $ac_c" 1>&6
-echo "configure:90794: checking for dn_skipname" >&5
+echo "configure:89906: checking for dn_skipname" >&5
if eval "test \"`echo '$''{'ac_cv_func_dn_skipname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 90799 "configure"
+#line 89911 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dn_skipname(); below. */
@@ -90821,7 +89930,7 @@
; return 0; }
EOF
-if { (eval echo configure:90822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:89934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_dn_skipname=yes"
else
@@ -90839,12 +89948,12 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __dn_skipname""... $ac_c" 1>&6
-echo "configure:90840: checking for __dn_skipname" >&5
+echo "configure:89952: checking for __dn_skipname" >&5
if eval "test \"`echo '$''{'ac_cv_func___dn_skipname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 90845 "configure"
+#line 89957 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char __dn_skipname(); below. */
@@ -90867,7 +89976,7 @@
; return 0; }
EOF
-if { (eval echo configure:90868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:89980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func___dn_skipname=yes"
else
@@ -90905,7 +90014,7 @@
unset ac_cv_lib_resolv___dn_skipname
unset found
echo $ac_n "checking for dn_skipname in -lresolv""... $ac_c" 1>&6
-echo "configure:90906: checking for dn_skipname in -lresolv" >&5
+echo "configure:90018: checking for dn_skipname in -lresolv" >&5
ac_lib_var=`echo resolv'_'dn_skipname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -90913,7 +90022,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 90914 "configure"
+#line 90026 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -90924,7 +90033,7 @@
dn_skipname()
; return 0; }
EOF
-if { (eval echo configure:90925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:90037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -90944,7 +90053,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __dn_skipname in -lresolv""... $ac_c" 1>&6
-echo "configure:90945: checking for __dn_skipname in -lresolv" >&5
+echo "configure:90057: checking for __dn_skipname in -lresolv" >&5
ac_lib_var=`echo resolv'_'__dn_skipname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -90952,7 +90061,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 90953 "configure"
+#line 90065 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -90963,7 +90072,7 @@
__dn_skipname()
; return 0; }
EOF
-if { (eval echo configure:90964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:90076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -90995,11 +90104,11 @@
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 90996 "configure"
+#line 90108 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:91000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:90112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -91041,7 +90150,7 @@
unset ac_cv_lib_bind___dn_skipname
unset found
echo $ac_n "checking for dn_skipname in -lbind""... $ac_c" 1>&6
-echo "configure:91042: checking for dn_skipname in -lbind" >&5
+echo "configure:90154: checking for dn_skipname in -lbind" >&5
ac_lib_var=`echo bind'_'dn_skipname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -91049,7 +90158,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lbind $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 91050 "configure"
+#line 90162 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -91060,7 +90169,7 @@
dn_skipname()
; return 0; }
EOF
-if { (eval echo configure:91061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:90173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -91080,7 +90189,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __dn_skipname in -lbind""... $ac_c" 1>&6
-echo "configure:91081: checking for __dn_skipname in -lbind" >&5
+echo "configure:90193: checking for __dn_skipname in -lbind" >&5
ac_lib_var=`echo bind'_'__dn_skipname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -91088,7 +90197,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lbind $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 91089 "configure"
+#line 90201 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -91099,7 +90208,7 @@
__dn_skipname()
; return 0; }
EOF
-if { (eval echo configure:91100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:90212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -91131,11 +90240,11 @@
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 91132 "configure"
+#line 90244 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:91136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:90248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -91177,7 +90286,7 @@
unset ac_cv_lib_socket___dn_skipname
unset found
echo $ac_n "checking for dn_skipname in -lsocket""... $ac_c" 1>&6
-echo "configure:91178: checking for dn_skipname in -lsocket" >&5
+echo "configure:90290: checking for dn_skipname in -lsocket" >&5
ac_lib_var=`echo socket'_'dn_skipname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -91185,7 +90294,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 91186 "configure"
+#line 90298 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -91196,7 +90305,7 @@
dn_skipname()
; return 0; }
EOF
-if { (eval echo configure:91197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:90309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -91216,7 +90325,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __dn_skipname in -lsocket""... $ac_c" 1>&6
-echo "configure:91217: checking for __dn_skipname in -lsocket" >&5
+echo "configure:90329: checking for __dn_skipname in -lsocket" >&5
ac_lib_var=`echo socket'_'__dn_skipname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -91224,7 +90333,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 91225 "configure"
+#line 90337 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -91235,7 +90344,7 @@
__dn_skipname()
; return 0; }
EOF
-if { (eval echo configure:91236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:90348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -91267,11 +90376,11 @@
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 91268 "configure"
+#line 90380 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:91272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:90384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -91330,12 +90439,12 @@
unset found
echo $ac_n "checking for res_search""... $ac_c" 1>&6
-echo "configure:91331: checking for res_search" >&5
+echo "configure:90443: checking for res_search" >&5
if eval "test \"`echo '$''{'ac_cv_func_res_search'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 91336 "configure"
+#line 90448 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char res_search(); below. */
@@ -91358,7 +90467,7 @@
; return 0; }
EOF
-if { (eval echo configure:91359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:90471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_res_search=yes"
else
@@ -91376,12 +90485,12 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __res_search""... $ac_c" 1>&6
-echo "configure:91377: checking for __res_search" >&5
+echo "configure:90489: checking for __res_search" >&5
if eval "test \"`echo '$''{'ac_cv_func___res_search'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 91382 "configure"
+#line 90494 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char __res_search(); below. */
@@ -91404,7 +90513,7 @@
; return 0; }
EOF
-if { (eval echo configure:91405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:90517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func___res_search=yes"
else
@@ -91442,7 +90551,7 @@
unset ac_cv_lib_resolv___res_search
unset found
echo $ac_n "checking for res_search in -lresolv""... $ac_c" 1>&6
-echo "configure:91443: checking for res_search in -lresolv" >&5
+echo "configure:90555: checking for res_search in -lresolv" >&5
ac_lib_var=`echo resolv'_'res_search | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -91450,7 +90559,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 91451 "configure"
+#line 90563 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -91461,7 +90570,7 @@
res_search()
; return 0; }
EOF
-if { (eval echo configure:91462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:90574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -91481,7 +90590,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __res_search in -lresolv""... $ac_c" 1>&6
-echo "configure:91482: checking for __res_search in -lresolv" >&5
+echo "configure:90594: checking for __res_search in -lresolv" >&5
ac_lib_var=`echo resolv'_'__res_search | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -91489,7 +90598,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 91490 "configure"
+#line 90602 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -91500,7 +90609,7 @@
__res_search()
; return 0; }
EOF
-if { (eval echo configure:91501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:90613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -91532,11 +90641,11 @@
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 91533 "configure"
+#line 90645 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:91537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:90649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -91578,7 +90687,7 @@
unset ac_cv_lib_bind___res_search
unset found
echo $ac_n "checking for res_search in -lbind""... $ac_c" 1>&6
-echo "configure:91579: checking for res_search in -lbind" >&5
+echo "configure:90691: checking for res_search in -lbind" >&5
ac_lib_var=`echo bind'_'res_search | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -91586,7 +90695,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lbind $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 91587 "configure"
+#line 90699 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -91597,7 +90706,7 @@
res_search()
; return 0; }
EOF
-if { (eval echo configure:91598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:90710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -91617,7 +90726,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __res_search in -lbind""... $ac_c" 1>&6
-echo "configure:91618: checking for __res_search in -lbind" >&5
+echo "configure:90730: checking for __res_search in -lbind" >&5
ac_lib_var=`echo bind'_'__res_search | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -91625,7 +90734,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lbind $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 91626 "configure"
+#line 90738 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -91636,7 +90745,7 @@
__res_search()
; return 0; }
EOF
-if { (eval echo configure:91637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:90749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -91668,11 +90777,11 @@
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 91669 "configure"
+#line 90781 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:91673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:90785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -91714,7 +90823,7 @@
unset ac_cv_lib_socket___res_search
unset found
echo $ac_n "checking for res_search in -lsocket""... $ac_c" 1>&6
-echo "configure:91715: checking for res_search in -lsocket" >&5
+echo "configure:90827: checking for res_search in -lsocket" >&5
ac_lib_var=`echo socket'_'res_search | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -91722,7 +90831,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 91723 "configure"
+#line 90835 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -91733,7 +90842,7 @@
res_search()
; return 0; }
EOF
-if { (eval echo configure:91734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:90846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -91753,7 +90862,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __res_search in -lsocket""... $ac_c" 1>&6
-echo "configure:91754: checking for __res_search in -lsocket" >&5
+echo "configure:90866: checking for __res_search in -lsocket" >&5
ac_lib_var=`echo socket'_'__res_search | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -91761,7 +90870,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 91762 "configure"
+#line 90874 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -91772,7 +90881,7 @@
__res_search()
; return 0; }
EOF
-if { (eval echo configure:91773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:90885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -91804,11 +90913,11 @@
found=no
else
cat > conftest.$ac_ext <<EOF
-#line 91805 "configure"
+#line 90917 "configure"
#include "confdefs.h"
main() { return (0); }
EOF
-if { (eval echo configure:91809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:90921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
found=yes
else
@@ -91861,7 +90970,7 @@
echo $ac_n "checking whether atof() accepts NAN""... $ac_c" 1>&6
-echo "configure:91862: checking whether atof() accepts NAN" >&5
+echo "configure:90974: checking whether atof() accepts NAN" >&5
if eval "test \"`echo '$''{'ac_cv_atof_accept_nan'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -91872,7 +90981,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 91873 "configure"
+#line 90985 "configure"
#include "confdefs.h"
#include <math.h>
@@ -91892,7 +91001,7 @@
}
EOF
-if { (eval echo configure:91893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:91005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_atof_accept_nan=yes
@@ -91919,7 +91028,7 @@
fi
echo $ac_n "checking whether atof() accepts INF""... $ac_c" 1>&6
-echo "configure:91920: checking whether atof() accepts INF" >&5
+echo "configure:91032: checking whether atof() accepts INF" >&5
if eval "test \"`echo '$''{'ac_cv_atof_accept_inf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -91930,7 +91039,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 91931 "configure"
+#line 91043 "configure"
#include "confdefs.h"
#include <math.h>
@@ -91953,7 +91062,7 @@
}
EOF
-if { (eval echo configure:91954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:91066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_atof_accept_inf=yes
@@ -91980,7 +91089,7 @@
fi
echo $ac_n "checking whether HUGE_VAL == INF""... $ac_c" 1>&6
-echo "configure:91981: checking whether HUGE_VAL == INF" >&5
+echo "configure:91093: checking whether HUGE_VAL == INF" >&5
if eval "test \"`echo '$''{'ac_cv_huge_val_inf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -91991,7 +91100,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 91992 "configure"
+#line 91104 "configure"
#include "confdefs.h"
#include <math.h>
@@ -92014,7 +91123,7 @@
}
EOF
-if { (eval echo configure:92015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:91127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_huge_val_inf=yes
@@ -92041,7 +91150,7 @@
fi
echo $ac_n "checking whether HUGE_VAL + -HUGEVAL == NAN""... $ac_c" 1>&6
-echo "configure:92042: checking whether HUGE_VAL + -HUGEVAL == NAN" >&5
+echo "configure:91154: checking whether HUGE_VAL + -HUGEVAL == NAN" >&5
if eval "test \"`echo '$''{'ac_cv_huge_val_nan'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -92052,7 +91161,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 92053 "configure"
+#line 91165 "configure"
#include "confdefs.h"
#include <math.h>
@@ -92077,7 +91186,7 @@
}
EOF
-if { (eval echo configure:92078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:91190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_huge_val_nan=yes
@@ -92104,13 +91213,13 @@
fi
echo $ac_n "checking whether strptime() declaration fails""... $ac_c" 1>&6
-echo "configure:92105: checking whether strptime() declaration fails" >&5
+echo "configure:91217: checking whether strptime() declaration fails" >&5
if eval "test \"`echo '$''{'ac_cv_strptime_decl_fails'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 92111 "configure"
+#line 91223 "configure"
#include "confdefs.h"
#include <time.h>
@@ -92126,7 +91235,7 @@
; return 0; }
EOF
-if { (eval echo configure:92127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:91239: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_strptime_decl_fails=no
@@ -92154,17 +91263,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:92155: checking for $ac_hdr" >&5
+echo "configure:91267: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 92160 "configure"
+#line 91272 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:92165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:91277: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -92193,12 +91302,12 @@
for ac_func in mblen
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:92194: checking for $ac_func" >&5
+echo "configure:91306: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 92199 "configure"
+#line 91311 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -92221,7 +91330,7 @@
; return 0; }
EOF
-if { (eval echo configure:92222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:91334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -92248,12 +91357,12 @@
for ac_func in mbrlen mbsinit
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:92249: checking for $ac_func" >&5
+echo "configure:91361: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 92254 "configure"
+#line 91366 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -92276,7 +91385,7 @@
; return 0; }
EOF
-if { (eval echo configure:92277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:91389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -92301,13 +91410,13 @@
done
echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6
-echo "configure:92302: checking for mbstate_t" >&5
+echo "configure:91414: checking for mbstate_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_mbstate_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 92308 "configure"
+#line 91420 "configure"
#include "confdefs.h"
#ifdef HAVE_WCHAR_H
@@ -92320,7 +91429,7 @@
; return 0; }
EOF
-if { (eval echo configure:92321: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:91433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_mbstate_t=yes
@@ -92348,17 +91457,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:92349: checking for $ac_hdr" >&5
+echo "configure:91461: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 92354 "configure"
+#line 91466 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:92359: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:91471: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -92684,7 +91793,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -92748,7 +91857,7 @@
php_with_sybase_ct=no
echo $ac_n "checking for Sybase-CT support""... $ac_c" 1>&6
-echo "configure:92749: checking for Sybase-CT support" >&5
+echo "configure:91861: checking for Sybase-CT support" >&5
# Check whether --with-sybase-ct or --without-sybase-ct was given.
if test "${with_sybase_ct+set}" = set; then
withval="$with_sybase_ct"
@@ -93057,7 +92166,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -93103,7 +92212,7 @@
fi
echo $ac_n "checking size of long int""... $ac_c" 1>&6
-echo "configure:93104: checking size of long int" >&5
+echo "configure:92216: checking size of long int" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -93111,7 +92220,7 @@
ac_cv_sizeof_long_int=4
else
cat > conftest.$ac_ext <<EOF
-#line 93112 "configure"
+#line 92224 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -93122,7 +92231,7 @@
exit(0);
}
EOF
-if { (eval echo configure:93123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:92235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long_int=`cat conftestval`
else
@@ -93142,7 +92251,7 @@
echo $ac_n "checking checking if we're on a 64-bit platform""... $ac_c" 1>&6
-echo "configure:93143: checking checking if we're on a 64-bit platform" >&5
+echo "configure:92255: checking checking if we're on a 64-bit platform" >&5
if test "$ac_cv_sizeof_long_int" = "4"; then
echo "$ac_t""no" 1>&6
PHP_SYBASE_64=no
@@ -93153,7 +92262,7 @@
echo $ac_n "checking Checking for ctpublic.h""... $ac_c" 1>&6
-echo "configure:93154: checking Checking for ctpublic.h" >&5
+echo "configure:92266: checking Checking for ctpublic.h" >&5
if test -f $SYBASE_CT_INCDIR/ctpublic.h; then
echo "$ac_t""found in $SYBASE_CT_INCDIR" 1>&6
@@ -93192,11 +92301,11 @@
fi
echo $ac_n "checking Checking Sybase libdir""... $ac_c" 1>&6
-echo "configure:93193: checking Checking Sybase libdir" >&5
+echo "configure:92305: checking Checking Sybase libdir" >&5
echo "$ac_t""Have $SYBASE_CT_LIBDIR" 1>&6
echo $ac_n "checking Checking for Sybase platform libraries""... $ac_c" 1>&6
-echo "configure:93197: checking Checking for Sybase platform libraries" >&5
+echo "configure:92309: checking Checking for Sybase platform libraries" >&5
if test "$SYBASE_CT_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SYBASE_CT_LIBDIR" != "/usr/lib"; then
@@ -93462,7 +92571,7 @@
done
echo $ac_n "checking for netg_errstr in -lsybtcl64""... $ac_c" 1>&6
-echo "configure:93463: checking for netg_errstr in -lsybtcl64" >&5
+echo "configure:92575: checking for netg_errstr in -lsybtcl64" >&5
ac_lib_var=`echo sybtcl64'_'netg_errstr | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -93470,7 +92579,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsybtcl64 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 93471 "configure"
+#line 92583 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -93481,7 +92590,7 @@
netg_errstr()
; return 0; }
EOF
-if { (eval echo configure:93482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:92594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -93656,7 +92765,7 @@
done
echo $ac_n "checking for insck__getVdate in -linsck64""... $ac_c" 1>&6
-echo "configure:93657: checking for insck__getVdate in -linsck64" >&5
+echo "configure:92769: checking for insck__getVdate in -linsck64" >&5
ac_lib_var=`echo insck64'_'insck__getVdate | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -93664,7 +92773,7 @@
ac_save_LIBS="$LIBS"
LIBS="-linsck64 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 93665 "configure"
+#line 92777 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -93675,7 +92784,7 @@
insck__getVdate()
; return 0; }
EOF
-if { (eval echo configure:93676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:92788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -93823,7 +92932,7 @@
done
echo $ac_n "checking for bsd_tcp in -linsck64""... $ac_c" 1>&6
-echo "configure:93824: checking for bsd_tcp in -linsck64" >&5
+echo "configure:92936: checking for bsd_tcp in -linsck64" >&5
ac_lib_var=`echo insck64'_'bsd_tcp | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -93831,7 +92940,7 @@
ac_save_LIBS="$LIBS"
LIBS="-linsck64 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 93832 "configure"
+#line 92944 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -93842,7 +92951,7 @@
bsd_tcp()
; return 0; }
EOF
-if { (eval echo configure:93843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:92955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -94089,7 +93198,7 @@
done
echo $ac_n "checking for netg_errstr in -lsybtcl""... $ac_c" 1>&6
-echo "configure:94090: checking for netg_errstr in -lsybtcl" >&5
+echo "configure:93202: checking for netg_errstr in -lsybtcl" >&5
ac_lib_var=`echo sybtcl'_'netg_errstr | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -94097,7 +93206,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsybtcl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 94098 "configure"
+#line 93210 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -94108,7 +93217,7 @@
netg_errstr()
; return 0; }
EOF
-if { (eval echo configure:94109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:93221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -94283,7 +93392,7 @@
done
echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6
-echo "configure:94284: checking for insck__getVdate in -linsck" >&5
+echo "configure:93396: checking for insck__getVdate in -linsck" >&5
ac_lib_var=`echo insck'_'insck__getVdate | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -94291,7 +93400,7 @@
ac_save_LIBS="$LIBS"
LIBS="-linsck $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 94292 "configure"
+#line 93404 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -94302,7 +93411,7 @@
insck__getVdate()
; return 0; }
EOF
-if { (eval echo configure:94303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:93415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -94450,7 +93559,7 @@
done
echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6
-echo "configure:94451: checking for bsd_tcp in -linsck" >&5
+echo "configure:93563: checking for bsd_tcp in -linsck" >&5
ac_lib_var=`echo insck'_'bsd_tcp | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -94458,7 +93567,7 @@
ac_save_LIBS="$LIBS"
LIBS="-linsck $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 94459 "configure"
+#line 93571 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -94469,7 +93578,7 @@
bsd_tcp()
; return 0; }
EOF
-if { (eval echo configure:94470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:93582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -94716,7 +93825,7 @@
done
echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6
-echo "configure:94717: checking for netg_errstr in -ltcl" >&5
+echo "configure:93829: checking for netg_errstr in -ltcl" >&5
ac_lib_var=`echo tcl'_'netg_errstr | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -94724,7 +93833,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ltcl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 94725 "configure"
+#line 93837 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -94735,7 +93844,7 @@
netg_errstr()
; return 0; }
EOF
-if { (eval echo configure:94736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:93848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -94910,7 +94019,7 @@
done
echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6
-echo "configure:94911: checking for insck__getVdate in -linsck" >&5
+echo "configure:94023: checking for insck__getVdate in -linsck" >&5
ac_lib_var=`echo insck'_'insck__getVdate | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -94918,7 +94027,7 @@
ac_save_LIBS="$LIBS"
LIBS="-linsck $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 94919 "configure"
+#line 94031 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -94929,7 +94038,7 @@
insck__getVdate()
; return 0; }
EOF
-if { (eval echo configure:94930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:94042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -95077,7 +94186,7 @@
done
echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6
-echo "configure:95078: checking for bsd_tcp in -linsck" >&5
+echo "configure:94190: checking for bsd_tcp in -linsck" >&5
ac_lib_var=`echo insck'_'bsd_tcp | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -95085,7 +94194,7 @@
ac_save_LIBS="$LIBS"
LIBS="-linsck $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 95086 "configure"
+#line 94198 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -95096,7 +94205,7 @@
bsd_tcp()
; return 0; }
EOF
-if { (eval echo configure:95097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:94209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -95156,7 +94265,7 @@
php_enable_sysvmsg=no
echo $ac_n "checking whether to enable System V IPC support""... $ac_c" 1>&6
-echo "configure:95157: checking whether to enable System V IPC support" >&5
+echo "configure:94269: checking whether to enable System V IPC support" >&5
# Check whether --enable-sysvmsg or --disable-sysvmsg was given.
if test "${enable_sysvmsg+set}" = set; then
enableval="$enable_sysvmsg"
@@ -95199,17 +94308,17 @@
if test "$PHP_SYSVMSG" != "no"; then
ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6
-echo "configure:95200: checking for sys/msg.h" >&5
+echo "configure:94312: checking for sys/msg.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 95205 "configure"
+#line 94317 "configure"
#include "confdefs.h"
#include <sys/msg.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:95210: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:94322: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -95496,7 +94605,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -95536,7 +94645,7 @@
php_enable_sysvsem=no
echo $ac_n "checking whether to enable System V semaphore support""... $ac_c" 1>&6
-echo "configure:95537: checking whether to enable System V semaphore support" >&5
+echo "configure:94649: checking whether to enable System V semaphore support" >&5
# Check whether --enable-sysvsem or --disable-sysvsem was given.
if test "${enable_sysvsem+set}" = set; then
enableval="$enable_sysvsem"
@@ -95836,7 +94945,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -95874,12 +94983,12 @@
EOF
echo $ac_n "checking for union semun""... $ac_c" 1>&6
-echo "configure:95875: checking for union semun" >&5
+echo "configure:94987: checking for union semun" >&5
if eval "test \"`echo '$''{'php_cv_semun'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 95880 "configure"
+#line 94992 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -95890,7 +94999,7 @@
union semun x;
; return 0; }
EOF
-if { (eval echo configure:95891: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:95003: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
php_cv_semun=yes
@@ -95926,7 +95035,7 @@
php_enable_sysvshm=no
echo $ac_n "checking whether to enable System V shared memory support""... $ac_c" 1>&6
-echo "configure:95927: checking whether to enable System V shared memory support" >&5
+echo "configure:95039: checking whether to enable System V shared memory support" >&5
# Check whether --enable-sysvshm or --disable-sysvshm was given.
if test "${enable_sysvshm+set}" = set; then
enableval="$enable_sysvshm"
@@ -96230,7 +95339,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -96270,7 +95379,7 @@
php_with_tidy=no
echo $ac_n "checking for TIDY support""... $ac_c" 1>&6
-echo "configure:96271: checking for TIDY support" >&5
+echo "configure:95383: checking for TIDY support" >&5
# Check whether --with-tidy or --without-tidy was given.
if test "${with_tidy+set}" = set; then
withval="$with_tidy"
@@ -96559,7 +95668,7 @@
done
echo $ac_n "checking for tidyOptGetDoc in -ltidy""... $ac_c" 1>&6
-echo "configure:96560: checking for tidyOptGetDoc in -ltidy" >&5
+echo "configure:95672: checking for tidyOptGetDoc in -ltidy" >&5
ac_lib_var=`echo tidy'_'tidyOptGetDoc | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -96567,7 +95676,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ltidy $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 96568 "configure"
+#line 95680 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -96578,7 +95687,7 @@
tidyOptGetDoc()
; return 0; }
EOF
-if { (eval echo configure:96579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:95691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -96874,7 +95983,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -96922,7 +96031,7 @@
php_enable_tokenizer=yes
echo $ac_n "checking whether to enable tokenizer support""... $ac_c" 1>&6
-echo "configure:96923: checking whether to enable tokenizer support" >&5
+echo "configure:96035: checking whether to enable tokenizer support" >&5
# Check whether --enable-tokenizer or --disable-tokenizer was given.
if test "${enable_tokenizer+set}" = set; then
enableval="$enable_tokenizer"
@@ -97222,7 +96331,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -97268,7 +96377,7 @@
php_enable_wddx=no
echo $ac_n "checking whether to enable WDDX support""... $ac_c" 1>&6
-echo "configure:97269: checking whether to enable WDDX support" >&5
+echo "configure:96381: checking whether to enable WDDX support" >&5
# Check whether --enable-wddx or --disable-wddx was given.
if test "${enable_wddx+set}" = set; then
enableval="$enable_wddx"
@@ -97313,7 +96422,7 @@
php_with_libxml_dir=no
echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
-echo "configure:97314: checking libxml2 install dir" >&5
+echo "configure:96426: checking libxml2 install dir" >&5
# Check whether --with-libxml-dir or --without-libxml-dir was given.
if test "${with_libxml_dir+set}" = set; then
withval="$with_libxml_dir"
@@ -97337,7 +96446,7 @@
php_with_libexpat_dir=no
echo $ac_n "checking libexpat dir for WDDX""... $ac_c" 1>&6
-echo "configure:97338: checking libexpat dir for WDDX" >&5
+echo "configure:96450: checking libexpat dir for WDDX" >&5
# Check whether --with-libexpat-dir or --without-libexpat-dir was given.
if test "${with_libexpat_dir+set}" = set; then
withval="$with_libexpat_dir"
@@ -97365,7 +96474,7 @@
echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
-echo "configure:97366: checking for xml2-config path" >&5
+echo "configure:96478: checking for xml2-config path" >&5
if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -97523,7 +96632,7 @@
echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
-echo "configure:97524: checking whether libxml build works" >&5
+echo "configure:96636: checking whether libxml build works" >&5
if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -97539,7 +96648,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 97540 "configure"
+#line 96652 "configure"
#include "confdefs.h"
@@ -97550,7 +96659,7 @@
}
EOF
-if { (eval echo configure:97551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:96663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
LIBS=$old_LIBS
@@ -98055,7 +97164,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -98117,7 +97226,7 @@
php_enable_xml=yes
echo $ac_n "checking whether to enable XML support""... $ac_c" 1>&6
-echo "configure:98118: checking whether to enable XML support" >&5
+echo "configure:97230: checking whether to enable XML support" >&5
# Check whether --enable-xml or --disable-xml was given.
if test "${enable_xml+set}" = set; then
enableval="$enable_xml"
@@ -98162,7 +97271,7 @@
php_with_libxml_dir=no
echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
-echo "configure:98163: checking libxml2 install dir" >&5
+echo "configure:97275: checking libxml2 install dir" >&5
# Check whether --with-libxml-dir or --without-libxml-dir was given.
if test "${with_libxml_dir+set}" = set; then
withval="$with_libxml_dir"
@@ -98186,7 +97295,7 @@
php_with_libexpat_dir=no
echo $ac_n "checking libexpat install dir""... $ac_c" 1>&6
-echo "configure:98187: checking libexpat install dir" >&5
+echo "configure:97299: checking libexpat install dir" >&5
# Check whether --with-libexpat-dir or --without-libexpat-dir was given.
if test "${with_libexpat_dir+set}" = set; then
withval="$with_libexpat_dir"
@@ -98215,7 +97324,7 @@
echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
-echo "configure:98216: checking for xml2-config path" >&5
+echo "configure:97328: checking for xml2-config path" >&5
if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -98373,7 +97482,7 @@
echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
-echo "configure:98374: checking whether libxml build works" >&5
+echo "configure:97486: checking whether libxml build works" >&5
if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -98389,7 +97498,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 98390 "configure"
+#line 97502 "configure"
#include "confdefs.h"
@@ -98400,7 +97509,7 @@
}
EOF
-if { (eval echo configure:98401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:97513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
LIBS=$old_LIBS
@@ -98871,7 +97980,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -98936,7 +98045,7 @@
php_enable_xmlreader=yes
echo $ac_n "checking whether to enable XMLReader support""... $ac_c" 1>&6
-echo "configure:98937: checking whether to enable XMLReader support" >&5
+echo "configure:98049: checking whether to enable XMLReader support" >&5
# Check whether --enable-xmlreader or --disable-xmlreader was given.
if test "${enable_xmlreader+set}" = set; then
enableval="$enable_xmlreader"
@@ -98981,7 +98090,7 @@
php_with_libxml_dir=no
echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
-echo "configure:98982: checking libxml2 install dir" >&5
+echo "configure:98094: checking libxml2 install dir" >&5
# Check whether --with-libxml-dir or --without-libxml-dir was given.
if test "${with_libxml_dir+set}" = set; then
withval="$with_libxml_dir"
@@ -99009,7 +98118,7 @@
echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
-echo "configure:99010: checking for xml2-config path" >&5
+echo "configure:98122: checking for xml2-config path" >&5
if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -99167,7 +98276,7 @@
echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
-echo "configure:99168: checking whether libxml build works" >&5
+echo "configure:98280: checking whether libxml build works" >&5
if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -99183,7 +98292,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 99184 "configure"
+#line 98296 "configure"
#include "confdefs.h"
@@ -99194,7 +98303,7 @@
}
EOF
-if { (eval echo configure:99195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:98307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
LIBS=$old_LIBS
@@ -99492,7 +98601,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -99576,7 +98685,7 @@
php_with_xmlrpc=no
echo $ac_n "checking for XMLRPC-EPI support""... $ac_c" 1>&6
-echo "configure:99577: checking for XMLRPC-EPI support" >&5
+echo "configure:98689: checking for XMLRPC-EPI support" >&5
# Check whether --with-xmlrpc or --without-xmlrpc was given.
if test "${with_xmlrpc+set}" = set; then
withval="$with_xmlrpc"
@@ -99621,7 +98730,7 @@
php_with_libxml_dir=no
echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
-echo "configure:99622: checking libxml2 install dir" >&5
+echo "configure:98734: checking libxml2 install dir" >&5
# Check whether --with-libxml-dir or --without-libxml-dir was given.
if test "${with_libxml_dir+set}" = set; then
withval="$with_libxml_dir"
@@ -99645,7 +98754,7 @@
php_with_libexpat_dir=no
echo $ac_n "checking libexpat dir for XMLRPC-EPI""... $ac_c" 1>&6
-echo "configure:99646: checking libexpat dir for XMLRPC-EPI" >&5
+echo "configure:98758: checking libexpat dir for XMLRPC-EPI" >&5
# Check whether --with-libexpat-dir or --without-libexpat-dir was given.
if test "${with_libexpat_dir+set}" = set; then
withval="$with_libexpat_dir"
@@ -99668,7 +98777,7 @@
php_with_iconv_dir=no
echo $ac_n "checking iconv dir for XMLRPC-EPI""... $ac_c" 1>&6
-echo "configure:99669: checking iconv dir for XMLRPC-EPI" >&5
+echo "configure:98781: checking iconv dir for XMLRPC-EPI" >&5
# Check whether --with-iconv-dir or --without-iconv-dir was given.
if test "${with_iconv_dir+set}" = set; then
withval="$with_iconv_dir"
@@ -99724,7 +98833,7 @@
echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
-echo "configure:99725: checking for xml2-config path" >&5
+echo "configure:98837: checking for xml2-config path" >&5
if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -99882,7 +98991,7 @@
echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
-echo "configure:99883: checking whether libxml build works" >&5
+echo "configure:98995: checking whether libxml build works" >&5
if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -99898,7 +99007,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 99899 "configure"
+#line 99011 "configure"
#include "confdefs.h"
@@ -99909,7 +99018,7 @@
}
EOF
-if { (eval echo configure:99910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:99022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
LIBS=$old_LIBS
@@ -100181,12 +99290,12 @@
LIBS_save="$LIBS"
LIBS=
echo $ac_n "checking for iconv""... $ac_c" 1>&6
-echo "configure:100182: checking for iconv" >&5
+echo "configure:99294: checking for iconv" >&5
if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 100187 "configure"
+#line 99299 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char iconv(); below. */
@@ -100209,7 +99318,7 @@
; return 0; }
EOF
-if { (eval echo configure:100210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:99322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_iconv=yes"
else
@@ -100230,12 +99339,12 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for libiconv""... $ac_c" 1>&6
-echo "configure:100231: checking for libiconv" >&5
+echo "configure:99343: checking for libiconv" >&5
if eval "test \"`echo '$''{'ac_cv_func_libiconv'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 100236 "configure"
+#line 99348 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char libiconv(); below. */
@@ -100258,7 +99367,7 @@
; return 0; }
EOF
-if { (eval echo configure:100259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:99371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_libiconv=yes"
else
@@ -100415,7 +99524,7 @@
done
echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6
-echo "configure:100416: checking for libiconv in -l$iconv_lib_name" >&5
+echo "configure:99528: checking for libiconv in -l$iconv_lib_name" >&5
ac_lib_var=`echo $iconv_lib_name'_'libiconv | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -100423,7 +99532,7 @@
ac_save_LIBS="$LIBS"
LIBS="-l$iconv_lib_name $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 100424 "configure"
+#line 99536 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -100434,7 +99543,7 @@
libiconv()
; return 0; }
EOF
-if { (eval echo configure:100435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:99547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -100575,7 +99684,7 @@
done
echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6
-echo "configure:100576: checking for iconv in -l$iconv_lib_name" >&5
+echo "configure:99688: checking for iconv in -l$iconv_lib_name" >&5
ac_lib_var=`echo $iconv_lib_name'_'iconv | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -100583,7 +99692,7 @@
ac_save_LIBS="$LIBS"
LIBS="-l$iconv_lib_name $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 100584 "configure"
+#line 99696 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -100594,7 +99703,7 @@
iconv()
; return 0; }
EOF
-if { (eval echo configure:100595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:99707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -100784,7 +99893,7 @@
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:100785: checking for $ac_word" >&5
+echo "configure:99897: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -100812,21 +99921,21 @@
fi
echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:100813: checking for inline" >&5
+echo "configure:99925: checking for inline" >&5
if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat > conftest.$ac_ext <<EOF
-#line 100820 "configure"
+#line 99932 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:100827: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:99939: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
@@ -100864,12 +99973,12 @@
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:100865: checking for ANSI C header files" >&5
+echo "configure:99977: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 100870 "configure"
+#line 99982 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -100877,7 +99986,7 @@
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:100878: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:99990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -100894,7 +100003,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 100895 "configure"
+#line 100007 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -100912,7 +100021,7 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 100913 "configure"
+#line 100025 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -100933,7 +100042,7 @@
:
else
cat > conftest.$ac_ext <<EOF
-#line 100934 "configure"
+#line 100046 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -100944,7 +100053,7 @@
exit (0); }
EOF
-if { (eval echo configure:100945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:100057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -100971,17 +100080,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:100972: checking for $ac_hdr" >&5
+echo "configure:100084: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 100977 "configure"
+#line 100089 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:100982: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:100094: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -101013,7 +100122,7 @@
echo $ac_n "checking size of char""... $ac_c" 1>&6
-echo "configure:101014: checking size of char" >&5
+echo "configure:100126: checking size of char" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -101021,7 +100130,7 @@
ac_cv_sizeof_char=1
else
cat > conftest.$ac_ext <<EOF
-#line 101022 "configure"
+#line 100134 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -101032,7 +100141,7 @@
exit(0);
}
EOF
-if { (eval echo configure:101033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:100145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_char=`cat conftestval`
else
@@ -101053,7 +100162,7 @@
echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:101054: checking size of int" >&5
+echo "configure:100166: checking size of int" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -101061,7 +100170,7 @@
ac_cv_sizeof_int=4
else
cat > conftest.$ac_ext <<EOF
-#line 101062 "configure"
+#line 100174 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -101072,7 +100181,7 @@
exit(0);
}
EOF
-if { (eval echo configure:101073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:100185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_int=`cat conftestval`
else
@@ -101092,7 +100201,7 @@
echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:101093: checking size of long" >&5
+echo "configure:100205: checking size of long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -101100,7 +100209,7 @@
ac_cv_sizeof_long=4
else
cat > conftest.$ac_ext <<EOF
-#line 101101 "configure"
+#line 100213 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -101111,7 +100220,7 @@
exit(0);
}
EOF
-if { (eval echo configure:101112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:100224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long=`cat conftestval`
else
@@ -101131,7 +100240,7 @@
echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:101132: checking size of long long" >&5
+echo "configure:100244: checking size of long long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -101139,7 +100248,7 @@
ac_cv_sizeof_long_long=8
else
cat > conftest.$ac_ext <<EOF
-#line 101140 "configure"
+#line 100252 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -101150,7 +100259,7 @@
exit(0);
}
EOF
-if { (eval echo configure:101151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:100263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long_long=`cat conftestval`
else
@@ -101170,12 +100279,12 @@
echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:101171: checking for size_t" >&5
+echo "configure:100283: checking for size_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 101176 "configure"
+#line 100288 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -101203,12 +100312,12 @@
fi
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:101204: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:100316: checking whether time.h and sys/time.h may both be included" >&5
if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 101209 "configure"
+#line 100321 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -101217,7 +100326,7 @@
struct tm *tp;
; return 0; }
EOF
-if { (eval echo configure:101218: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:100330: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
@@ -101238,12 +100347,12 @@
fi
echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:101239: checking for uid_t in sys/types.h" >&5
+echo "configure:100351: checking for uid_t in sys/types.h" >&5
if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 101244 "configure"
+#line 100356 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
@@ -101283,12 +100392,12 @@
memcpy memmove
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:101284: checking for $ac_func" >&5
+echo "configure:100396: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 101289 "configure"
+#line 100401 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -101311,7 +100420,7 @@
; return 0; }
EOF
-if { (eval echo configure:101312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:100424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -101617,7 +100726,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -101665,7 +100774,7 @@
XMLRPC_DIR=$PHP_XMLRPC/include/xmlrpc-epi
else
echo $ac_n "checking for XMLRPC-EPI in default path""... $ac_c" 1>&6
-echo "configure:101666: checking for XMLRPC-EPI in default path" >&5
+echo "configure:100778: checking for XMLRPC-EPI in default path" >&5
for i in /usr/local /usr; do
if test -r $i/include/xmlrpc.h; then
XMLRPC_DIR=$i/include
@@ -102067,7 +101176,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -102108,7 +101217,7 @@
php_enable_xmlwriter=yes
echo $ac_n "checking whether to enable XMLWriter support""... $ac_c" 1>&6
-echo "configure:102109: checking whether to enable XMLWriter support" >&5
+echo "configure:101221: checking whether to enable XMLWriter support" >&5
# Check whether --enable-xmlwriter or --disable-xmlwriter was given.
if test "${enable_xmlwriter+set}" = set; then
enableval="$enable_xmlwriter"
@@ -102153,7 +101262,7 @@
php_with_libxml_dir=no
echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
-echo "configure:102154: checking libxml2 install dir" >&5
+echo "configure:101266: checking libxml2 install dir" >&5
# Check whether --with-libxml-dir or --without-libxml-dir was given.
if test "${with_libxml_dir+set}" = set; then
withval="$with_libxml_dir"
@@ -102181,7 +101290,7 @@
echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
-echo "configure:102182: checking for xml2-config path" >&5
+echo "configure:101294: checking for xml2-config path" >&5
if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -102339,7 +101448,7 @@
echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
-echo "configure:102340: checking whether libxml build works" >&5
+echo "configure:101452: checking whether libxml build works" >&5
if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -102355,7 +101464,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 102356 "configure"
+#line 101468 "configure"
#include "confdefs.h"
@@ -102366,7 +101475,7 @@
}
EOF
-if { (eval echo configure:102367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:101479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
LIBS=$old_LIBS
@@ -102664,7 +101773,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -102716,7 +101825,7 @@
php_with_xsl=no
echo $ac_n "checking for XSL support""... $ac_c" 1>&6
-echo "configure:102717: checking for XSL support" >&5
+echo "configure:101829: checking for XSL support" >&5
# Check whether --with-xsl or --without-xsl was given.
if test "${with_xsl+set}" = set; then
withval="$with_xsl"
@@ -102916,7 +102025,7 @@
echo $ac_n "checking for EXSLT support""... $ac_c" 1>&6
-echo "configure:102917: checking for EXSLT support" >&5
+echo "configure:102029: checking for EXSLT support" >&5
for i in $PHP_XSL /usr/local /usr; do
if test -r "$i/include/libexslt/exslt.h"; then
PHP_XSL_EXSL_DIR=$i
@@ -103330,7 +102439,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -103392,7 +102501,7 @@
php_enable_zip=no
echo $ac_n "checking for zip archive read/writesupport""... $ac_c" 1>&6
-echo "configure:103393: checking for zip archive read/writesupport" >&5
+echo "configure:102505: checking for zip archive read/writesupport" >&5
# Check whether --enable-zip or --disable-zip was given.
if test "${enable_zip+set}" = set; then
enableval="$enable_zip"
@@ -103437,7 +102546,7 @@
php_with_zlib_dir=no
echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
-echo "configure:103438: checking for the location of libz" >&5
+echo "configure:102550: checking for the location of libz" >&5
# Check whether --with-zlib-dir or --without-zlib-dir was given.
if test "${with_zlib_dir+set}" = set; then
withval="$with_zlib_dir"
@@ -103461,7 +102570,7 @@
php_with_pcre_dir=no
echo $ac_n "checking pcre install prefix""... $ac_c" 1>&6
-echo "configure:103462: checking pcre install prefix" >&5
+echo "configure:102574: checking pcre install prefix" >&5
# Check whether --with-pcre-dir or --without-pcre-dir was given.
if test "${with_pcre_dir+set}" = set; then
withval="$with_pcre_dir"
@@ -103505,7 +102614,7 @@
fi
echo $ac_n "checking for the location of zlib""... $ac_c" 1>&6
-echo "configure:103506: checking for the location of zlib" >&5
+echo "configure:102618: checking for the location of zlib" >&5
if test "$PHP_ZLIB_DIR" = "no"; then
{ echo "configure: error: zip support requires ZLIB. Use --with-zlib-dir=<DIR> to specify prefix where ZLIB include and library are located" 1>&2; exit 1; }
else
@@ -103643,7 +102752,7 @@
old_CPPFLAGS=$CPPFLAGS
CPPFLAGS=$INCLUDES
cat > conftest.$ac_ext <<EOF
-#line 103644 "configure"
+#line 102756 "configure"
#include "confdefs.h"
#include <main/php_config.h>
@@ -103662,7 +102771,7 @@
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 103663 "configure"
+#line 102775 "configure"
#include "confdefs.h"
#include <main/php_config.h>
@@ -103981,7 +103090,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -104036,7 +103145,7 @@
php_enable_mysqlnd=no
echo $ac_n "checking whether to enable mysqlnd""... $ac_c" 1>&6
-echo "configure:104037: checking whether to enable mysqlnd" >&5
+echo "configure:103149: checking whether to enable mysqlnd" >&5
# Check whether --enable-mysqlnd or --disable-mysqlnd was given.
if test "${enable_mysqlnd+set}" = set; then
enableval="$enable_mysqlnd"
@@ -104080,7 +103189,7 @@
php_enable_mysqlnd_compression_support=yes
echo $ac_n "checking whether to disable compressed protocol support in mysqlnd""... $ac_c" 1>&6
-echo "configure:104081: checking whether to disable compressed protocol support in mysqlnd" >&5
+echo "configure:103193: checking whether to disable compressed protocol support in mysqlnd" >&5
# Check whether --enable-mysqlnd_compression_support or --disable-mysqlnd_compression_support was given.
if test "${enable_mysqlnd_compression_support+set}" = set; then
enableval="$enable_mysqlnd_compression_support"
@@ -104104,7 +103213,7 @@
php_with_zlib_dir=no
echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
-echo "configure:104105: checking for the location of libz" >&5
+echo "configure:103217: checking for the location of libz" >&5
# Check whether --with-zlib-dir or --without-zlib-dir was given.
if test "${with_zlib_dir+set}" = set; then
withval="$with_zlib_dir"
@@ -104403,7 +103512,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -104471,7 +103580,7 @@
for php_typename in int8 uint8 int16 uint16 int32 uint32 uchar ulong int8_t uint8_t int16_t uint16_t int32_t uint32_t int64_t uint64_t; do
echo $ac_n "checking whether $php_typename exists""... $ac_c" 1>&6
-echo "configure:104472: checking whether $php_typename exists" >&5
+echo "configure:103584: checking whether $php_typename exists" >&5
php_cache_value=php_cv_sizeof_$php_typename
if eval "test \"`echo '$''{'php_cv_sizeof_$php_typename'+set}'`\" = set"; then
@@ -104488,7 +103597,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 104489 "configure"
+#line 103601 "configure"
#include "confdefs.h"
#include <stdio.h>
#if STDC_HEADERS
@@ -104518,7 +103627,7 @@
}
EOF
-if { (eval echo configure:104519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:103631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
eval $php_cache_value=`cat conftestval`
@@ -104658,7 +103767,7 @@
done
echo $ac_n "checking for hash_insert in -l$MYSQL_LIBNAME""... $ac_c" 1>&6
-echo "configure:104659: checking for hash_insert in -l$MYSQL_LIBNAME" >&5
+echo "configure:103771: checking for hash_insert in -l$MYSQL_LIBNAME" >&5
ac_lib_var=`echo $MYSQL_LIBNAME'_'hash_insert | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -104666,7 +103775,7 @@
ac_save_LIBS="$LIBS"
LIBS="-l$MYSQL_LIBNAME $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 104667 "configure"
+#line 103779 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -104677,7 +103786,7 @@
hash_insert()
; return 0; }
EOF
-if { (eval echo configure:104678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:103790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -104722,13 +103831,7 @@
enable_shared=yes
enable_static=yes
-case $php_build_target in
- program|static)
- standard_libtool_flag='-prefer-non-pic -static'
- if test -z "$PHP_MODULES" && test -z "$PHP_ZEND_EX"; then
- enable_shared=no
- fi
- ;;
+case $php_sapi_module in
shared)
enable_static=no
case $with_pic in
@@ -104741,6 +103844,12 @@
esac
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module"
;;
+ *)
+ standard_libtool_flag='-prefer-non-pic -static'
+ if test -z "$PHP_MODULES" && test -z "$PHP_ZEND_EX"; then
+ enable_shared=no
+ fi
+ ;;
esac
EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS"
@@ -104779,7 +103888,7 @@
php_with_pear=DEFAULT
echo $ac_n "checking whether to install PEAR""... $ac_c" 1>&6
-echo "configure:104780: checking whether to install PEAR" >&5
+echo "configure:103892: checking whether to install PEAR" >&5
# Check whether --with-pear or --without-pear was given.
if test "${with_pear+set}" = set; then
withval="$with_pear"
@@ -104881,7 +103990,7 @@
bison_version=none
if test "$YACC"; then
echo $ac_n "checking for bison version""... $ac_c" 1>&6
-echo "configure:104882: checking for bison version" >&5
+echo "configure:103994: checking for bison version" >&5
if eval "test \"`echo '$''{'php_cv_bison_version'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -104937,17 +104046,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:104938: checking for $ac_hdr" >&5
+echo "configure:104050: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 104943 "configure"
+#line 104055 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:104948: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:104060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -104975,12 +104084,12 @@
echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:104976: checking for size_t" >&5
+echo "configure:104088: checking for size_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 104981 "configure"
+#line 104093 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -105008,12 +104117,12 @@
fi
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:105009: checking return type of signal handlers" >&5
+echo "configure:104121: checking return type of signal handlers" >&5
if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 105014 "configure"
+#line 104126 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -105030,7 +104139,7 @@
int i;
; return 0; }
EOF
-if { (eval echo configure:105031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:104143: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
@@ -105054,12 +104163,12 @@
echo $ac_n "checking for uint""... $ac_c" 1>&6
-echo "configure:105055: checking for uint" >&5
+echo "configure:104167: checking for uint" >&5
if eval "test \"`echo '$''{'ac_cv_type_uint'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 105060 "configure"
+#line 104172 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -105087,12 +104196,12 @@
fi
echo $ac_n "checking for ulong""... $ac_c" 1>&6
-echo "configure:105088: checking for ulong" >&5
+echo "configure:104200: checking for ulong" >&5
if eval "test \"`echo '$''{'ac_cv_type_ulong'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 105093 "configure"
+#line 104205 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -105122,9 +104231,9 @@
echo $ac_n "checking for int32_t""... $ac_c" 1>&6
-echo "configure:105123: checking for int32_t" >&5
+echo "configure:104235: checking for int32_t" >&5
cat > conftest.$ac_ext <<EOF
-#line 105125 "configure"
+#line 104237 "configure"
#include "confdefs.h"
#if HAVE_SYS_TYPES_H
@@ -105143,7 +104252,7 @@
; return 0; }
EOF
-if { (eval echo configure:105144: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:104256: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<EOF
@@ -105162,9 +104271,9 @@
rm -f conftest*
echo $ac_n "checking for uint32_t""... $ac_c" 1>&6
-echo "configure:105163: checking for uint32_t" >&5
+echo "configure:104275: checking for uint32_t" >&5
cat > conftest.$ac_ext <<EOF
-#line 105165 "configure"
+#line 104277 "configure"
#include "confdefs.h"
#if HAVE_SYS_TYPES_H
@@ -105183,7 +104292,7 @@
; return 0; }
EOF
-if { (eval echo configure:105184: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:104296: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<EOF
@@ -105202,12 +104311,12 @@
rm -f conftest*
echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:105203: checking for vprintf" >&5
+echo "configure:104315: checking for vprintf" >&5
if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 105208 "configure"
+#line 104320 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vprintf(); below. */
@@ -105230,7 +104339,7 @@
; return 0; }
EOF
-if { (eval echo configure:105231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:104343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_vprintf=yes"
else
@@ -105254,12 +104363,12 @@
if test "$ac_cv_func_vprintf" != yes; then
echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:105255: checking for _doprnt" >&5
+echo "configure:104367: checking for _doprnt" >&5
if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 105260 "configure"
+#line 104372 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char _doprnt(); below. */
@@ -105282,7 +104391,7 @@
; return 0; }
EOF
-if { (eval echo configure:105283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:104395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func__doprnt=yes"
else
@@ -105307,7 +104416,7 @@
fi
echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
-echo "configure:105308: checking for 8-bit clean memcmp" >&5
+echo "configure:104420: checking for 8-bit clean memcmp" >&5
if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -105315,7 +104424,7 @@
ac_cv_func_memcmp_clean=no
else
cat > conftest.$ac_ext <<EOF
-#line 105316 "configure"
+#line 104428 "configure"
#include "confdefs.h"
main()
@@ -105325,7 +104434,7 @@
}
EOF
-if { (eval echo configure:105326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:104438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_memcmp_clean=yes
else
@@ -105345,19 +104454,19 @@
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
# for constant arguments. Useless!
echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:105346: checking for working alloca.h" >&5
+echo "configure:104458: checking for working alloca.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 105351 "configure"
+#line 104463 "configure"
#include "confdefs.h"
#include <alloca.h>
int main() {
char *p = alloca(2 * sizeof(int));
; return 0; }
EOF
-if { (eval echo configure:105358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:104470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_header_alloca_h=yes
else
@@ -105378,12 +104487,12 @@
fi
echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:105379: checking for alloca" >&5
+echo "configure:104491: checking for alloca" >&5
if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 105384 "configure"
+#line 104496 "configure"
#include "confdefs.h"
#ifdef __GNUC__
@@ -105411,7 +104520,7 @@
char *p = (char *) alloca(1);
; return 0; }
EOF
-if { (eval echo configure:105412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:104524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_func_alloca_works=yes
else
@@ -105443,12 +104552,12 @@
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:105444: checking whether alloca needs Cray hooks" >&5
+echo "configure:104556: checking whether alloca needs Cray hooks" >&5
if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 105449 "configure"
+#line 104561 "configure"
#include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2)
webecray
@@ -105473,12 +104582,12 @@
if test $ac_cv_os_cray = yes; then
for ac_func in _getb67 GETB67 getb67; do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:105474: checking for $ac_func" >&5
+echo "configure:104586: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 105479 "configure"
+#line 104591 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -105501,7 +104610,7 @@
; return 0; }
EOF
-if { (eval echo configure:105502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:104614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -105528,7 +104637,7 @@
fi
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:105529: checking stack direction for C alloca" >&5
+echo "configure:104641: checking stack direction for C alloca" >&5
if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -105536,7 +104645,7 @@
ac_cv_c_stack_direction=0
else
cat > conftest.$ac_ext <<EOF
-#line 105537 "configure"
+#line 104649 "configure"
#include "confdefs.h"
find_stack_direction ()
{
@@ -105555,7 +104664,7 @@
exit (find_stack_direction() < 0);
}
EOF
-if { (eval echo configure:105556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:104668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_stack_direction=1
else
@@ -105579,12 +104688,12 @@
for ac_func in memcpy strdup getpid kill strtod strtol finite fpclass sigsetjmp
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:105580: checking for $ac_func" >&5
+echo "configure:104692: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 105585 "configure"
+#line 104697 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -105607,7 +104716,7 @@
; return 0; }
EOF
-if { (eval echo configure:105608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:104720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -105633,7 +104742,7 @@
echo $ac_n "checking whether sprintf is broken""... $ac_c" 1>&6
-echo "configure:105634: checking whether sprintf is broken" >&5
+echo "configure:104746: checking whether sprintf is broken" >&5
if eval "test \"`echo '$''{'ac_cv_broken_sprintf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -105644,11 +104753,11 @@
else
cat > conftest.$ac_ext <<EOF
-#line 105645 "configure"
+#line 104757 "configure"
#include "confdefs.h"
main() {char buf[20];exit(sprintf(buf,"testing 123")!=11); }
EOF
-if { (eval echo configure:105649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:104761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_broken_sprintf=no
@@ -105682,12 +104791,12 @@
for ac_func in finite isfinite isinf isnan
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:105683: checking for $ac_func" >&5
+echo "configure:104795: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 105688 "configure"
+#line 104800 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -105710,7 +104819,7 @@
; return 0; }
EOF
-if { (eval echo configure:105711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:104823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -105737,13 +104846,13 @@
echo $ac_n "checking whether fp_except is defined""... $ac_c" 1>&6
-echo "configure:105738: checking whether fp_except is defined" >&5
+echo "configure:104850: checking whether fp_except is defined" >&5
if eval "test \"`echo '$''{'ac_cv_type_fp_except'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 105744 "configure"
+#line 104856 "configure"
#include "confdefs.h"
#include <floatingpoint.h>
@@ -105754,7 +104863,7 @@
; return 0; }
EOF
-if { (eval echo configure:105755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:104867: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_fp_except=yes
@@ -105781,9 +104890,9 @@
echo $ac_n "checking for usable _FPU_SETCW""... $ac_c" 1>&6
-echo "configure:105782: checking for usable _FPU_SETCW" >&5
+echo "configure:104894: checking for usable _FPU_SETCW" >&5
cat > conftest.$ac_ext <<EOF
-#line 105784 "configure"
+#line 104896 "configure"
#include "confdefs.h"
#include <fpu_control.h>
@@ -105803,7 +104912,7 @@
; return 0; }
EOF
-if { (eval echo configure:105804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:104916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cfp_have__fpu_setcw=yes
else
@@ -105824,9 +104933,9 @@
fi
echo $ac_n "checking for usable fpsetprec""... $ac_c" 1>&6
-echo "configure:105825: checking for usable fpsetprec" >&5
+echo "configure:104937: checking for usable fpsetprec" >&5
cat > conftest.$ac_ext <<EOF
-#line 105827 "configure"
+#line 104939 "configure"
#include "confdefs.h"
#include <machine/ieeefp.h>
@@ -105845,7 +104954,7 @@
; return 0; }
EOF
-if { (eval echo configure:105846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:104958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cfp_have_fpsetprec=yes
else
@@ -105866,9 +104975,9 @@
fi
echo $ac_n "checking for usable _controlfp""... $ac_c" 1>&6
-echo "configure:105867: checking for usable _controlfp" >&5
+echo "configure:104979: checking for usable _controlfp" >&5
cat > conftest.$ac_ext <<EOF
-#line 105869 "configure"
+#line 104981 "configure"
#include "confdefs.h"
#include <float.h>
@@ -105887,7 +104996,7 @@
; return 0; }
EOF
-if { (eval echo configure:105888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:105000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cfp_have__controlfp=yes
else
@@ -105908,9 +105017,9 @@
fi
echo $ac_n "checking for usable _controlfp_s""... $ac_c" 1>&6
-echo "configure:105909: checking for usable _controlfp_s" >&5
+echo "configure:105021: checking for usable _controlfp_s" >&5
cat > conftest.$ac_ext <<EOF
-#line 105911 "configure"
+#line 105023 "configure"
#include "confdefs.h"
#include <float.h>
@@ -105930,7 +105039,7 @@
; return 0; }
EOF
-if { (eval echo configure:105931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:105043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cfp_have__controlfp_s=yes
else
@@ -105951,9 +105060,9 @@
fi
echo $ac_n "checking whether FPU control word can be manipulated by inline assembler""... $ac_c" 1>&6
-echo "configure:105952: checking whether FPU control word can be manipulated by inline assembler" >&5
+echo "configure:105064: checking whether FPU control word can be manipulated by inline assembler" >&5
cat > conftest.$ac_ext <<EOF
-#line 105954 "configure"
+#line 105066 "configure"
#include "confdefs.h"
/* nothing */
@@ -105975,7 +105084,7 @@
; return 0; }
EOF
-if { (eval echo configure:105976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:105088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cfp_have_fpu_inline_asm_x86=yes
else
@@ -105997,7 +105106,7 @@
echo $ac_n "checking whether double cast to long preserves least significant bits""... $ac_c" 1>&6
-echo "configure:105998: checking whether double cast to long preserves least significant bits" >&5
+echo "configure:105110: checking whether double cast to long preserves least significant bits" >&5
if test "$cross_compiling" = yes; then
@@ -106005,7 +105114,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 106006 "configure"
+#line 105118 "configure"
#include "confdefs.h"
#include <limits.h>
@@ -106029,7 +105138,7 @@
}
EOF
-if { (eval echo configure:106030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:105142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cat >> confdefs.h <<\EOF
@@ -106055,17 +105164,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:106056: checking for $ac_hdr" >&5
+echo "configure:105168: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 106061 "configure"
+#line 105173 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:106066: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:105178: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -106093,14 +105202,14 @@
echo $ac_n "checking whether dlsym() requires a leading underscore in symbol names""... $ac_c" 1>&6
-echo "configure:106094: checking whether dlsym() requires a leading underscore in symbol names" >&5
+echo "configure:105206: checking whether dlsym() requires a leading underscore in symbol names" >&5
if test "$cross_compiling" = yes; then :
else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 106101 "configure"
+#line 105213 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -106163,7 +105272,7 @@
exit (status);
}
EOF
- if { (eval echo configure:106164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
+ if { (eval echo configure:105276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -106246,23 +105355,23 @@
echo $ac_n "checking virtual machine dispatch method""... $ac_c" 1>&6
-echo "configure:106247: checking virtual machine dispatch method" >&5
+echo "configure:105359: checking virtual machine dispatch method" >&5
echo "$ac_t""$PHP_ZEND_VM" 1>&6
echo $ac_n "checking whether to enable thread-safety""... $ac_c" 1>&6
-echo "configure:106251: checking whether to enable thread-safety" >&5
+echo "configure:105363: checking whether to enable thread-safety" >&5
echo "$ac_t""$ZEND_MAINTAINER_ZTS" 1>&6
echo $ac_n "checking whether to enable inline optimization for GCC""... $ac_c" 1>&6
-echo "configure:106255: checking whether to enable inline optimization for GCC" >&5
+echo "configure:105367: checking whether to enable inline optimization for GCC" >&5
echo "$ac_t""$ZEND_INLINE_OPTIMIZATION" 1>&6
echo $ac_n "checking whether to enable Zend debugging""... $ac_c" 1>&6
-echo "configure:106259: checking whether to enable Zend debugging" >&5
+echo "configure:105371: checking whether to enable Zend debugging" >&5
echo "$ac_t""$ZEND_DEBUG" 1>&6
echo $ac_n "checking whether to enable Zend multibyte""... $ac_c" 1>&6
-echo "configure:106263: checking whether to enable Zend multibyte" >&5
+echo "configure:105375: checking whether to enable Zend multibyte" >&5
echo "$ac_t""$ZEND_MULTIBYTE" 1>&6
case $PHP_ZEND_VM in
@@ -106335,21 +105444,21 @@
echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:106336: checking for inline" >&5
+echo "configure:105448: checking for inline" >&5
if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat > conftest.$ac_ext <<EOF
-#line 106343 "configure"
+#line 105455 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:106350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:105462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
@@ -106378,7 +105487,7 @@
echo $ac_n "checking target system is Darwin""... $ac_c" 1>&6
-echo "configure:106379: checking target system is Darwin" >&5
+echo "configure:105491: checking target system is Darwin" >&5
if echo "$target" | grep "darwin" > /dev/null; then
cat >> confdefs.h <<\EOF
#define DARWIN 1
@@ -106390,7 +105499,7 @@
fi
echo $ac_n "checking for MM alignment and log values""... $ac_c" 1>&6
-echo "configure:106391: checking for MM alignment and log values" >&5
+echo "configure:105503: checking for MM alignment and log values" >&5
if test "$cross_compiling" = yes; then
@@ -106398,7 +105507,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 106399 "configure"
+#line 105511 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -106434,7 +105543,7 @@
}
EOF
-if { (eval echo configure:106435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:105547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
LIBZEND_MM_ALIGN=`cat conftest.zend | cut -d ' ' -f 1`
@@ -106459,7 +105568,7 @@
echo "$ac_t""done" 1>&6
echo $ac_n "checking for memory allocation using mmap(MAP_ANON)""... $ac_c" 1>&6
-echo "configure:106460: checking for memory allocation using mmap(MAP_ANON)" >&5
+echo "configure:105572: checking for memory allocation using mmap(MAP_ANON)" >&5
if test "$cross_compiling" = yes; then
@@ -106467,7 +105576,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 106468 "configure"
+#line 105580 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -106503,7 +105612,7 @@
}
EOF
-if { (eval echo configure:106504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:105616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cat >> confdefs.h <<\EOF
@@ -106525,7 +105634,7 @@
echo $ac_n "checking for memory allocation using mmap("/dev/zero")""... $ac_c" 1>&6
-echo "configure:106526: checking for memory allocation using mmap("/dev/zero")" >&5
+echo "configure:105638: checking for memory allocation using mmap("/dev/zero")" >&5
if test "$cross_compiling" = yes; then
@@ -106533,7 +105642,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 106534 "configure"
+#line 105646 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -106579,7 +105688,7 @@
}
EOF
-if { (eval echo configure:106580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:105692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cat >> confdefs.h <<\EOF
@@ -106603,12 +105712,12 @@
for ac_func in mremap
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:106604: checking for $ac_func" >&5
+echo "configure:105716: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 106609 "configure"
+#line 105721 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -106631,7 +105740,7 @@
; return 0; }
EOF
-if { (eval echo configure:106632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:105744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -106698,17 +105807,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:106699: checking for $ac_hdr" >&5
+echo "configure:105811: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 106704 "configure"
+#line 105816 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:106709: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:105821: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -106785,7 +105894,7 @@
echo $ac_n "checking for GNU Pth""... $ac_c" 1>&6
-echo "configure:106786: checking for GNU Pth" >&5
+echo "configure:105898: checking for GNU Pth" >&5
PTH_PREFIX="`$TSRM_PTH --prefix`"
if test -z "$PTH_PREFIX"; then
echo "$ac_t""Please check your Pth installation" 1>&6
@@ -106815,17 +105924,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:106816: checking for $ac_hdr" >&5
+echo "configure:105928: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 106821 "configure"
+#line 105933 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:106826: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:105938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -106855,7 +105964,7 @@
LIBS="$LIBS -lst"
echo $ac_n "checking for SGI's State Threads""... $ac_c" 1>&6
-echo "configure:106856: checking for SGI's State Threads" >&5
+echo "configure:105968: checking for SGI's State Threads" >&5
echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
#define TSRM_ST 1
@@ -106894,7 +106003,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 106895 "configure"
+#line 106007 "configure"
#include "confdefs.h"
#include <pthread.h>
@@ -106912,7 +106021,7 @@
return pthread_create(&thd, NULL, thread_routine, &data);
}
EOF
-if { (eval echo configure:106913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:106025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
pthreads_working=yes
@@ -106932,7 +106041,7 @@
CFLAGS=$save_CFLAGS
echo $ac_n "checking for pthreads_cflags""... $ac_c" 1>&6
-echo "configure:106933: checking for pthreads_cflags" >&5
+echo "configure:106045: checking for pthreads_cflags" >&5
if eval "test \"`echo '$''{'ac_cv_pthreads_cflags'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -106954,7 +106063,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 106955 "configure"
+#line 106067 "configure"
#include "confdefs.h"
#include <pthread.h>
@@ -106972,7 +106081,7 @@
return pthread_create(&thd, NULL, thread_routine, &data);
}
EOF
-if { (eval echo configure:106973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:106085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
pthreads_working=yes
@@ -107002,7 +106111,7 @@
echo "$ac_t""$ac_cv_pthreads_cflags" 1>&6
echo $ac_n "checking for pthreads_lib""... $ac_c" 1>&6
-echo "configure:107003: checking for pthreads_lib" >&5
+echo "configure:106115: checking for pthreads_lib" >&5
if eval "test \"`echo '$''{'ac_cv_pthreads_lib'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -107024,7 +106133,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 107025 "configure"
+#line 106137 "configure"
#include "confdefs.h"
#include <pthread.h>
@@ -107042,7 +106151,7 @@
return pthread_create(&thd, NULL, thread_routine, &data);
}
EOF
-if { (eval echo configure:107043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:106155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
pthreads_working=yes
@@ -107093,7 +106202,7 @@
echo $ac_n "checking for POSIX threads""... $ac_c" 1>&6
-echo "configure:107094: checking for POSIX threads" >&5
+echo "configure:106206: checking for POSIX threads" >&5
echo "$ac_t""yes" 1>&6
fi
@@ -107282,58 +106391,6 @@
;;
esac
-if test "$PHP_CLI" != "no"; then
- PHP_CLI_TARGET="\$(SAPI_CLI_PATH)"
- PHP_INSTALL_CLI_TARGET="install-cli"
-
-
- case sapi/cli in
- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
- /*) ac_srcdir=`echo "sapi/cli"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
- *) ac_srcdir="$abs_srcdir/sapi/cli/"; ac_bdir="sapi/cli/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
- esac
-
-
-
- b_c_pre=$php_c_pre
- b_cxx_pre=$php_cxx_pre
- b_c_meta=$php_c_meta
- b_cxx_meta=$php_cxx_meta
- b_c_post=$php_c_post
- b_cxx_post=$php_cxx_post
- b_lo=$php_lo
-
-
- old_IFS=$IFS
- for ac_src in php_cli.c php_cli_readline.c; do
-
- IFS=.
- set $ac_src
- ac_obj=$1
- IFS=$old_IFS
-
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
-
- case $ac_src in
- *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
- *.s) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
- *.S) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
- esac
-
- cat >>Makefile.objects<<EOF
-$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
- $ac_comp
-EOF
- done
-
-
- PHP_INSTALLED_SAPIS="cli $PHP_SAPI"
- PHP_EXECUTABLE="\$(top_builddir)/\$(SAPI_CLI_PATH)"
-else
- PHP_INSTALLED_SAPIS="$PHP_SAPI"
-fi
-
PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_INSTALLED_SAPIS"
@@ -107345,19 +106402,20 @@
PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_EXECUTABLE"
- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_CLI_TARGET"
-
PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_SAPI_OBJS"
- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_CLI_OBJS"
+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_BINARY_OBJS"
PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_GLOBAL_OBJS"
+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_BINARIES"
+
+
PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_MODULES"
@@ -107729,7 +106787,7 @@
echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:107730: checking build system type" >&5
+echo "configure:106791: checking build system type" >&5
build_alias=$build
case "$build_alias" in
@@ -107758,7 +106816,7 @@
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
echo $ac_n "checking for ld used by $CC""... $ac_c" 1>&6
-echo "configure:107759: checking for ld used by $CC" >&5
+echo "configure:106820: checking for ld used by $CC" >&5
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
@@ -107788,10 +106846,10 @@
esac
elif test "$with_gnu_ld" = yes; then
echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:107789: checking for GNU ld" >&5
+echo "configure:106850: checking for GNU ld" >&5
else
echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:107792: checking for non-GNU ld" >&5
+echo "configure:106853: checking for non-GNU ld" >&5
fi
if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -107830,7 +106888,7 @@
fi
test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:107831: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:106892: checking if the linker ($LD) is GNU ld" >&5
if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -107850,7 +106908,7 @@
echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:107851: checking for $LD option to reload object files" >&5
+echo "configure:106912: checking for $LD option to reload object files" >&5
if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -107875,7 +106933,7 @@
esac
echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:107876: checking for BSD-compatible nm" >&5
+echo "configure:106937: checking for BSD-compatible nm" >&5
if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -107928,7 +106986,7 @@
NM="$lt_cv_path_NM"
echo $ac_n "checking how to recognize dependent libraries""... $ac_c" 1>&6
-echo "configure:107929: checking how to recognize dependent libraries" >&5
+echo "configure:106990: checking how to recognize dependent libraries" >&5
if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -108120,13 +107178,13 @@
test -z "$deplibs_check_method" && deplibs_check_method=unknown
echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:108121: checking for object suffix" >&5
+echo "configure:107182: checking for object suffix" >&5
if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
rm -f conftest*
echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:108127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:107188: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
for ac_file in conftest.*; do
case $ac_file in
*.c) ;;
@@ -108146,7 +107204,7 @@
echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:108147: checking for executable suffix" >&5
+echo "configure:107208: checking for executable suffix" >&5
if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -108156,7 +107214,7 @@
rm -f conftest*
echo 'int main () { return 0; }' > conftest.$ac_ext
ac_cv_exeext=
- if { (eval echo configure:108157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ if { (eval echo configure:107218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
for file in conftest.*; do
case $file in
*.c | *.o | *.obj) ;;
@@ -108202,7 +107260,7 @@
ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
- if { (eval echo configure:108203: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ if { (eval echo configure:107264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE="32"
@@ -108216,8 +107274,8 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 108217 "configure"' > conftest.$ac_ext
- if { (eval echo configure:108218: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ echo '#line 107278 "configure"' > conftest.$ac_ext
+ if { (eval echo configure:107279: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
@@ -108251,7 +107309,7 @@
s390*-*linux*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
- if { (eval echo configure:108252: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ if { (eval echo configure:107313: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
@@ -108301,7 +107359,7 @@
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:108302: checking whether the C compiler needs -belf" >&5
+echo "configure:107363: checking whether the C compiler needs -belf" >&5
if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -108314,14 +107372,14 @@
cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext <<EOF
-#line 108315 "configure"
+#line 107376 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:108322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:107383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
lt_cv_cc_needs_belf=yes
else
@@ -108349,7 +107407,7 @@
sparc*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
- if { (eval echo configure:108350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ if { (eval echo configure:107411: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
@@ -108378,7 +107436,7 @@
( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
(test "X$CXX" != "Xg++"))) ; then
echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:108379: checking how to run the C++ preprocessor" >&5
+echo "configure:107440: checking how to run the C++ preprocessor" >&5
if test -z "$CXXCPP"; then
if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -108391,12 +107449,12 @@
cross_compiling=$ac_cv_prog_cxx_cross
CXXCPP="${CXX-g++} -E"
cat > conftest.$ac_ext <<EOF
-#line 108392 "configure"
+#line 107453 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:108397: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:107458: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -108426,7 +107484,7 @@
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
# find the maximum length of command line arguments
echo $ac_n "checking the maximum length of command line arguments""... $ac_c" 1>&6
-echo "configure:108427: checking the maximum length of command line arguments" >&5
+echo "configure:107488: checking the maximum length of command line arguments" >&5
if eval "test \"`echo '$''{'lt_cv_sys_max_cmd_len'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -108548,7 +107606,7 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
echo $ac_n "checking command to parse $NM output from $compiler object""... $ac_c" 1>&6
-echo "configure:108549: checking command to parse $NM output from $compiler object" >&5
+echo "configure:107610: checking command to parse $NM output from $compiler object" >&5
if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -108652,10 +107710,10 @@
int main(){nm_test_var='a';nm_test_func();return(0);}
EOF
- if { (eval echo configure:108653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ if { (eval echo configure:107714: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
# Now try to grab the symbols.
nlist=conftest.nm
- if { (eval echo configure:108656: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then
+ if { (eval echo configure:107717: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
@@ -108706,7 +107764,7 @@
lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
- if { (eval echo configure:108707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ if { (eval echo configure:107768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
pipe_works=yes
fi
LIBS="$lt_save_LIBS"
@@ -108746,7 +107804,7 @@
fi
echo $ac_n "checking for objdir""... $ac_c" 1>&6
-echo "configure:108747: checking for objdir" >&5
+echo "configure:107808: checking for objdir" >&5
if eval "test \"`echo '$''{'lt_cv_objdir'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -108812,7 +107870,7 @@
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:108813: checking for $ac_word" >&5
+echo "configure:107874: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -108844,7 +107902,7 @@
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:108845: checking for $ac_word" >&5
+echo "configure:107906: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -108879,7 +107937,7 @@
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:108880: checking for $ac_word" >&5
+echo "configure:107941: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -108911,7 +107969,7 @@
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:108912: checking for $ac_word" >&5
+echo "configure:107973: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -108946,7 +108004,7 @@
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:108947: checking for $ac_word" >&5
+echo "configure:108008: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -108978,7 +108036,7 @@
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:108979: checking for $ac_word" >&5
+echo "configure:108040: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -109065,7 +108123,7 @@
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:109066: checking for ${ac_tool_prefix}file" >&5
+echo "configure:108127: checking for ${ac_tool_prefix}file" >&5
if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -109125,7 +108183,7 @@
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:109126: checking for file" >&5
+echo "configure:108187: checking for file" >&5
if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -109197,7 +108255,7 @@
# Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:109198: checking for $ac_word" >&5
+echo "configure:108259: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_DSYMUTIL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -109229,7 +108287,7 @@
# Extract the first word of "dsymutil", so it can be a program name with args.
set dummy dsymutil; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:109230: checking for $ac_word" >&5
+echo "configure:108291: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_DSYMUTIL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -109264,7 +108322,7 @@
# Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
set dummy ${ac_tool_prefix}nmedit; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:109265: checking for $ac_word" >&5
+echo "configure:108326: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_NMEDIT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -109296,7 +108354,7 @@
# Extract the first word of "nmedit", so it can be a program name with args.
set dummy nmedit; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:109297: checking for $ac_word" >&5
+echo "configure:108358: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_NMEDIT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -109330,7 +108388,7 @@
echo $ac_n "checking for -single_module linker flag""... $ac_c" 1>&6
-echo "configure:109331: checking for -single_module linker flag" >&5
+echo "configure:108392: checking for -single_module linker flag" >&5
if eval "test \"`echo '$''{'lt_cv_apple_cc_single_mod'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -109353,7 +108411,7 @@
echo "$ac_t""$lt_cv_apple_cc_single_mod" 1>&6
echo $ac_n "checking for -exported_symbols_list linker flag""... $ac_c" 1>&6
-echo "configure:109354: checking for -exported_symbols_list linker flag" >&5
+echo "configure:108415: checking for -exported_symbols_list linker flag" >&5
if eval "test \"`echo '$''{'lt_cv_ld_exported_symbols_list'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -109363,12 +108421,12 @@
LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
cat > conftest.$ac_ext <<EOF
-#line 109364 "configure"
+#line 108425 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:109369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:108430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
lt_cv_ld_exported_symbols_list=yes
rm -rf conftest*
else
@@ -109502,7 +108560,7 @@
echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6
-echo "configure:109503: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+echo "configure:108564: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
if eval "test \"`echo '$''{'lt_cv_prog_compiler_rtti_exceptions'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -109519,11 +108577,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"configure:109520: $lt_compile\"" >&5)
+ (eval echo "\"configure:108581: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "configure:109524: \$? = $ac_status" >&5
+ echo "configure:108585: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -109552,7 +108610,7 @@
lt_prog_compiler_static=
echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6
-echo "configure:109553: checking for $compiler option to produce PIC" >&5
+echo "configure:108614: checking for $compiler option to produce PIC" >&5
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
@@ -109799,7 +108857,7 @@
if test -n "$lt_prog_compiler_pic"; then
echo $ac_n "checking if $compiler PIC flag $lt_prog_compiler_pic works""... $ac_c" 1>&6
-echo "configure:109800: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+echo "configure:108861: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
if eval "test \"`echo '$''{'lt_cv_prog_compiler_pic_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -109816,11 +108874,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"configure:109817: $lt_compile\"" >&5)
+ (eval echo "\"configure:108878: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "configure:109821: \$? = $ac_status" >&5
+ echo "configure:108882: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -109862,7 +108920,7 @@
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
echo $ac_n "checking if $compiler static flag $lt_tmp_static_flag works""... $ac_c" 1>&6
-echo "configure:109863: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo "configure:108924: checking if $compiler static flag $lt_tmp_static_flag works" >&5
if eval "test \"`echo '$''{'lt_cv_prog_compiler_static_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -109900,7 +108958,7 @@
echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6
-echo "configure:109901: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo "configure:108962: checking if $compiler supports -c -o file.$ac_objext" >&5
if eval "test \"`echo '$''{'lt_cv_prog_compiler_c_o'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -109920,11 +108978,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"configure:109921: $lt_compile\"" >&5)
+ (eval echo "\"configure:108982: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "configure:109925: \$? = $ac_status" >&5
+ echo "configure:108986: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -109954,7 +109012,7 @@
if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6
-echo "configure:109955: checking if we can lock with hard links" >&5
+echo "configure:109016: checking if we can lock with hard links" >&5
hard_links=yes
$rm conftest*
ln conftest.a conftest.b 2>/dev/null && hard_links=no
@@ -109971,7 +109029,7 @@
fi
echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6
-echo "configure:109972: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo "configure:109033: checking whether the $compiler linker ($LD) supports shared libraries" >&5
runpath_var=
allow_undefined_flag=
@@ -110382,12 +109440,12 @@
# Determine the default libpath from the value encoded in an empty executable.
cat > conftest.$ac_ext <<EOF
-#line 110383 "configure"
+#line 109444 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:110388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:109449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
@@ -110420,12 +109478,12 @@
# Determine the default libpath from the value encoded in an empty executable.
cat > conftest.$ac_ext <<EOF
-#line 110421 "configure"
+#line 109482 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:110426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:109487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
@@ -110915,11 +109973,11 @@
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6
-echo "configure:110916: checking whether -lc should be explicitly linked in" >&5
+echo "configure:109977: checking whether -lc should be explicitly linked in" >&5
$rm conftest*
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- if { (eval echo configure:110920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then
+ if { (eval echo configure:109981: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
@@ -110933,7 +109991,7 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
- if { (eval echo configure:110934: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
+ if { (eval echo configure:109995: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
then
archive_cmds_need_lc=no
else
@@ -110952,7 +110010,7 @@
esac
echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
-echo "configure:110953: checking dynamic linker characteristics" >&5
+echo "configure:110014: checking dynamic linker characteristics" >&5
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -111577,7 +110635,7 @@
fi
echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6
-echo "configure:111578: checking how to hardcode library paths into programs" >&5
+echo "configure:110639: checking how to hardcode library paths into programs" >&5
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" || \
test -n "$runpath_var" || \
@@ -111615,7 +110673,7 @@
striplib=
old_striplib=
echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6
-echo "configure:111616: checking whether stripping libraries is possible" >&5
+echo "configure:110677: checking whether stripping libraries is possible" >&5
if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
test -z "$striplib" && striplib="$STRIP --strip-unneeded"
@@ -111666,7 +110724,7 @@
darwin*)
# if libdl is installed we need to link against it
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:111667: checking for dlopen in -ldl" >&5
+echo "configure:110728: checking for dlopen in -ldl" >&5
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -111674,7 +110732,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 111675 "configure"
+#line 110736 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -111685,7 +110743,7 @@
dlopen()
; return 0; }
EOF
-if { (eval echo configure:111686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:110747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -111714,12 +110772,12 @@
*)
echo $ac_n "checking for shl_load""... $ac_c" 1>&6
-echo "configure:111715: checking for shl_load" >&5
+echo "configure:110776: checking for shl_load" >&5
if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 111720 "configure"
+#line 110781 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shl_load(); below. */
@@ -111742,7 +110800,7 @@
; return 0; }
EOF
-if { (eval echo configure:111743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:110804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_shl_load=yes"
else
@@ -111760,7 +110818,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:111761: checking for shl_load in -ldld" >&5
+echo "configure:110822: checking for shl_load in -ldld" >&5
ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -111768,7 +110826,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldld $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 111769 "configure"
+#line 110830 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -111779,7 +110837,7 @@
shl_load()
; return 0; }
EOF
-if { (eval echo configure:111780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:110841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -111798,12 +110856,12 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlopen""... $ac_c" 1>&6
-echo "configure:111799: checking for dlopen" >&5
+echo "configure:110860: checking for dlopen" >&5
if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 111804 "configure"
+#line 110865 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dlopen(); below. */
@@ -111826,7 +110884,7 @@
; return 0; }
EOF
-if { (eval echo configure:111827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:110888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_dlopen=yes"
else
@@ -111844,7 +110902,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:111845: checking for dlopen in -ldl" >&5
+echo "configure:110906: checking for dlopen in -ldl" >&5
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -111852,7 +110910,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 111853 "configure"
+#line 110914 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -111863,7 +110921,7 @@
dlopen()
; return 0; }
EOF
-if { (eval echo configure:111864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:110925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -111882,7 +110940,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
-echo "configure:111883: checking for dlopen in -lsvld" >&5
+echo "configure:110944: checking for dlopen in -lsvld" >&5
ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -111890,7 +110948,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsvld $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 111891 "configure"
+#line 110952 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -111901,7 +110959,7 @@
dlopen()
; return 0; }
EOF
-if { (eval echo configure:111902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:110963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -111920,7 +110978,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
-echo "configure:111921: checking for dld_link in -ldld" >&5
+echo "configure:110982: checking for dld_link in -ldld" >&5
ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -111928,7 +110986,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldld $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 111929 "configure"
+#line 110990 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -111939,7 +110997,7 @@
dld_link()
; return 0; }
EOF
-if { (eval echo configure:111940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:111001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -111995,7 +111053,7 @@
LIBS="$lt_cv_dlopen_libs $LIBS"
echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
-echo "configure:111996: checking whether a program can dlopen itself" >&5
+echo "configure:111057: checking whether a program can dlopen itself" >&5
if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -112005,7 +111063,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 112006 "configure"
+#line 111067 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -112068,7 +111126,7 @@
exit (status);
}
EOF
- if { (eval echo configure:112069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
+ if { (eval echo configure:111130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -112091,7 +111149,7 @@
if test "x$lt_cv_dlopen_self" = xyes; then
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
-echo "configure:112092: checking whether a statically linked program can dlopen itself" >&5
+echo "configure:111153: checking whether a statically linked program can dlopen itself" >&5
if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -112101,7 +111159,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 112102 "configure"
+#line 111163 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -112164,7 +111222,7 @@
exit (status);
}
EOF
- if { (eval echo configure:112165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
+ if { (eval echo configure:111226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -112205,11 +111263,11 @@
# Report which library types will actually be built
echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6
-echo "configure:112206: checking if libtool supports shared libraries" >&5
+echo "configure:111267: checking if libtool supports shared libraries" >&5
echo "$ac_t""$can_build_shared" 1>&6
echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6
-echo "configure:112210: checking whether to build shared libraries" >&5
+echo "configure:111271: checking whether to build shared libraries" >&5
test "$can_build_shared" = "no" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
@@ -112232,7 +111290,7 @@
echo "$ac_t""$enable_shared" 1>&6
echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6
-echo "configure:112233: checking whether to build static libraries" >&5
+echo "configure:111294: checking whether to build static libraries" >&5
# Make sure either enable_shared or enable_static is yes.
test "$enable_shared" = yes || enable_static=yes
echo "$ac_t""$enable_static" 1>&6
@@ -112918,7 +111976,7 @@
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
echo $ac_n "checking for ld used by $CC""... $ac_c" 1>&6
-echo "configure:112919: checking for ld used by $CC" >&5
+echo "configure:111980: checking for ld used by $CC" >&5
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
@@ -112948,10 +112006,10 @@
esac
elif test "$with_gnu_ld" = yes; then
echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:112949: checking for GNU ld" >&5
+echo "configure:112010: checking for GNU ld" >&5
else
echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:112952: checking for non-GNU ld" >&5
+echo "configure:112013: checking for non-GNU ld" >&5
fi
if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -112990,7 +112048,7 @@
fi
test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:112991: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:112052: checking if the linker ($LD) is GNU ld" >&5
if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -113056,7 +112114,7 @@
# PORTME: fill in a description of your system's C++ link characteristics
echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6
-echo "configure:113057: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo "configure:112118: checking whether the $compiler linker ($LD) supports shared libraries" >&5
ld_shlibs_CXX=yes
case $host_os in
aix3*)
@@ -113154,12 +112212,12 @@
# Determine the default libpath from the value encoded in an empty executable.
cat > conftest.$ac_ext <<EOF
-#line 113155 "configure"
+#line 112216 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:113160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:112221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
@@ -113193,12 +112251,12 @@
# Determine the default libpath from the value encoded in an empty executable.
cat > conftest.$ac_ext <<EOF
-#line 113194 "configure"
+#line 112255 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:113199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:112260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
@@ -113965,7 +113023,7 @@
};
EOF
-if { (eval echo configure:113966: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:113027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
# Parse the compiler output and extract the necessary
# objects, libraries and library flags.
@@ -114121,7 +113179,7 @@
lt_prog_compiler_static_CXX=
echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6
-echo "configure:114122: checking for $compiler option to produce PIC" >&5
+echo "configure:113183: checking for $compiler option to produce PIC" >&5
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
@@ -114418,7 +113476,7 @@
if test -n "$lt_prog_compiler_pic_CXX"; then
echo $ac_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works""... $ac_c" 1>&6
-echo "configure:114419: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+echo "configure:113480: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
if eval "test \"`echo '$''{'lt_cv_prog_compiler_pic_works_CXX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -114435,11 +113493,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"configure:114436: $lt_compile\"" >&5)
+ (eval echo "\"configure:113497: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "configure:114440: \$? = $ac_status" >&5
+ echo "configure:113501: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -114481,7 +113539,7 @@
#
wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
echo $ac_n "checking if $compiler static flag $lt_tmp_static_flag works""... $ac_c" 1>&6
-echo "configure:114482: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo "configure:113543: checking if $compiler static flag $lt_tmp_static_flag works" >&5
if eval "test \"`echo '$''{'lt_cv_prog_compiler_static_works_CXX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -114519,7 +113577,7 @@
echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6
-echo "configure:114520: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo "configure:113581: checking if $compiler supports -c -o file.$ac_objext" >&5
if eval "test \"`echo '$''{'lt_cv_prog_compiler_c_o_CXX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -114539,11 +113597,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"configure:114540: $lt_compile\"" >&5)
+ (eval echo "\"configure:113601: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "configure:114544: \$? = $ac_status" >&5
+ echo "configure:113605: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -114573,7 +113631,7 @@
if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6
-echo "configure:114574: checking if we can lock with hard links" >&5
+echo "configure:113635: checking if we can lock with hard links" >&5
hard_links=yes
$rm conftest*
ln conftest.a conftest.b 2>/dev/null && hard_links=no
@@ -114590,7 +113648,7 @@
fi
echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6
-echo "configure:114591: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo "configure:113652: checking whether the $compiler linker ($LD) supports shared libraries" >&5
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
@@ -114636,11 +113694,11 @@
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6
-echo "configure:114637: checking whether -lc should be explicitly linked in" >&5
+echo "configure:113698: checking whether -lc should be explicitly linked in" >&5
$rm conftest*
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- if { (eval echo configure:114641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then
+ if { (eval echo configure:113702: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
@@ -114654,7 +113712,7 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
allow_undefined_flag_CXX=
- if { (eval echo configure:114655: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
+ if { (eval echo configure:113716: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
then
archive_cmds_need_lc_CXX=no
else
@@ -114673,7 +113731,7 @@
esac
echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
-echo "configure:114674: checking dynamic linker characteristics" >&5
+echo "configure:113735: checking dynamic linker characteristics" >&5
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -115246,7 +114304,7 @@
fi
echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6
-echo "configure:115247: checking how to hardcode library paths into programs" >&5
+echo "configure:114308: checking how to hardcode library paths into programs" >&5
hardcode_action_CXX=
if test -n "$hardcode_libdir_flag_spec_CXX" || \
test -n "$runpath_var_CXX" || \
@@ -115805,17 +114863,8 @@
pharcmd_install=
fi;
-all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) $pharcmd"
-install_targets="$install_modules install-build install-headers install-programs $install_pear $pharcmd_install"
-
-case $PHP_SAPI in
- cli)
- install_targets="$PHP_INSTALL_CLI_TARGET $install_targets"
- ;;
- *)
- install_targets="install-sapi $PHP_INSTALL_CLI_TARGET $install_targets"
- ;;
-esac
+all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_BINARIES) $pharcmd"
+install_targets="$install_sapi $install_modules $install_binaries install-build install-headers install-programs $install_pear $pharcmd_install"
PHP_VAR_SUBST="$PHP_VAR_SUBST all_targets"
@@ -115824,6 +114873,9 @@
PHP_VAR_SUBST="$PHP_VAR_SUBST install_targets"
+ PHP_VAR_SUBST="$PHP_VAR_SUBST install_binary_targets"
+
+
for header_file in Zend/ TSRM/ include/ main/ main/streams/; do
@@ -116041,7 +115093,6 @@
;;
*)
-
case /main in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
/*) ac_srcdir=`echo "/main"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
@@ -116067,7 +115118,7 @@
ac_obj=$1
IFS=$old_IFS
- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
+ PHP_BINARY_OBJS="$PHP_BINARY_OBJS $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -116082,7 +115133,6 @@
EOF
done
-
;;
esac
@@ -116241,11 +115291,6 @@
- BUILD_DIR="$BUILD_DIR sapi/$PHP_SAPI sapi/cli"
-
-
-
-
BUILD_DIR="$BUILD_DIR TSRM"
diff -Naur php-5.3.15-patch1/configure.in php-5.3.15/configure.in
--- php-5.3.15-patch1/configure.in 2012-07-27 15:23:59.000000000 -0700
+++ php-5.3.15/configure.in 2012-07-27 15:25:09.000000000 -0700
@@ -305,8 +305,8 @@
PTHREADS_CHECK
PHP_HELP_SEPARATOR([SAPI modules:])
PHP_SHLIB_SUFFIX_NAMES
-PHP_SAPI=default
PHP_BUILD_PROGRAM
+PHP_SAPI=none
dnl SAPI configuration.
@@ -325,6 +325,20 @@
AC_MSG_CHECKING([for chosen SAPI module])
AC_MSG_RESULT([$PHP_SAPI])
+dnl Show which binaries were selected
+AC_MSG_CHECKING([for executable SAPI binaries])
+if test "$PHP_BINARIES"; then
+ AC_MSG_RESULT([$PHP_BINARIES])
+else
+ AC_MSG_RESULT([none])
+fi
+
+dnl Exit early
+if test -z "$PHP_INSTALLED_SAPIS"; then
+ AC_MSG_ERROR([Nothing to build.])
+fi
+
+dnl force ZTS
if test "$enable_maintainer_zts" = "yes"; then
PTHREADS_ASSIGN_VARS
PTHREADS_FLAGS
@@ -966,14 +980,8 @@
enable_shared=yes
enable_static=yes
-case $php_build_target in
- program|static)
- standard_libtool_flag='-prefer-non-pic -static'
- if test -z "$PHP_MODULES" && test -z "$PHP_ZEND_EX"; then
- enable_shared=no
- fi
- ;;
- shared)
+case $php_sapi_module in
+ shared[)]
enable_static=no
case $with_pic in
yes)
@@ -985,6 +993,12 @@
esac
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module"
;;
+ *[)]
+ standard_libtool_flag='-prefer-non-pic -static'
+ if test -z "$PHP_MODULES" && test -z "$PHP_ZEND_EX"; then
+ enable_shared=no
+ fi
+ ;;
esac
EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS"
@@ -1222,24 +1236,15 @@
;;
esac
-if test "$PHP_CLI" != "no"; then
- PHP_CLI_TARGET="\$(SAPI_CLI_PATH)"
- PHP_INSTALL_CLI_TARGET="install-cli"
- PHP_ADD_SOURCES(sapi/cli, php_cli.c php_cli_readline.c,, cli)
- PHP_INSTALLED_SAPIS="cli $PHP_SAPI"
- PHP_EXECUTABLE="\$(top_builddir)/\$(SAPI_CLI_PATH)"
-else
- PHP_INSTALLED_SAPIS="$PHP_SAPI"
-fi
-
PHP_SUBST_OLD(PHP_INSTALLED_SAPIS)
PHP_SUBST(PHP_EXECUTABLE)
-PHP_SUBST(PHP_CLI_TARGET)
+
PHP_SUBST(PHP_SAPI_OBJS)
-PHP_SUBST(PHP_CLI_OBJS)
+PHP_SUBST(PHP_BINARY_OBJS)
PHP_SUBST(PHP_GLOBAL_OBJS)
+PHP_SUBST(PHP_BINARIES)
PHP_SUBST(PHP_MODULES)
PHP_SUBST(PHP_ZEND_EX)
@@ -1383,20 +1388,12 @@
pharcmd_install=
fi;
-all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) $pharcmd"
-install_targets="$install_modules install-build install-headers install-programs $install_pear $pharcmd_install"
-
-case $PHP_SAPI in
- cli)
- install_targets="$PHP_INSTALL_CLI_TARGET $install_targets"
- ;;
- *)
- install_targets="install-sapi $PHP_INSTALL_CLI_TARGET $install_targets"
- ;;
-esac
+all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_BINARIES) $pharcmd"
+install_targets="$install_sapi $install_modules $install_binaries install-build install-headers install-programs $install_pear $pharcmd_install"
PHP_SUBST(all_targets)
PHP_SUBST(install_targets)
+PHP_SUBST(install_binary_targets)
PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/])
@@ -1421,7 +1418,7 @@
PHP_ADD_BUILD_DIR(netware)
;;
*)
- PHP_ADD_SOURCES(/main, internal_functions_cli.c,, cli)
+ PHP_ADD_SOURCES_X(/main, internal_functions_cli.c,, PHP_BINARY_OBJS)
;;
esac
@@ -1452,7 +1449,6 @@
PHP_ADD_SOURCES_X(Zend, zend_execute.c,,PHP_GLOBAL_OBJS,,$flag)
PHP_ADD_BUILD_DIR(main main/streams)
-PHP_ADD_BUILD_DIR(sapi/$PHP_SAPI sapi/cli)
PHP_ADD_BUILD_DIR(TSRM)
PHP_ADD_BUILD_DIR(Zend)
diff -Naur php-5.3.15-patch1/generated_lists php-5.3.15/generated_lists
--- php-5.3.15-patch1/generated_lists 2012-07-27 15:24:23.000000000 -0700
+++ php-5.3.15/generated_lists 2012-07-27 16:21:08.000000000 -0700
@@ -1,3 +1,3 @@
makefile_am_files = Zend/Makefile.am TSRM/Makefile.am
config_h_files = Zend/acconfig.h TSRM/acconfig.h
-config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 Zend/acinclude.m4 ext/bcmath/config.m4 ext/bz2/config.m4 ext/calendar/config.m4 ext/ctype/config.m4 ext/curl/config.m4 ext/date/config0.m4 ext/dba/config.m4 ext/dom/config.m4 ext/enchant/config.m4 ext/ereg/config0.m4 ext/exif/config.m4 ext/fileinfo/config.m4 ext/filter/config.m4 ext/ftp/config.m4 ext/gd/config.m4 ext/gettext/config.m4 ext/gmp/config.m4 ext/hash/config.m4 ext/iconv/config.m4 ext/imap/config.m4 ext/interbase/config.m4 ext/intl/config.m4 ext/json/config.m4 ext/ldap/config.m4 ext/libxml/config0.m4 ext/mbstring/config.m4 ext/mcrypt/config.m4 ext/mssql/config.m4 ext/mysql/config.m4 ext/mysqli/config.m4 ext/mysqlnd/config9.m4 ext/oci8/config.m4 ext/odbc/config.m4 ext/openssl/config0.m4 ext/pcntl/config.m4 ext/pcre/config0.m4 ext/pdo/config.m4 ext/pdo_dblib/config.m4 ext/pdo_firebird/config.m4 ext/pdo_mysql/config.m4 ext/pdo_oci/config.m4 ext/pdo_odbc/config.m4 ext/pdo_pgsql/config.m4 ext/pdo_sqlite/config.m4 ext/pgsql/config.m4 ext/phar/config.m4 ext/posix/config.m4 ext/pspell/config.m4 ext/readline/config.m4 ext/recode/config9.m4 ext/recode/config.m4 ext/reflection/config.m4 ext/session/config.m4 ext/shmop/config.m4 ext/simplexml/config.m4 ext/snmp/config.m4 ext/soap/config.m4 ext/sockets/config.m4 ext/spl/config.m4 ext/sqlite3/config0.m4 ext/sqlite/config.m4 ext/standard/config.m4 ext/sybase_ct/config.m4 ext/sysvmsg/config.m4 ext/sysvsem/config.m4 ext/sysvshm/config.m4 ext/tidy/config.m4 ext/tokenizer/config.m4 ext/wddx/config.m4 ext/xml/config.m4 ext/xmlreader/config.m4 ext/xmlrpc/config.m4 ext/xmlwriter/config.m4 ext/xsl/config.m4 ext/zip/config.m4 ext/zlib/config0.m4 sapi/aolserver/config.m4 sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 sapi/apache/config.m4 sapi/apache_hooks/config.m4 sapi/caudium/config.m4 sapi/cli/config.m4 sapi/continuity/config.m4 sapi/embed/config.m4 sapi/fpm/config.m4 sapi/isapi/config.m4 sapi/litespeed/config.m4 sapi/milter/config.m4 sapi/nsapi/config.m4 sapi/phttpd/config.m4 sapi/pi3web/config.m4 sapi/roxen/config.m4 sapi/thttpd/config.m4 sapi/tux/config.m4 sapi/webjames/config.m4
+config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 Zend/acinclude.m4 ext/bcmath/config.m4 ext/bz2/config.m4 ext/calendar/config.m4 ext/ctype/config.m4 ext/curl/config.m4 ext/date/config0.m4 ext/dba/config.m4 ext/dom/config.m4 ext/enchant/config.m4 ext/ereg/config0.m4 ext/exif/config.m4 ext/fileinfo/config.m4 ext/filter/config.m4 ext/ftp/config.m4 ext/gd/config.m4 ext/gettext/config.m4 ext/gmp/config.m4 ext/hash/config.m4 ext/iconv/config.m4 ext/imap/config.m4 ext/interbase/config.m4 ext/intl/config.m4 ext/json/config.m4 ext/ldap/config.m4 ext/libxml/config0.m4 ext/mbstring/config.m4 ext/mcrypt/config.m4 ext/mssql/config.m4 ext/mysql/config.m4 ext/mysqli/config.m4 ext/mysqlnd/config9.m4 ext/oci8/config.m4 ext/odbc/config.m4 ext/openssl/config0.m4 ext/pcntl/config.m4 ext/pcre/config0.m4 ext/pdo/config.m4 ext/pdo_dblib/config.m4 ext/pdo_firebird/config.m4 ext/pdo_mysql/config.m4 ext/pdo_oci/config.m4 ext/pdo_odbc/config.m4 ext/pdo_pgsql/config.m4 ext/pdo_sqlite/config.m4 ext/pgsql/config.m4 ext/phar/config.m4 ext/posix/config.m4 ext/pspell/config.m4 ext/readline/config.m4 ext/recode/config.m4 ext/recode/config9.m4 ext/reflection/config.m4 ext/session/config.m4 ext/shmop/config.m4 ext/simplexml/config.m4 ext/snmp/config.m4 ext/soap/config.m4 ext/sockets/config.m4 ext/spl/config.m4 ext/sqlite/config.m4 ext/sqlite3/config0.m4 ext/standard/config.m4 ext/sybase_ct/config.m4 ext/sysvmsg/config.m4 ext/sysvsem/config.m4 ext/sysvshm/config.m4 ext/tidy/config.m4 ext/tokenizer/config.m4 ext/wddx/config.m4 ext/xml/config.m4 ext/xmlreader/config.m4 ext/xmlrpc/config.m4 ext/xmlwriter/config.m4 ext/xsl/config.m4 ext/zip/config.m4 ext/zlib/config0.m4 sapi/aolserver/config.m4 sapi/apache/config.m4 sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 sapi/apache_hooks/config.m4 sapi/caudium/config.m4 sapi/cli/config.m4 sapi/continuity/config.m4 sapi/embed/config.m4 sapi/fpm/config.m4 sapi/isapi/config.m4 sapi/litespeed/config.m4 sapi/milter/config.m4 sapi/nsapi/config.m4 sapi/phttpd/config.m4 sapi/pi3web/config.m4 sapi/roxen/config.m4 sapi/thttpd/config.m4 sapi/tux/config.m4 sapi/webjames/config.m4
diff -Naur php-5.3.15-patch1/main/php_config.h.in php-5.3.15/main/php_config.h.in
--- php-5.3.15-patch1/main/php_config.h.in 2012-07-27 15:24:23.000000000 -0700
+++ php-5.3.15/main/php_config.h.in 2012-07-27 16:21:12.000000000 -0700
@@ -1,4 +1,4 @@
-/* main/php_config.h.in. Generated from configure.in by autoheader. */
+/* main/php_config.h.in. Generated automatically from configure.in by autoheader. */
/* Leave this file alone */
/*
+----------------------------------------------------------------------+
@@ -34,2421 +34,2922 @@
#define ZEND_DLIMPORT
+/* Define if on AIX 3.
+ System headers sometimes define this.
+ We just want to avoid a redefinition error message. */
+#ifndef _ALL_SOURCE
+#undef _ALL_SOURCE
+#endif
+
+/* Define if using alloca.c. */
+#undef C_ALLOCA
+
+/* Define to empty if the keyword does not work. */
+#undef const
+
+/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
+ This function is required for alloca.c support on those systems. */
+#undef CRAY_STACKSEG_END
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+#undef gid_t
+
+/* Define if you have alloca, as a function or macro. */
+#undef HAVE_ALLOCA
+
+/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
+#undef HAVE_ALLOCA_H
+
+/* Define if you don't have vprintf but do have _doprnt. */
+#undef HAVE_DOPRNT
+
+/* Define if your system has a working fnmatch function. */
+#undef HAVE_FNMATCH
+
+/* Define if your struct stat has st_blksize. */
+#undef HAVE_ST_BLKSIZE
+
+/* Define if your struct stat has st_blocks. */
+#undef HAVE_ST_BLOCKS
+
+/* Define if your struct stat has st_rdev. */
+#undef HAVE_ST_RDEV
+
+/* Define if your struct tm has tm_zone. */
+#undef HAVE_TM_ZONE
+
+/* Define if you don't have tm_zone but do have the external array
+ tzname. */
+#undef HAVE_TZNAME
+
+/* Define if utime(file, NULL) sets file's timestamp to the present. */
+#undef HAVE_UTIME_NULL
+
+/* Define if you have the vprintf function. */
+#undef HAVE_VPRINTF
+
+/* Define as __inline if that's what the C compiler calls it. */
+#undef inline
+
+/* Define if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
+
+/* Define as the return type of signal handlers (int or void). */
+#undef RETSIGTYPE
+
+/* Define to `unsigned' if <sys/types.h> doesn't define. */
+#undef size_t
+
+/* If using the C implementation of alloca, define if you know the
+ direction of stack growth for your system; otherwise it will be
+ automatically deduced at run-time.
+ STACK_DIRECTION > 0 => grows toward higher addresses
+ STACK_DIRECTION < 0 => grows toward lower addresses
+ STACK_DIRECTION = 0 => direction of growth unknown
+ */
+#undef STACK_DIRECTION
+
+/* Define if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define if you can safely include both <sys/time.h> and <time.h>. */
+#undef TIME_WITH_SYS_TIME
+
+/* Define if your <sys/time.h> declares struct tm. */
+#undef TM_IN_SYS_TIME
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+#undef uid_t
+
#undef uint
#undef ulong
-/* Define if you want to enable memory limit support */
-#define MEMORY_LIMIT 0
+/* The number of bytes in a char. */
+#undef SIZEOF_CHAR
+/* The number of bytes in a char *. */
+#undef SIZEOF_CHAR_P
-/* */
-#undef AIX
+/* The number of bytes in a int. */
+#undef SIZEOF_INT
-/* Whether to use native BeOS threads */
-#undef BETHREADS
+/* The number of bytes in a long. */
+#undef SIZEOF_LONG
-/* */
-#undef CDB_INCLUDE_FILE
+/* The number of bytes in a long int. */
+#undef SIZEOF_LONG_INT
-/* Define if system uses EBCDIC */
-#undef CHARSET_EBCDIC
+/* The number of bytes in a long long. */
+#undef SIZEOF_LONG_LONG
-/* Whether to build bcmath as dynamic module */
-#undef COMPILE_DL_BCMATH
+/* The number of bytes in a long long int. */
+#undef SIZEOF_LONG_LONG_INT
-/* Whether to build bz2 as dynamic module */
-#undef COMPILE_DL_BZ2
+/* The number of bytes in a short. */
+#undef SIZEOF_SHORT
-/* Whether to build calendar as dynamic module */
-#undef COMPILE_DL_CALENDAR
+/* The number of bytes in a size_t. */
+#undef SIZEOF_SIZE_T
-/* Whether to build ctype as dynamic module */
-#undef COMPILE_DL_CTYPE
+/* Define if you have the CreateProcess function. */
+#undef HAVE_CREATEPROCESS
-/* Whether to build curl as dynamic module */
-#undef COMPILE_DL_CURL
+/* Define if you have the acosh function. */
+#undef HAVE_ACOSH
-/* Whether to build date as dynamic module */
-#undef COMPILE_DL_DATE
+/* Define if you have the alphasort function. */
+#undef HAVE_ALPHASORT
-/* Whether to build dba as dynamic module */
-#undef COMPILE_DL_DBA
+/* Define if you have the asctime_r function. */
+#undef HAVE_ASCTIME_R
-/* Whether to build dom as dynamic module */
-#undef COMPILE_DL_DOM
+/* Define if you have the asinh function. */
+#undef HAVE_ASINH
-/* Whether to build enchant as dynamic module */
-#undef COMPILE_DL_ENCHANT
+/* Define if you have the asprintf function. */
+#undef HAVE_ASPRINTF
-/* Whether to build ereg as dynamic module */
-#undef COMPILE_DL_EREG
+/* Define if you have the atanh function. */
+#undef HAVE_ATANH
-/* Whether to build exif as dynamic module */
-#undef COMPILE_DL_EXIF
+/* Define if you have the atoll function. */
+#undef HAVE_ATOLL
-/* Whether to build fileinfo as dynamic module */
-#undef COMPILE_DL_FILEINFO
+/* Define if you have the chroot function. */
+#undef HAVE_CHROOT
-/* Whether to build filter as dynamic module */
-#undef COMPILE_DL_FILTER
+/* Define if you have the clearenv function. */
+#undef HAVE_CLEARENV
-/* Whether to build ftp as dynamic module */
-#undef COMPILE_DL_FTP
+/* Define if you have the crypt function. */
+#undef HAVE_CRYPT
-/* Whether to build gd as dynamic module */
-#undef COMPILE_DL_GD
+/* Define if you have the crypt_r function. */
+#undef HAVE_CRYPT_R
+
+/* Define if you have the ctermid function. */
+#undef HAVE_CTERMID
+
+/* Define if you have the ctime_r function. */
+#undef HAVE_CTIME_R
+
+/* Define if you have the cuserid function. */
+#undef HAVE_CUSERID
+
+/* Define if you have the fabsf function. */
+#undef HAVE_FABSF
+
+/* Define if you have the finite function. */
+#undef HAVE_FINITE
+
+/* Define if you have the flock function. */
+#undef HAVE_FLOCK
+
+/* Define if you have the floorf function. */
+#undef HAVE_FLOORF
+
+/* Define if you have the fork function. */
+#undef HAVE_FORK
+
+/* Define if you have the fpclass function. */
+#undef HAVE_FPCLASS
+
+/* Define if you have the ftok function. */
+#undef HAVE_FTOK
+
+/* Define if you have the funopen function. */
+#undef HAVE_FUNOPEN
+
+/* Define if you have the gai_strerror function. */
+#undef HAVE_GAI_STRERROR
+
+/* Define if you have the gcvt function. */
+#undef HAVE_GCVT
+
+/* Define if you have the getcwd function. */
+#undef HAVE_GETCWD
+
+/* Define if you have the getgrgid_r function. */
+#undef HAVE_GETGRGID_R
+
+/* Define if you have the getgrnam_r function. */
+#undef HAVE_GETGRNAM_R
+
+/* Define if you have the getgroups function. */
+#undef HAVE_GETGROUPS
+
+/* Define if you have the gethostname function. */
+#undef HAVE_GETHOSTNAME
+
+/* Define if you have the getloadavg function. */
+#undef HAVE_GETLOADAVG
+
+/* Define if you have the getlogin function. */
+#undef HAVE_GETLOGIN
+
+/* Define if you have the getopt function. */
+#undef HAVE_GETOPT
+
+/* Define if you have the getpgid function. */
+#undef HAVE_GETPGID
+
+/* Define if you have the getpid function. */
+#undef HAVE_GETPID
+
+/* Define if you have the getpriority function. */
+#undef HAVE_GETPRIORITY
+
+/* Define if you have the getprotobyname function. */
+#undef HAVE_GETPROTOBYNAME
+
+/* Define if you have the getprotobynumber function. */
+#undef HAVE_GETPROTOBYNUMBER
+
+/* Define if you have the getpwnam_r function. */
+#undef HAVE_GETPWNAM_R
+
+/* Define if you have the getpwuid_r function. */
+#undef HAVE_GETPWUID_R
+
+/* Define if you have the getrlimit function. */
+#undef HAVE_GETRLIMIT
+
+/* Define if you have the getrusage function. */
+#undef HAVE_GETRUSAGE
+
+/* Define if you have the getservbyname function. */
+#undef HAVE_GETSERVBYNAME
+
+/* Define if you have the getservbyport function. */
+#undef HAVE_GETSERVBYPORT
+
+/* Define if you have the getsid function. */
+#undef HAVE_GETSID
+
+/* Define if you have the gettimeofday function. */
+#undef HAVE_GETTIMEOFDAY
+
+/* Define if you have the getwd function. */
+#undef HAVE_GETWD
+
+/* Define if you have the glob function. */
+#undef HAVE_GLOB
+
+/* Define if you have the gmtime_r function. */
+#undef HAVE_GMTIME_R
+
+/* Define if you have the grantpt function. */
+#undef HAVE_GRANTPT
+
+/* Define if you have the hstrerror function. */
+#undef HAVE_HSTRERROR
+
+/* Define if you have the hypot function. */
+#undef HAVE_HYPOT
+
+/* Define if you have the inet_ntoa function. */
+#undef HAVE_INET_NTOA
+
+/* Define if you have the inet_ntop function. */
+#undef HAVE_INET_NTOP
+
+/* Define if you have the inet_pton function. */
+#undef HAVE_INET_PTON
+
+/* Define if you have the initgroups function. */
+#undef HAVE_INITGROUPS
+
+/* Define if you have the isascii function. */
+#undef HAVE_ISASCII
+
+/* Define if you have the isfinite function. */
+#undef HAVE_ISFINITE
+
+/* Define if you have the isinf function. */
+#undef HAVE_ISINF
+
+/* Define if you have the isnan function. */
+#undef HAVE_ISNAN
+
+/* Define if you have the kill function. */
+#undef HAVE_KILL
+
+/* Define if you have the lchown function. */
+#undef HAVE_LCHOWN
+
+/* Define if you have the ldap_parse_reference function. */
+#undef HAVE_LDAP_PARSE_REFERENCE
+
+/* Define if you have the ldap_parse_result function. */
+#undef HAVE_LDAP_PARSE_RESULT
+
+/* Define if you have the ldap_start_tls_s function. */
+#undef HAVE_LDAP_START_TLS_S
+
+/* Define if you have the link function. */
+#undef HAVE_LINK
+
+/* Define if you have the localeconv function. */
+#undef HAVE_LOCALECONV
+
+/* Define if you have the localtime_r function. */
+#undef HAVE_LOCALTIME_R
+
+/* Define if you have the lockf function. */
+#undef HAVE_LOCKF
+
+/* Define if you have the log1p function. */
+#undef HAVE_LOG1P
+
+/* Define if you have the lrand48 function. */
+#undef HAVE_LRAND48
+
+/* Define if you have the makedev function. */
+#undef HAVE_MAKEDEV
+
+/* Define if you have the mblen function. */
+#undef HAVE_MBLEN
+
+/* Define if you have the mbrlen function. */
+#undef HAVE_MBRLEN
+
+/* Define if you have the mbsinit function. */
+#undef HAVE_MBSINIT
+
+/* Define if you have the memcpy function. */
+#undef HAVE_MEMCPY
+
+/* Define if you have the memmove function. */
+#undef HAVE_MEMMOVE
+
+/* Define if you have the mempcpy function. */
+#undef HAVE_MEMPCPY
+
+/* Define if you have the mkfifo function. */
+#undef HAVE_MKFIFO
+
+/* Define if you have the mknod function. */
+#undef HAVE_MKNOD
+
+/* Define if you have the mkstemp function. */
+#undef HAVE_MKSTEMP
+
+/* Define if you have the mmap function. */
+#undef HAVE_MMAP
+
+/* Define if you have the mremap function. */
+#undef HAVE_MREMAP
+
+/* Define if you have the mysql_commit function. */
+#undef HAVE_MYSQL_COMMIT
+
+/* Define if you have the mysql_next_result function. */
+#undef HAVE_MYSQL_NEXT_RESULT
+
+/* Define if you have the mysql_sqlstate function. */
+#undef HAVE_MYSQL_SQLSTATE
+
+/* Define if you have the mysql_stmt_prepare function. */
+#undef HAVE_MYSQL_STMT_PREPARE
+
+/* Define if you have the nanosleep function. */
+#undef HAVE_NANOSLEEP
+
+/* Define if you have the nice function. */
+#undef HAVE_NICE
+
+/* Define if you have the nl_langinfo function. */
+#undef HAVE_NL_LANGINFO
+
+/* Define if you have the perror function. */
+#undef HAVE_PERROR
+
+/* Define if you have the poll function. */
+#undef HAVE_POLL
+
+/* Define if you have the ptsname function. */
+#undef HAVE_PTSNAME
+
+/* Define if you have the putenv function. */
+#undef HAVE_PUTENV
+
+/* Define if you have the rand_r function. */
+#undef HAVE_RAND_R
+
+/* Define if you have the random function. */
+#undef HAVE_RANDOM
+
+/* Define if you have the realpath function. */
+#undef HAVE_REALPATH
+
+/* Define if you have the rl_completion_matches function. */
+#undef HAVE_RL_COMPLETION_MATCHES
+
+/* Define if you have the scandir function. */
+#undef HAVE_SCANDIR
+
+/* Define if you have the setegid function. */
+#undef HAVE_SETEGID
+
+/* Define if you have the setenv function. */
+#undef HAVE_SETENV
+
+/* Define if you have the seteuid function. */
+#undef HAVE_SETEUID
+
+/* Define if you have the setitimer function. */
+#undef HAVE_SETITIMER
+
+/* Define if you have the setlocale function. */
+#undef HAVE_SETLOCALE
+
+/* Define if you have the setpgid function. */
+#undef HAVE_SETPGID
+
+/* Define if you have the setpriority function. */
+#undef HAVE_SETPRIORITY
+
+/* Define if you have the setproctitle function. */
+#undef HAVE_SETPROCTITLE
+
+/* Define if you have the setsid function. */
+#undef HAVE_SETSID
+
+/* Define if you have the setsockopt function. */
+#undef HAVE_SETSOCKOPT
+
+/* Define if you have the setvbuf function. */
+#undef HAVE_SETVBUF
+
+/* Define if you have the shutdown function. */
+#undef HAVE_SHUTDOWN
+
+/* Define if you have the sigaction function. */
+#undef HAVE_SIGACTION
+
+/* Define if you have the sigprocmask function. */
+#undef HAVE_SIGPROCMASK
+
+/* Define if you have the sigsetjmp function. */
+#undef HAVE_SIGSETJMP
+
+/* Define if you have the sigtimedwait function. */
+#undef HAVE_SIGTIMEDWAIT
+
+/* Define if you have the sigwaitinfo function. */
+#undef HAVE_SIGWAITINFO
+
+/* Define if you have the sin function. */
+#undef HAVE_SIN
+
+/* Define if you have the snprintf function. */
+#undef HAVE_SNPRINTF
+
+/* Define if you have the socketpair function. */
+#undef HAVE_SOCKETPAIR
+
+/* Define if you have the srand48 function. */
+#undef HAVE_SRAND48
+
+/* Define if you have the srandom function. */
+#undef HAVE_SRANDOM
+
+/* Define if you have the statfs function. */
+#undef HAVE_STATFS
+
+/* Define if you have the statvfs function. */
+#undef HAVE_STATVFS
+
+/* Define if you have the std_syslog function. */
+#undef HAVE_STD_SYSLOG
+
+/* Define if you have the strcasecmp function. */
+#undef HAVE_STRCASECMP
+
+/* Define if you have the strcoll function. */
+#undef HAVE_STRCOLL
+
+/* Define if you have the strdup function. */
+#undef HAVE_STRDUP
+
+/* Define if you have the strerror function. */
+#undef HAVE_STRERROR
+
+/* Define if you have the strfmon function. */
+#undef HAVE_STRFMON
+
+/* Define if you have the strftime function. */
+#undef HAVE_STRFTIME
+
+/* Define if you have the strlcat function. */
+#undef HAVE_STRLCAT
+
+/* Define if you have the strlcpy function. */
+#undef HAVE_STRLCPY
+
+/* Define if you have the strndup function. */
+#undef HAVE_STRNDUP
+
+/* Define if you have the strnlen function. */
+#undef HAVE_STRNLEN
+
+/* Define if you have the strpbrk function. */
+#undef HAVE_STRPBRK
+
+/* Define if you have the strpncpy function. */
+#undef HAVE_STRPNCPY
+
+/* Define if you have the strptime function. */
+#undef HAVE_STRPTIME
+
+/* Define if you have the strstr function. */
+#undef HAVE_STRSTR
+
+/* Define if you have the strtod function. */
+#undef HAVE_STRTOD
+
+/* Define if you have the strtok_r function. */
+#undef HAVE_STRTOK_R
+
+/* Define if you have the strtol function. */
+#undef HAVE_STRTOL
+
+/* Define if you have the strtoll function. */
+#undef HAVE_STRTOLL
+
+/* Define if you have the strtoul function. */
+#undef HAVE_STRTOUL
+
+/* Define if you have the strtoull function. */
+#undef HAVE_STRTOULL
+
+/* Define if you have the symlink function. */
+#undef HAVE_SYMLINK
+
+/* Define if you have the tempnam function. */
+#undef HAVE_TEMPNAM
+
+/* Define if you have the tzset function. */
+#undef HAVE_TZSET
+
+/* Define if you have the unlockpt function. */
+#undef HAVE_UNLOCKPT
+
+/* Define if you have the unsetenv function. */
+#undef HAVE_UNSETENV
+
+/* Define if you have the usleep function. */
+#undef HAVE_USLEEP
+
+/* Define if you have the utime function. */
+#undef HAVE_UTIME
+
+/* Define if you have the utimes function. */
+#undef HAVE_UTIMES
+
+/* Define if you have the vasprintf function. */
+#undef HAVE_VASPRINTF
+
+/* Define if you have the vsnprintf function. */
+#undef HAVE_VSNPRINTF
+
+/* Define if you have the wait3 function. */
+#undef HAVE_WAIT3
+
+/* Define if you have the waitpid function. */
+#undef HAVE_WAITPID
+
+/* Define if you have the </nsapi.h> header file. */
+#undef HAVE__NSAPI_H
+
+/* Define if you have the <ApplicationServices/ApplicationServices.h> header file. */
+#undef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H
+
+/* Define if you have the <alloca.h> header file. */
+#undef HAVE_ALLOCA_H
+
+/* Define if you have the <arpa/inet.h> header file. */
+#undef HAVE_ARPA_INET_H
+
+/* Define if you have the <arpa/nameser.h> header file. */
+#undef HAVE_ARPA_NAMESER_H
-/* Whether to build gettext as dynamic module */
-#undef COMPILE_DL_GETTEXT
+/* Define if you have the <assert.h> header file. */
+#undef HAVE_ASSERT_H
-/* Whether to build gmp as dynamic module */
-#undef COMPILE_DL_GMP
+/* Define if you have the <atomic.h> header file. */
+#undef HAVE_ATOMIC_H
-/* Whether to build hash as dynamic module */
-#undef COMPILE_DL_HASH
+/* Define if you have the <crypt.h> header file. */
+#undef HAVE_CRYPT_H
-/* Whether to build iconv as dynamic module */
-#undef COMPILE_DL_ICONV
+/* Define if you have the <default_store.h> header file. */
+#undef HAVE_DEFAULT_STORE_H
-/* Whether to build imap as dynamic module */
-#undef COMPILE_DL_IMAP
+/* Define if you have the <dirent.h> header file. */
+#undef HAVE_DIRENT_H
-/* Whether to build interbase as dynamic module */
-#undef COMPILE_DL_INTERBASE
+/* Define if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
-/* Whether to build intl as dynamic module */
-#undef COMPILE_DL_INTL
+/* Define if you have the <dns.h> header file. */
+#undef HAVE_DNS_H
-/* Whether to build json as dynamic module */
-#undef COMPILE_DL_JSON
+/* Define if you have the <errno.h> header file. */
+#undef HAVE_ERRNO_H
-/* Whether to build ldap as dynamic module */
-#undef COMPILE_DL_LDAP
+/* Define if you have the <fcntl.h> header file. */
+#undef HAVE_FCNTL_H
-/* Whether to build libxml as dynamic module */
-#undef COMPILE_DL_LIBXML
+/* Define if you have the <grp.h> header file. */
+#undef HAVE_GRP_H
-/* Whether to build mbstring as dynamic module */
-#undef COMPILE_DL_MBSTRING
+/* Define if you have the <ieeefp.h> header file. */
+#undef HAVE_IEEEFP_H
-/* Whether to build mcrypt as dynamic module */
-#undef COMPILE_DL_MCRYPT
+/* Define if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
-/* Whether to build mssql as dynamic module */
-#undef COMPILE_DL_MSSQL
+/* Define if you have the <langinfo.h> header file. */
+#undef HAVE_LANGINFO_H
-/* Whether to build mysql as dynamic module */
-#undef COMPILE_DL_MYSQL
+/* Define if you have the <limits.h> header file. */
+#undef HAVE_LIMITS_H
-/* Whether to build mysqli as dynamic module */
-#undef COMPILE_DL_MYSQLI
+/* Define if you have the <locale.h> header file. */
+#undef HAVE_LOCALE_H
-/* Whether to build mysqlnd as dynamic module */
-#undef COMPILE_DL_MYSQLND
+/* Define if you have the <malloc.h> header file. */
+#undef HAVE_MALLOC_H
-/* Whether to build oci8 as dynamic module */
-#undef COMPILE_DL_OCI8
+/* Define if you have the <monetary.h> header file. */
+#undef HAVE_MONETARY_H
-/* Whether to build odbc as dynamic module */
-#undef COMPILE_DL_ODBC
+/* Define if you have the <ndir.h> header file. */
+#undef HAVE_NDIR_H
-/* Whether to build openssl as dynamic module */
-#undef COMPILE_DL_OPENSSL
+/* Define if you have the <netdb.h> header file. */
+#undef HAVE_NETDB_H
-/* Whether to build pcntl as dynamic module */
-#undef COMPILE_DL_PCNTL
+/* Define if you have the <netinet/in.h> header file. */
+#undef HAVE_NETINET_IN_H
-/* Whether to build pcre as dynamic module */
-#undef COMPILE_DL_PCRE
+/* Define if you have the <netinet/tcp.h> header file. */
+#undef HAVE_NETINET_TCP_H
-/* Whether to build pdo as dynamic module */
-#undef COMPILE_DL_PDO
+/* Define if you have the <openssl/crypto.h> header file. */
+#undef HAVE_OPENSSL_CRYPTO_H
-/* Whether to build pdo_dblib as dynamic module */
-#undef COMPILE_DL_PDO_DBLIB
+/* Define if you have the <pwd.h> header file. */
+#undef HAVE_PWD_H
-/* Whether to build pdo_firebird as dynamic module */
-#undef COMPILE_DL_PDO_FIREBIRD
+/* Define if you have the <resolv.h> header file. */
+#undef HAVE_RESOLV_H
-/* Whether to build pdo_mysql as dynamic module */
-#undef COMPILE_DL_PDO_MYSQL
+/* Define if you have the <signal.h> header file. */
+#undef HAVE_SIGNAL_H
-/* Whether to build pdo_oci as dynamic module */
-#undef COMPILE_DL_PDO_OCI
+/* Define if you have the <st.h> header file. */
+#undef HAVE_ST_H
-/* Whether to build pdo_odbc as dynamic module */
-#undef COMPILE_DL_PDO_ODBC
+/* Define if you have the <stdarg.h> header file. */
+#undef HAVE_STDARG_H
-/* Whether to build pdo_pgsql as dynamic module */
-#undef COMPILE_DL_PDO_PGSQL
+/* Define if you have the <stdbool.h> header file. */
+#undef HAVE_STDBOOL_H
-/* Whether to build pdo_sqlite as dynamic module */
-#undef COMPILE_DL_PDO_SQLITE
+/* Define if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
-/* Whether to build pgsql as dynamic module */
-#undef COMPILE_DL_PGSQL
+/* Define if you have the <stdio.h> header file. */
+#undef HAVE_STDIO_H
-/* Whether to build phar as dynamic module */
-#undef COMPILE_DL_PHAR
+/* Define if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
-/* Whether to build posix as dynamic module */
-#undef COMPILE_DL_POSIX
+/* Define if you have the <string.h> header file. */
+#undef HAVE_STRING_H
-/* Whether to build pspell as dynamic module */
-#undef COMPILE_DL_PSPELL
+/* Define if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
-/* Whether to build readline as dynamic module */
-#undef COMPILE_DL_READLINE
+/* Define if you have the <sys/dir.h> header file. */
+#undef HAVE_SYS_DIR_H
-/* Whether to build recode as dynamic module */
-#undef COMPILE_DL_RECODE
+/* Define if you have the <sys/file.h> header file. */
+#undef HAVE_SYS_FILE_H
-/* Whether to build reflection as dynamic module */
-#undef COMPILE_DL_REFLECTION
+/* Define if you have the <sys/ioctl.h> header file. */
+#undef HAVE_SYS_IOCTL_H
-/* Whether to build session as dynamic module */
-#undef COMPILE_DL_SESSION
+/* Define if you have the <sys/ipc.h> header file. */
+#undef HAVE_SYS_IPC_H
-/* Whether to build shmop as dynamic module */
-#undef COMPILE_DL_SHMOP
+/* Define if you have the <sys/loadavg.h> header file. */
+#undef HAVE_SYS_LOADAVG_H
-/* Whether to build simplexml as dynamic module */
-#undef COMPILE_DL_SIMPLEXML
+/* Define if you have the <sys/mkdev.h> header file. */
+#undef HAVE_SYS_MKDEV_H
-/* Whether to build snmp as dynamic module */
-#undef COMPILE_DL_SNMP
+/* Define if you have the <sys/mman.h> header file. */
+#undef HAVE_SYS_MMAN_H
-/* Whether to build soap as dynamic module */
-#undef COMPILE_DL_SOAP
+/* Define if you have the <sys/mount.h> header file. */
+#undef HAVE_SYS_MOUNT_H
-/* Whether to build sockets as dynamic module */
-#undef COMPILE_DL_SOCKETS
+/* Define if you have the <sys/ndir.h> header file. */
+#undef HAVE_SYS_NDIR_H
-/* Whether to build spl as dynamic module */
-#undef COMPILE_DL_SPL
+/* Define if you have the <sys/param.h> header file. */
+#undef HAVE_SYS_PARAM_H
-/* Whether to build sqlite as dynamic module */
-#undef COMPILE_DL_SQLITE
+/* Define if you have the <sys/poll.h> header file. */
+#undef HAVE_SYS_POLL_H
-/* Whether to build sqlite3 as dynamic module */
-#undef COMPILE_DL_SQLITE3
+/* Define if you have the <sys/resource.h> header file. */
+#undef HAVE_SYS_RESOURCE_H
-/* Whether to build standard as dynamic module */
-#undef COMPILE_DL_STANDARD
+/* Define if you have the <sys/select.h> header file. */
+#undef HAVE_SYS_SELECT_H
-/* Whether to build sybase_ct as dynamic module */
-#undef COMPILE_DL_SYBASE_CT
+/* Define if you have the <sys/socket.h> header file. */
+#undef HAVE_SYS_SOCKET_H
-/* Whether to build sysvmsg as dynamic module */
-#undef COMPILE_DL_SYSVMSG
+/* Define if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
-/* Whether to build sysvsem as dynamic module */
-#undef COMPILE_DL_SYSVSEM
+/* Define if you have the <sys/statfs.h> header file. */
+#undef HAVE_SYS_STATFS_H
-/* Whether to build sysvshm as dynamic module */
-#undef COMPILE_DL_SYSVSHM
+/* Define if you have the <sys/statvfs.h> header file. */
+#undef HAVE_SYS_STATVFS_H
-/* Whether to build tidy as dynamic module */
-#undef COMPILE_DL_TIDY
+/* Define if you have the <sys/sysexits.h> header file. */
+#undef HAVE_SYS_SYSEXITS_H
-/* Whether to build tokenizer as dynamic module */
-#undef COMPILE_DL_TOKENIZER
+/* Define if you have the <sys/time.h> header file. */
+#undef HAVE_SYS_TIME_H
-/* Whether to build wddx as dynamic module */
-#undef COMPILE_DL_WDDX
+/* Define if you have the <sys/times.h> header file. */
+#undef HAVE_SYS_TIMES_H
-/* Whether to build xml as dynamic module */
-#undef COMPILE_DL_XML
+/* Define if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
-/* Whether to build xmlreader as dynamic module */
-#undef COMPILE_DL_XMLREADER
+/* Define if you have the <sys/uio.h> header file. */
+#undef HAVE_SYS_UIO_H
-/* Whether to build xmlrpc as dynamic module */
-#undef COMPILE_DL_XMLRPC
+/* Define if you have the <sys/un.h> header file. */
+#undef HAVE_SYS_UN_H
-/* Whether to build xmlwriter as dynamic module */
-#undef COMPILE_DL_XMLWRITER
+/* Define if you have the <sys/utsname.h> header file. */
+#undef HAVE_SYS_UTSNAME_H
-/* Whether to build xsl as dynamic module */
-#undef COMPILE_DL_XSL
+/* Define if you have the <sys/varargs.h> header file. */
+#undef HAVE_SYS_VARARGS_H
-/* Whether to build zip as dynamic module */
-#undef COMPILE_DL_ZIP
+/* Define if you have the <sys/vfs.h> header file. */
+#undef HAVE_SYS_VFS_H
-/* Whether to build zlib as dynamic module */
-#undef COMPILE_DL_ZLIB
+/* Define if you have the <sys/wait.h> header file. */
+#undef HAVE_SYS_WAIT_H
-/* */
-#undef COOKIE_IO_FUNCTIONS_T
+/* Define if you have the <sysexits.h> header file. */
+#undef HAVE_SYSEXITS_H
-/* */
-#undef COOKIE_SEEKER_USES_OFF64_T
+/* Define if you have the <syslog.h> header file. */
+#undef HAVE_SYSLOG_H
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
- systems. This function is required for `alloca.c' support on those systems.
- */
-#undef CRAY_STACKSEG_END
+/* Define if you have the <termios.h> header file. */
+#undef HAVE_TERMIOS_H
-/* Define if crypt_r has uses CRYPTD */
-#undef CRYPT_R_CRYPTD
+/* Define if you have the <time.h> header file. */
+#undef HAVE_TIME_H
-/* Define if struct crypt_data requires _GNU_SOURCE */
-#undef CRYPT_R_GNU_SOURCE
+/* Define if you have the <tuxmodule.h> header file. */
+#undef HAVE_TUXMODULE_H
-/* Define if crypt_r uses struct crypt_data */
-#undef CRYPT_R_STRUCT_CRYPT_DATA
+/* Define if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
-/* Define to 1 if using `alloca.c'. */
-#undef C_ALLOCA
+/* Define if you have the <unix.h> header file. */
+#undef HAVE_UNIX_H
-/* Define if the target system is darwin */
-#undef DARWIN
+/* Define if you have the <utime.h> header file. */
+#undef HAVE_UTIME_H
-/* */
-#undef DB1_INCLUDE_FILE
+/* Define if you have the <wchar.h> header file. */
+#undef HAVE_WCHAR_H
-/* */
-#undef DB1_VERSION
+/* Define if you have the <xmlparse.h> header file. */
+#undef HAVE_XMLPARSE_H
-/* */
-#undef DB2_INCLUDE_FILE
+/* Define if you have the <xmltok.h> header file. */
+#undef HAVE_XMLTOK_H
-/* */
-#undef DB3_INCLUDE_FILE
+/* Define if you have the m library (-lm). */
+#undef HAVE_LIBM
-/* */
-#undef DB4_INCLUDE_FILE
+/* Define if the target system has /dev/urandom device */
+#undef HAVE_DEV_URANDOM
-/* */
-#undef DBA_CDB
+/* Suhosin Patch */
+#undef SUHOSIN_PATCH
-/* */
-#undef DBA_CDB_BUILTIN
+/* Whether you have AOLserver */
+#undef HAVE_AOLSERVER
-/* */
-#undef DBA_CDB_MAKE
+/* */
+#undef HAVE_AP_CONFIG_H
-/* */
-#undef DBA_DB1
+/* */
+#undef HAVE_AP_COMPAT_H
-/* */
-#undef DBA_DB2
+/* */
+#undef HAVE_APACHE
-/* */
-#undef DBA_DB3
+/* */
+#undef HAVE_APACHE
-/* */
-#undef DBA_DB4
+/* */
+#undef HAVE_AP_CONFIG_H
-/* */
-#undef DBA_DBM
+/* */
+#undef HAVE_AP_CONFIG_H
-/* */
-#undef DBA_FLATFILE
+/* */
+#undef HAVE_AP_COMPAT_H
-/* */
-#undef DBA_GDBM
+/* */
+#undef HAVE_OLD_COMPAT_H
-/* */
-#undef DBA_INIFILE
+/* */
+#undef HAVE_AP_CONFIG_H
-/* */
-#undef DBA_NDBM
+/* */
+#undef HAVE_AP_COMPAT_H
-/* */
-#undef DBA_QDBM
+/* */
+#undef HAVE_OLD_COMPAT_H
-/* */
-#undef DBM_INCLUDE_FILE
+/* */
+#undef HAVE_AP_CONFIG_H
-/* */
-#undef DBM_VERSION
+/* */
+#undef HAVE_AP_COMPAT_H
-/* */
-#undef DEFAULT_SHORT_OPEN_TAG
+/* */
+#undef HAVE_OLD_COMPAT_H
-/* Define if dlsym() requires a leading underscore in symbol names. */
-#undef DLSYM_NEEDS_UNDERSCORE
+/* */
+#undef USE_TRANSFER_TABLES
-/* Whether to enable chroot() function */
-#undef ENABLE_CHROOT_FUNC
+/* */
+#undef PHP_APACHE_HAVE_CLIENT_FD
-/* */
-#undef ENABLE_GD_TTF
+/* */
+#undef HAVE_AP_CONFIG_H
-/* */
-#undef ENCHANT_VERSION_STRING
+/* */
+#undef HAVE_AP_COMPAT_H
-/* */
-#undef GDBM_INCLUDE_FILE
+/* */
+#undef HAVE_APACHE_HOOKS
+
+/* */
+#undef HAVE_APACHE
-/* Whether you use GNU Pth */
-#undef GNUPTH
+/* */
+#undef HAVE_AP_CONFIG_H
-/* Whether 3 arg set_rebind_proc() */
-#undef HAVE_3ARG_SETREBINDPROC
+/* */
+#undef HAVE_AP_CONFIG_H
-/* Define to 1 if you have the `acosh' function. */
-#undef HAVE_ACOSH
+/* */
+#undef HAVE_AP_COMPAT_H
-/* */
-#undef HAVE_ADABAS
+/* */
+#undef HAVE_OLD_COMPAT_H
-/* whether the compiler supports __alignof__ */
-#undef HAVE_ALIGNOF
+/* */
+#undef HAVE_AP_CONFIG_H
-/* Define to 1 if you have `alloca', as a function or macro. */
-#undef HAVE_ALLOCA
+/* */
+#undef HAVE_AP_COMPAT_H
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
- */
-#undef HAVE_ALLOCA_H
+/* */
+#undef HAVE_OLD_COMPAT_H
-/* Define to 1 if you have the `alphasort' function. */
-#undef HAVE_ALPHASORT
+/* */
+#undef HAVE_AP_CONFIG_H
-/* Suhosin-Patch for PHP */
-#undef SUHOSIN_PATCH
+/* */
+#undef HAVE_AP_COMPAT_H
-/* Whether you have AOLserver */
-#undef HAVE_AOLSERVER
+/* */
+#undef HAVE_OLD_COMPAT_H
-/* */
-#undef HAVE_APACHE
+/* */
+#undef USE_TRANSFER_TABLES
-/* */
-#undef HAVE_APACHE_HOOKS
+/* */
+#undef PHP_APACHE_HAVE_CLIENT_FD
-/* Define to 1 if you have the <ApplicationServices/ApplicationServices.h>
- header file. */
-#undef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H
+/* Whether to compile with Caudium support */
+#undef HAVE_CAUDIUM
-/* */
-#undef HAVE_AP_COMPAT_H
+/* Whether you have a Continuity Server */
+#undef HAVE_CONTINUITY
-/* */
-#undef HAVE_AP_CONFIG_H
+/* do we have prctl? */
+#undef HAVE_PRCTL
-/* Define to 1 if you have the <arpa/inet.h> header file. */
-#undef HAVE_ARPA_INET_H
+/* do we have clock_gettime? */
+#undef HAVE_CLOCK_GETTIME
-/* Define to 1 if you have the <arpa/nameser.h> header file. */
-#undef HAVE_ARPA_NAMESER_H
+/* do we have clock_get_time? */
+#undef HAVE_CLOCK_GET_TIME
-/* Define to 1 if you have the `asctime_r' function. */
-#undef HAVE_ASCTIME_R
+/* do we have ptrace? */
+#undef HAVE_PTRACE
-/* Define to 1 if you have the `asinh' function. */
-#undef HAVE_ASINH
+/* do we have mach_vm_read? */
+#undef HAVE_MACH_VM_READ
-/* Define to 1 if you have the `asprintf' function. */
-#undef HAVE_ASPRINTF
+/* /proc/pid/mem interface */
+#undef PROC_MEM_FILE
-/* Define to 1 if you have the <assert.h> header file. */
-#undef HAVE_ASSERT_H
+/* Define to 1 if gcc supports __sync_bool_compare_and_swap() a.o. */
+#undef HAVE_BUILTIN_ATOMIC
-/* Define to 1 if you have the `atanh' function. */
-#undef HAVE_ATANH
+/* do we have TCP_INFO? */
+#undef HAVE_LQ_TCP_INFO
-/* whether atof() accepts INF */
-#undef HAVE_ATOF_ACCEPTS_INF
+/* do we have SO_LISTENQxxx? */
+#undef HAVE_LQ_SO_LISTENQ
-/* whether atof() accepts NAN */
-#undef HAVE_ATOF_ACCEPTS_NAN
+/* do we have sysconf? */
+#undef HAVE_SYSCONF
-/* Define to 1 if you have the `atoll' function. */
-#undef HAVE_ATOLL
+/* do we have times? */
+#undef HAVE_TIMES
-/* Define to 1 if you have the <atomic.h> header file. */
-#undef HAVE_ATOMIC_H
+/* do we have kqueue? */
+#undef HAVE_KQUEUE
-/* whether the compiler supports __attribute__ ((__aligned__)) */
-#undef HAVE_ATTRIBUTE_ALIGNED
+/* do we have port framework? */
+#undef HAVE_PORT
-/* Whether you have bcmath */
-#undef HAVE_BCMATH
+/* do we have /dev/poll? */
+#undef HAVE_DEVPOLL
-/* */
-#undef HAVE_BIND_TEXTDOMAIN_CODESET
+/* do we have epoll? */
+#undef HAVE_EPOLL
-/* */
-#undef HAVE_BIRDSTEP
+/* do we have poll? */
+#undef HAVE_POLL
-/* Define if system has broken getcwd */
-#undef HAVE_BROKEN_GETCWD
+/* do we have select? */
+#undef HAVE_SELECT
-/* Define if your glibc borks on fopen with mode a+ */
-#undef HAVE_BROKEN_GLIBC_FOPEN_APPEND
+/* fpm user name */
+#undef PHP_FPM_USER
-/* Whether we have librecode 3.5 */
-#undef HAVE_BROKEN_RECODE
+/* fpm group name */
+#undef PHP_FPM_GROUP
-/* Konstantin Chuguev's iconv implementation */
-#undef HAVE_BSD_ICONV
+/* */
+#undef WITH_ZEUS
-/* */
-#undef HAVE_BUILD_DEFS_H
+/* Whether you have a Netscape/iPlanet/Sun Webserver */
+#undef HAVE_NSAPI
-/* Define to 1 if gcc supports __sync_bool_compare_and_swap() a.o. */
-#undef HAVE_BUILTIN_ATOMIC
+/* Whether you have phttpd */
+#undef HAVE_PHTTPD
-/* */
-#undef HAVE_BUNDLED_PCRE
+/* whether you want Pi3Web support */
+#undef WITH_PI3WEB
-/* */
-#undef HAVE_BZ2
+/* Whether you use Roxen */
+#undef HAVE_ROXEN
-/* */
-#undef HAVE_CALENDAR
+/* Whether to use Roxen in ZTS mode */
+#undef ROXEN_USE_ZTS
-/* Whether to compile with Caudium support */
-#undef HAVE_CAUDIUM
+/* Define if the socklen_t typedef is in sys/socket.h */
+#undef HAVE_SOCKLEN_T
-/* Define to 1 if you have the `chroot' function. */
-#undef HAVE_CHROOT
+/* Define if sockaddr_un in sys/un.h contains a sun_len component */
+#undef HAVE_SOCKADDR_UN_SUN_LEN
-/* Define to 1 if you have the `clearenv' function. */
-#undef HAVE_CLEARENV
+/* Define if cross-process locking is required by accept() */
+#undef USE_LOCKING
-/* */
-#undef HAVE_CLI0CLI_H
+/* Define if system uses EBCDIC */
+#undef CHARSET_EBCDIC
-/* */
-#undef HAVE_CLI0CORE_H
+/* Define if processor uses big-endian word */
+#undef WORDS_BIGENDIAN
-/* */
-#undef HAVE_CLI0DEFS_H
+/* whether write(2) works */
+#undef PHP_WRITE_STDOUT
-/* */
-#undef HAVE_CLI0ENV_H
+/* */
+#undef HAVE_SOCKET
-/* */
-#undef HAVE_CLI0EXT_H
+/* */
+#undef HAVE_SOCKET
-/* do we have clock_gettime? */
-#undef HAVE_CLOCK_GETTIME
+/* */
+#undef HAVE_LIBSOCKET
-/* do we have clock_get_time? */
-#undef HAVE_CLOCK_GET_TIME
+/* */
+#undef HAVE_SOCKETPAIR
-/* Whether you have struct cmsghdr */
-#undef HAVE_CMSGHDR
+/* */
+#undef HAVE_SOCKETPAIR
-/* */
-#undef HAVE_CODBC
+/* */
+#undef HAVE_LIBSOCKET
-/* */
-#undef HAVE_COLORCLOSESTHWB
+/* */
+#undef HAVE_HTONL
-/* Whether you have a Continuity Server */
-#undef HAVE_CONTINUITY
+/* */
+#undef HAVE_HTONL
-/* Define to 1 if you have the `CreateProcess' function. */
-#undef HAVE_CREATEPROCESS
+/* */
+#undef HAVE_LIBSOCKET
-/* */
-#undef HAVE_CRYPT
+/* */
+#undef HAVE_GETHOSTNAME
-/* Define to 1 if you have the <crypt.h> header file. */
-#undef HAVE_CRYPT_H
+/* */
+#undef HAVE_GETHOSTNAME
-/* Define to 1 if you have the `crypt_r' function. */
-#undef HAVE_CRYPT_R
+/* */
+#undef HAVE_LIBNSL
-/* Define to 1 if you have the `ctermid' function. */
-#undef HAVE_CTERMID
+/* */
+#undef HAVE_GETHOSTBYADDR
-/* Define to 1 if you have the `ctime_r' function. */
-#undef HAVE_CTIME_R
+/* */
+#undef HAVE_GETHOSTBYADDR
-/* */
-#undef HAVE_CTYPE
+/* */
+#undef HAVE_LIBNSL
-/* */
-#undef HAVE_CURL
+/* */
+#undef HAVE_YP_GET_DEFAULT_DOMAIN
-/* */
-#undef HAVE_CURL_EASY_STRERROR
+/* */
+#undef HAVE_YP_GET_DEFAULT_DOMAIN
-/* Have cURL with GnuTLS support */
-#undef HAVE_CURL_GNUTLS
+/* */
+#undef HAVE_LIBNSL
-/* */
-#undef HAVE_CURL_MULTI_STRERROR
+/* */
+#undef HAVE_DLOPEN
-/* Have cURL with OpenSSL support */
-#undef HAVE_CURL_OPENSSL
+/* */
+#undef HAVE_DLOPEN
-/* Have cURL with SSL support */
-#undef HAVE_CURL_SSL
+/* */
+#undef HAVE_LIBDL
-/* */
-#undef HAVE_CURL_VERSION_INFO
+/* */
+#undef HAVE_LIBDL
-/* Define to 1 if you have the `cuserid' function. */
-#undef HAVE_CUSERID
+/* */
+#undef HAVE_INET_ATON
-/* */
-#undef HAVE_DBA
+/* */
+#undef HAVE_INET_ATON
-/* Whether you want DBMaker */
-#undef HAVE_DBMAKER
+/* */
+#undef HAVE_LIBRESOLV
-/* */
-#undef HAVE_DCNGETTEXT
+/* */
+#undef HAVE_INET_ATON
-/* Whether system headers declare timezone */
-#undef HAVE_DECLARED_TIMEZONE
+/* */
+#undef HAVE_LIBBIND
-/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't.
- */
-#undef HAVE_DECL_TZNAME
+/* */
+#undef HAVE_FOPENCOOKIE
-/* Define to 1 if you have the <default_store.h> header file. */
-#undef HAVE_DEFAULT_STORE_H
+/* */
+#undef COOKIE_IO_FUNCTIONS_T
-/* do we have /dev/poll? */
-#undef HAVE_DEVPOLL
+/* */
+#undef COOKIE_SEEKER_USES_OFF64_T
-/* Define if the target system has /dev/urandom device */
-#undef HAVE_DEV_URANDOM
+/* Define if system has broken getcwd */
+#undef HAVE_BROKEN_GETCWD
-/* Define to 1 if you have the <dirent.h> header file. */
-#undef HAVE_DIRENT_H
+/* Define if your glibc borks on fopen with mode a+ */
+#undef HAVE_BROKEN_GLIBC_FOPEN_APPEND
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
+/* Whether localtime_r is declared */
+#undef MISSING_LOCALTIME_R_DECL
-/* */
-#undef HAVE_DLOPEN
+/* Whether gmtime_r is declared */
+#undef MISSING_GMTIME_R_DECL
-/* Whether you have dmalloc */
-#undef HAVE_DMALLOC
+/* Whether asctime_r is declared */
+#undef MISSING_ASCTIME_R_DECL
-/* */
-#undef HAVE_DNGETTEXT
+/* Whether ctime_r is declared */
+#undef MISSING_CTIME_R_DECL
-/* Define to 1 if you have the <dns.h> header file. */
-#undef HAVE_DNS_H
+/* Whether strtok_r is declared */
+#undef MISSING_STRTOK_R_DECL
-/* */
-#undef HAVE_DNS_SEARCH
+/* */
+#undef MISSING_FCLOSE_DECL
-/* */
-#undef HAVE_DN_EXPAND
+/* */
+#undef MISSING_FCLOSE_DECL
-/* */
-#undef HAVE_DN_SKIPNAME
+/* whether you have tm_gmtoff in struct tm */
+#undef HAVE_TM_GMTOFF
-/* */
-#undef HAVE_DOM
+/* whether you have struct flock */
+#undef HAVE_STRUCT_FLOCK
-/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
-#undef HAVE_DOPRNT
+/* Whether you have socklen_t */
+#undef HAVE_SOCKLEN_T
-/* OpenSSL 0.9.7 or later */
-#undef HAVE_DSA_DEFAULT_METHOD
+/* Size of intmax_t */
+#undef SIZEOF_INTMAX_T
-/* embedded MySQL support enabled */
-#undef HAVE_EMBEDDED_MYSQLI
+/* Whether intmax_t is available */
+#undef HAVE_INTMAX_T
-/* */
-#undef HAVE_EMPRESS
+/* Size of ssize_t */
+#undef SIZEOF_SSIZE_T
-/* */
-#undef HAVE_ENCHANT
+/* Whether ssize_t is available */
+#undef HAVE_SSIZE_T
-/* */
-#undef HAVE_ENCHANT_BROKER_SET_PARAM
+/* Size of ptrdiff_t */
+#undef SIZEOF_PTRDIFF_T
-/* do we have epoll? */
-#undef HAVE_EPOLL
+/* Whether ptrdiff_t is available */
+#undef HAVE_PTRDIFF_T
-/* Define to 1 if you have the <errno.h> header file. */
-#undef HAVE_ERRNO_H
+/* Whether you have struct sockaddr_storage */
+#undef HAVE_SOCKADDR_STORAGE
-/* */
-#undef HAVE_ESOOB
+/* Whether struct sockaddr has field sa_len */
+#undef HAVE_SOCKADDR_SA_LEN
-/* Whether you want EXIF (metadata from images) support */
-#undef HAVE_EXIF
+/* */
+#undef HAVE_NANOSLEEP
-/* Define to 1 if you have the `fabsf' function. */
-#undef HAVE_FABSF
+/* */
+#undef HAVE_LIBRT
-/* Define to 1 if you have the <fcntl.h> header file. */
-#undef HAVE_FCNTL_H
+/* Define if you have the getaddrinfo function */
+#undef HAVE_GETADDRINFO
-/* Define to 1 if you have the `finite' function. */
-#undef HAVE_FINITE
+/* Define if you have the __sync_fetch_and_add function */
+#undef HAVE_SYNC_FETCH_AND_ADD
-/* Define to 1 if you have the `flock' function. */
-#undef HAVE_FLOCK
+/* Whether system headers declare timezone */
+#undef HAVE_DECLARED_TIMEZONE
-/* Define to 1 if you have the `floorf' function. */
-#undef HAVE_FLOORF
+/* Whether you have HP-UX 10.x */
+#undef PHP_HPUX_TIME_R
-/* Define if flush should be called explicitly after a buffered io. */
-#undef HAVE_FLUSHIO
+/* Whether you have IRIX-style functions */
+#undef PHP_IRIX_TIME_R
-/* Define to 1 if your system has a working POSIX `fnmatch' function. */
-#undef HAVE_FNMATCH
+/* whether you have POSIX readdir_r */
+#undef HAVE_POSIX_READDIR_R
-/* */
-#undef HAVE_FOPENCOOKIE
+/* whether you have old-style readdir_r */
+#undef HAVE_OLD_READDIR_R
-/* Define to 1 if you have the `fork' function. */
-#undef HAVE_FORK
+/* */
+#undef in_addr_t
-/* Define to 1 if you have the `fpclass' function. */
-#undef HAVE_FPCLASS
+/* Define if crypt_r has uses CRYPTD */
+#undef CRYPT_R_CRYPTD
-/* whether fpsetprec is present and usable */
-#undef HAVE_FPSETPREC
+/* Define if crypt_r uses struct crypt_data */
+#undef CRYPT_R_STRUCT_CRYPT_DATA
-/* whether FPU control word can be manipulated by inline assembler */
-#undef HAVE_FPU_INLINE_ASM_X86
+/* Define if struct crypt_data requires _GNU_SOURCE */
+#undef CRYPT_R_GNU_SOURCE
-/* whether floatingpoint.h defines fp_except */
-#undef HAVE_FP_EXCEPT
+/* Whether you have gcov */
+#undef HAVE_GCOV
-/* */
-#undef HAVE_FREETDS
+/* */
+#undef PHP_SAFE_MODE
-/* Define to 1 if you have the `ftok' function. */
-#undef HAVE_FTOK
+/* */
+#undef PHP_SAFE_MODE
-/* Whether you want FTP support */
-#undef HAVE_FTP
+/* */
+#undef PHP_SAFE_MODE_EXEC_DIR
-/* Define to 1 if you have the `funopen' function. */
-#undef HAVE_FUNOPEN
+/* */
+#undef PHP_SAFE_MODE_EXEC_DIR
-/* Define to 1 if you have the `gai_strerror' function. */
-#undef HAVE_GAI_STRERROR
+/* */
+#undef PHP_SIGCHILD
-/* Whether you have gcov */
-#undef HAVE_GCOV
+/* */
+#undef PHP_SIGCHILD
-/* Define to 1 if you have the `gcvt' function. */
-#undef HAVE_GCVT
+/* */
+#undef MAGIC_QUOTES
-/* */
-#undef HAVE_GDIMAGECOLORRESOLVE
+/* */
+#undef MAGIC_QUOTES
-/* */
-#undef HAVE_GD_BUNDLED
+/* */
+#undef DEFAULT_SHORT_OPEN_TAG
-/* */
-#undef HAVE_GD_CACHE_CREATE
+/* */
+#undef DEFAULT_SHORT_OPEN_TAG
-/* */
-#undef HAVE_GD_DYNAMIC_CTX_EX
+/* Whether you have dmalloc */
+#undef HAVE_DMALLOC
-/* */
-#undef HAVE_GD_FONTCACHESHUTDOWN
+/* Whether to enable IPv6 support */
+#undef HAVE_IPV6
-/* */
-#undef HAVE_GD_FONTMUTEX
+/* Define if int32_t type is present. */
+#undef HAVE_INT32_T
-/* */
-#undef HAVE_GD_FREEFONTCACHE
+/* Define if uint32_t type is present. */
+#undef HAVE_UINT32_T
-/* */
-#undef HAVE_GD_GD2
+/* Whether to build date as dynamic module */
+#undef COMPILE_DL_DATE
-/* */
-#undef HAVE_GD_GIF_CREATE
+/* Whether to build ereg as dynamic module */
+#undef COMPILE_DL_EREG
-/* */
-#undef HAVE_GD_GIF_CTX
+/* */
+#undef HAVE_REGEX_T_RE_MAGIC
-/* */
-#undef HAVE_GD_GIF_READ
+/* */
+#undef HSREGEX
-/* */
-#undef HAVE_GD_IMAGEELLIPSE
+/* */
+#undef REGEX
-/* */
-#undef HAVE_GD_IMAGESETBRUSH
+/* */
+#undef REGEX
-/* */
-#undef HAVE_GD_IMAGESETTILE
+/* 1 */
+#undef HAVE_REGEX_T_RE_MAGIC
-/* */
-#undef HAVE_GD_JPG
+/* */
+#undef HAVE_LIBXML
-/* */
-#undef HAVE_GD_PNG
+/* */
+#undef HAVE_LIBXML
-/* */
-#undef HAVE_GD_STRINGFT
+/* Whether to build libxml as dynamic module */
+#undef COMPILE_DL_LIBXML
-/* */
-#undef HAVE_GD_STRINGFTEX
+/* Whether to build openssl as dynamic module */
+#undef COMPILE_DL_OPENSSL
-/* */
-#undef HAVE_GD_STRINGTTF
+/* OpenSSL 0.9.7 or later */
+#undef HAVE_DSA_DEFAULT_METHOD
-/* */
-#undef HAVE_GD_WBMP
+/* OpenSSL 0.9.7 or later */
+#undef HAVE_DSA_DEFAULT_METHOD
-/* */
-#undef HAVE_GD_XBM
+/* */
+#undef HAVE_OPENSSL_EXT
-/* */
-#undef HAVE_GD_XPM
+/* */
+#undef HAVE_PCRE
-/* Define if you have the getaddrinfo function */
-#undef HAVE_GETADDRINFO
+/* Whether to build pcre as dynamic module */
+#undef COMPILE_DL_PCRE
-/* Define to 1 if you have the `getcwd' function. */
-#undef HAVE_GETCWD
+/* Whether to build pcre as dynamic module */
+#undef COMPILE_DL_PCRE
-/* Define to 1 if you have the `getgrgid_r' function. */
-#undef HAVE_GETGRGID_R
+/* */
+#undef HAVE_BUNDLED_PCRE
-/* Define to 1 if you have the `getgrnam_r' function. */
-#undef HAVE_GETGRNAM_R
+/* have commercial sqlite3 with crypto support */
+#undef HAVE_SQLITE3_KEY
-/* Define to 1 if you have the `getgroups' function. */
-#undef HAVE_GETGROUPS
+/* have sqlite3 with extension support */
+#undef SQLITE_OMIT_LOAD_EXTENSION
-/* */
-#undef HAVE_GETHOSTBYADDR
+/* */
+#undef HAVE_SQLITE3
-/* Define to 1 if you have the `gethostname' function. */
-#undef HAVE_GETHOSTNAME
+/* Whether to build sqlite3 as dynamic module */
+#undef COMPILE_DL_SQLITE3
-/* Define to 1 if you have the `getloadavg' function. */
-#undef HAVE_GETLOADAVG
+/* Whether to build zlib as dynamic module */
+#undef COMPILE_DL_ZLIB
-/* Define to 1 if you have the `getlogin' function. */
-#undef HAVE_GETLOGIN
+/* */
+#undef HAVE_ZLIB
-/* Define to 1 if you have the `getopt' function. */
-#undef HAVE_GETOPT
+/* Whether to build bcmath as dynamic module */
+#undef COMPILE_DL_BCMATH
-/* Define to 1 if you have the `getpgid' function. */
-#undef HAVE_GETPGID
+/* Whether you have bcmath */
+#undef HAVE_BCMATH
-/* Define to 1 if you have the `getpid' function. */
-#undef HAVE_GETPID
+/* */
+#undef HAVE_BZ2
-/* Define to 1 if you have the `getpriority' function. */
-#undef HAVE_GETPRIORITY
+/* Whether to build bz2 as dynamic module */
+#undef COMPILE_DL_BZ2
-/* Define to 1 if you have the `getprotobyname' function. */
-#undef HAVE_GETPROTOBYNAME
+/* */
+#undef HAVE_CALENDAR
-/* Define to 1 if you have the `getprotobynumber' function. */
-#undef HAVE_GETPROTOBYNUMBER
+/* Whether to build calendar as dynamic module */
+#undef COMPILE_DL_CALENDAR
-/* Define to 1 if you have the `getpwnam_r' function. */
-#undef HAVE_GETPWNAM_R
+/* */
+#undef HAVE_CTYPE
-/* Define to 1 if you have the `getpwuid_r' function. */
-#undef HAVE_GETPWUID_R
+/* Whether to build ctype as dynamic module */
+#undef COMPILE_DL_CTYPE
-/* Define to 1 if you have the `getrlimit' function. */
-#undef HAVE_GETRLIMIT
+/* Have cURL with SSL support */
+#undef HAVE_CURL_SSL
-/* Define to 1 if you have the `getrusage' function. */
-#undef HAVE_GETRUSAGE
+/* Have cURL with OpenSSL support */
+#undef HAVE_CURL_OPENSSL
-/* Define to 1 if you have the `getservbyname' function. */
-#undef HAVE_GETSERVBYNAME
+/* Have cURL with GnuTLS support */
+#undef HAVE_CURL_GNUTLS
-/* Define to 1 if you have the `getservbyport' function. */
-#undef HAVE_GETSERVBYPORT
+/* */
+#undef HAVE_CURL
-/* Define to 1 if you have the `getsid' function. */
-#undef HAVE_GETSID
+/* */
+#undef HAVE_CURL_VERSION_INFO
-/* Define to 1 if you have the `gettimeofday' function. */
-#undef HAVE_GETTIMEOFDAY
+/* */
+#undef HAVE_CURL_EASY_STRERROR
-/* Define to 1 if you have the `getwd' function. */
-#undef HAVE_GETWD
+/* */
+#undef HAVE_CURL_MULTI_STRERROR
-/* */
-#undef HAVE_GICONV_H
+/* */
+#undef PHP_CURL_URL_WRAPPERS
-/* glibc's iconv implementation */
-#undef HAVE_GLIBC_ICONV
+/* Whether to build curl as dynamic module */
+#undef COMPILE_DL_CURL
-/* Define to 1 if you have the `glob' function. */
-#undef HAVE_GLOB
+/* */
+#undef QDBM_INCLUDE_FILE
-/* */
-#undef HAVE_GMP
+/* */
+#undef DBA_QDBM
-/* Define to 1 if you have the `gmtime_r' function. */
-#undef HAVE_GMTIME_R
+/* */
+#undef GDBM_INCLUDE_FILE
-/* Define to 1 if you have the `grantpt' function. */
-#undef HAVE_GRANTPT
+/* */
+#undef DBA_GDBM
-/* Define to 1 if you have the <grp.h> header file. */
-#undef HAVE_GRP_H
+/* */
+#undef NDBM_INCLUDE_FILE
-/* Have HASH Extension */
-#undef HAVE_HASH_EXT
+/* */
+#undef DBA_NDBM
-/* Define to 1 if you have the `hstrerror' function. */
-#undef HAVE_HSTRERROR
+/* */
+#undef DBA_DB4
-/* */
-#undef HAVE_HTONL
+/* */
+#undef DB4_INCLUDE_FILE
-/* whether HUGE_VAL == INF */
-#undef HAVE_HUGE_VAL_INF
+/* */
+#undef DBA_DB3
-/* whether HUGE_VAL + -HUGEVAL == NAN */
-#undef HAVE_HUGE_VAL_NAN
+/* */
+#undef DB3_INCLUDE_FILE
-/* Define to 1 if you have the `hypot' function. */
-#undef HAVE_HYPOT
+/* */
+#undef DBA_DB2
-/* */
-#undef HAVE_IBASE
+/* */
+#undef DB2_INCLUDE_FILE
-/* */
-#undef HAVE_IBMDB2
+/* */
+#undef DB1_VERSION
-/* IBM iconv implementation */
-#undef HAVE_IBM_ICONV
+/* */
+#undef DB1_VERSION
-/* */
-#undef HAVE_ICONV
+/* */
+#undef DB1_INCLUDE_FILE
-/* Define to 1 if you have the <ieeefp.h> header file. */
-#undef HAVE_IEEEFP_H
+/* */
+#undef DBA_DB1
-/* */
-#undef HAVE_IMAP
+/* */
+#undef DBM_INCLUDE_FILE
-/* */
-#undef HAVE_IMAP2000
+/* */
+#undef DBM_VERSION
-/* */
-#undef HAVE_IMAP2001
+/* */
+#undef DBM_VERSION
-/* */
-#undef HAVE_IMAP2004
+/* */
+#undef DBA_DBM
-/* */
-#undef HAVE_IMAP_AUTH_GSS
+/* */
+#undef DBA_CDB_BUILTIN
-/* */
-#undef HAVE_IMAP_KRB
+/* */
+#undef DBA_CDB_MAKE
-/* */
-#undef HAVE_IMAP_MUTF7
+/* */
+#undef DBA_CDB
-/* */
-#undef HAVE_IMAP_SSL
+/* */
+#undef CDB_INCLUDE_FILE
-/* */
-#undef HAVE_INET_ATON
+/* */
+#undef DBA_CDB
-/* Define to 1 if you have the `inet_ntoa' function. */
-#undef HAVE_INET_NTOA
+/* */
+#undef DBA_INIFILE
-/* Define to 1 if you have the `inet_ntop' function. */
-#undef HAVE_INET_NTOP
+/* */
+#undef DBA_FLATFILE
-/* Define to 1 if you have the `inet_pton' function. */
-#undef HAVE_INET_PTON
+/* */
+#undef HAVE_DBA
-/* Define to 1 if you have the `initgroups' function. */
-#undef HAVE_INITGROUPS
+/* Whether to build dba as dynamic module */
+#undef COMPILE_DL_DBA
-/* Define if int32_t type is present. */
-#undef HAVE_INT32_T
+/* */
+#undef HAVE_LIBXML
-/* Whether intmax_t is available */
-#undef HAVE_INTMAX_T
+/* */
+#undef HAVE_DOM
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
+/* Whether to build dom as dynamic module */
+#undef COMPILE_DL_DOM
-/* */
-#undef HAVE_IODBC
+/* Whether to build enchant as dynamic module */
+#undef COMPILE_DL_ENCHANT
-/* */
-#undef HAVE_IODBC_H
+/* */
+#undef HAVE_ENCHANT
-/* Whether to enable IPv6 support */
-#undef HAVE_IPV6
+/* */
+#undef HAVE_ENCHANT_BROKER_SET_PARAM
-/* Define to 1 if you have the `isascii' function. */
-#undef HAVE_ISASCII
+/* */
+#undef ENCHANT_VERSION_STRING
-/* Define to 1 if you have the `isfinite' function. */
-#undef HAVE_ISFINITE
+/* Whether you want EXIF (metadata from images) support */
+#undef HAVE_EXIF
-/* Define to 1 if you have the `isinf' function. */
-#undef HAVE_ISINF
+/* Whether to build exif as dynamic module */
+#undef COMPILE_DL_EXIF
-/* Define to 1 if you have the `isnan' function. */
-#undef HAVE_ISNAN
+/* Whether to build fileinfo as dynamic module */
+#undef COMPILE_DL_FILEINFO
-/* */
-#undef HAVE_ISQLEXT_H
+/* Whether to build filter as dynamic module */
+#undef COMPILE_DL_FILTER
-/* */
-#undef HAVE_ISQL_H
+/* Whether you want FTP support */
+#undef HAVE_FTP
-/* whether to enable JavaScript Object Serialization support */
-#undef HAVE_JSON
+/* Whether to build ftp as dynamic module */
+#undef COMPILE_DL_FTP
-/* Define to 1 if you have the `kill' function. */
-#undef HAVE_KILL
+/* */
+#undef USE_GD_IMGSTRTTF
-/* do we have kqueue? */
-#undef HAVE_KQUEUE
+/* */
+#undef USE_GD_IMGSTRTTF
-/* Define to 1 if you have the <langinfo.h> header file. */
-#undef HAVE_LANGINFO_H
+/* */
+#undef HAVE_LIBFREETYPE
-/* Define to 1 if you have the `lchown' function. */
-#undef HAVE_LCHOWN
+/* */
+#undef ENABLE_GD_TTF
-/* */
-#undef HAVE_LDAP
+/* */
+#undef HAVE_LIBT1
-/* Define to 1 if you have the `ldap_parse_reference' function. */
-#undef HAVE_LDAP_PARSE_REFERENCE
+/* */
+#undef HAVE_LIBGD
-/* Define to 1 if you have the `ldap_parse_result' function. */
-#undef HAVE_LDAP_PARSE_RESULT
+/* */
+#undef HAVE_LIBGD13
-/* LDAP SASL support */
-#undef HAVE_LDAP_SASL
+/* */
+#undef HAVE_LIBGD15
-/* */
-#undef HAVE_LDAP_SASL_H
+/* */
+#undef HAVE_LIBGD20
-/* */
-#undef HAVE_LDAP_SASL_SASL_H
+/* */
+#undef HAVE_LIBGD204
-/* Define to 1 if you have the `ldap_start_tls_s' function. */
-#undef HAVE_LDAP_START_TLS_S
+/* */
+#undef HAVE_GD_IMAGESETTILE
-/* */
-#undef HAVE_LIBBIND
+/* */
+#undef HAVE_GD_IMAGESETBRUSH
-/* */
-#undef HAVE_LIBCRYPT
+/* */
+#undef HAVE_GDIMAGECOLORRESOLVE
-/* */
-#undef HAVE_LIBDL
+/* */
+#undef HAVE_COLORCLOSESTHWB
-/* */
-#undef HAVE_LIBDNET_STUB
+/* */
+#undef HAVE_GD_WBMP
-/* */
-#undef HAVE_LIBEDIT
+/* */
+#undef HAVE_GD_GD2
-/* */
-#undef HAVE_LIBEXPAT
+/* */
+#undef HAVE_GD_PNG
-/* */
-#undef HAVE_LIBFREETYPE
+/* */
+#undef HAVE_GD_XBM
-/* */
-#undef HAVE_LIBGD
+/* */
+#undef HAVE_GD_BUNDLED
-/* */
-#undef HAVE_LIBGD13
+/* */
+#undef HAVE_GD_GIF_READ
-/* */
-#undef HAVE_LIBGD15
+/* */
+#undef HAVE_GD_GIF_CREATE
-/* */
-#undef HAVE_LIBGD20
+/* */
+#undef HAVE_GD_IMAGEELLIPSE
-/* */
-#undef HAVE_LIBGD204
+/* */
+#undef HAVE_GD_FONTCACHESHUTDOWN
-/* */
-#undef HAVE_LIBICONV
+/* */
+#undef HAVE_GD_FONTMUTEX
-/* */
-#undef HAVE_LIBINTL
+/* */
+#undef HAVE_GD_DYNAMIC_CTX_EX
-/* Define to 1 if you have the `m' library (-lm). */
-#undef HAVE_LIBM
+/* */
+#undef HAVE_GD_GIF_CTX
-/* */
-#undef HAVE_LIBMCRYPT
+/* */
+#undef HAVE_GD_JPG
-/* Whether you have libmm */
-#undef HAVE_LIBMM
+/* */
+#undef HAVE_GD_XPM
-/* */
-#undef HAVE_LIBNSL
+/* */
+#undef HAVE_GD_STRINGFT
-/* */
-#undef HAVE_LIBPAM
+/* */
+#undef HAVE_GD_STRINGFTEX
-/* */
-#undef HAVE_LIBRARYMANAGER_H
+/* */
+#undef ENABLE_GD_TTF
-/* */
-#undef HAVE_LIBREADLINE
+/* */
+#undef USE_GD_JISX0208
-/* Whether we have librecode 3.5 or higher */
-#undef HAVE_LIBRECODE
+/* */
+#undef USE_GD_IMGSTRTTF
-/* */
-#undef HAVE_LIBRESOLV
+/* */
+#undef USE_GD_IMGSTRTTF
-/* */
-#undef HAVE_LIBRT
+/* */
+#undef HAVE_LIBFREETYPE
-/* */
-#undef HAVE_LIBSOCKET
+/* */
+#undef ENABLE_GD_TTF
-/* */
+/* */
#undef HAVE_LIBT1
-/* */
-#undef HAVE_LIBXML
-
-/* Define to 1 if you have the <limits.h> header file. */
-#undef HAVE_LIMITS_H
+/* */
+#undef HAVE_LIBGD
-/* Define to 1 if you have the `link' function. */
-#undef HAVE_LINK
+/* */
+#undef HAVE_LIBGD13
-/* Define to 1 if you have the `localeconv' function. */
-#undef HAVE_LOCALECONV
+/* */
+#undef HAVE_LIBGD15
-/* Define to 1 if you have the <locale.h> header file. */
-#undef HAVE_LOCALE_H
+/* */
+#undef HAVE_GD_PNG
-/* Define to 1 if you have the `localtime_r' function. */
-#undef HAVE_LOCALTIME_R
+/* */
+#undef HAVE_GD_GIF_READ
-/* Define to 1 if you have the `lockf' function. */
-#undef HAVE_LOCKF
+/* */
+#undef HAVE_GD_GIF_CREATE
-/* Define to 1 if you have the `log1p' function. */
-#undef HAVE_LOG1P
+/* */
+#undef HAVE_GD_WBMP
-/* do we have SO_LISTENQxxx? */
-#undef HAVE_LQ_SO_LISTENQ
+/* */
+#undef HAVE_GD_JPG
-/* do we have TCP_INFO? */
-#undef HAVE_LQ_TCP_INFO
+/* */
+#undef HAVE_GD_XPM
-/* Define to 1 if you have the `lrand48' function. */
-#undef HAVE_LRAND48
+/* */
+#undef HAVE_GD_GD2
-/* do we have mach_vm_read? */
-#undef HAVE_MACH_VM_READ
+/* */
+#undef HAVE_LIBGD20
-/* Define to 1 if you have the `makedev' function. */
-#undef HAVE_MAKEDEV
+/* */
+#undef HAVE_GD_IMAGESETTILE
-/* Define to 1 if you have the <malloc.h> header file. */
-#undef HAVE_MALLOC_H
+/* */
+#undef HAVE_GD_IMAGEELLIPSE
-/* Define to 1 if you have the `mblen' function. */
-#undef HAVE_MBLEN
+/* */
+#undef HAVE_GD_IMAGESETBRUSH
-/* whether to have multibyte regex support */
-#undef HAVE_MBREGEX
+/* */
+#undef HAVE_GD_STRINGTTF
-/* Define to 1 if you have the `mbrlen' function. */
-#undef HAVE_MBRLEN
+/* */
+#undef HAVE_GD_STRINGFT
-/* Define to 1 if you have the `mbsinit' function. */
-#undef HAVE_MBSINIT
+/* */
+#undef HAVE_GD_STRINGFTEX
-/* Define if your system has mbstate_t in wchar.h */
-#undef HAVE_MBSTATE_T
+/* */
+#undef HAVE_COLORCLOSESTHWB
-/* whether to have multibyte string support */
-#undef HAVE_MBSTRING
+/* */
+#undef HAVE_GDIMAGECOLORRESOLVE
-/* Define to 1 if you have the `memcpy' function. */
-#undef HAVE_MEMCPY
+/* */
+#undef HAVE_GD_GIF_CTX
-/* Define to 1 if you have the `memmove' function. */
-#undef HAVE_MEMMOVE
+/* */
+#undef HAVE_GD_CACHE_CREATE
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
+/* */
+#undef HAVE_GD_FONTCACHESHUTDOWN
-/* Define to 1 if you have the `mempcpy' function. */
-#undef HAVE_MEMPCPY
+/* */
+#undef HAVE_GD_FREEFONTCACHE
-/* Define if the target system has support for memory allocation using
- mmap(MAP_ANON) */
-#undef HAVE_MEM_MMAP_ANON
+/* */
+#undef HAVE_GD_FONTMUTEX
-/* Define if the target system has support for memory allocation using
- mmap("/dev/zero") */
-#undef HAVE_MEM_MMAP_ZERO
+/* */
+#undef HAVE_GD_DYNAMIC_CTX_EX
-/* Define to 1 if you have the `mkfifo' function. */
-#undef HAVE_MKFIFO
+/* */
+#undef HAVE_LIBGD204
-/* Define to 1 if you have the `mknod' function. */
-#undef HAVE_MKNOD
+/* Whether to build gd as dynamic module */
+#undef COMPILE_DL_GD
-/* Define to 1 if you have the `mkstemp' function. */
-#undef HAVE_MKSTEMP
+/* */
+#undef HAVE_LIBINTL
-/* Define to 1 if you have the `mmap' function. */
-#undef HAVE_MMAP
+/* Whether to build gettext as dynamic module */
+#undef COMPILE_DL_GETTEXT
-/* Define to 1 if you have the <monetary.h> header file. */
-#undef HAVE_MONETARY_H
+/* */
+#undef HAVE_NGETTEXT
-/* Define to 1 if you have the `mremap' function. */
-#undef HAVE_MREMAP
+/* */
+#undef HAVE_DNGETTEXT
-/* */
-#undef HAVE_MSSQL
+/* */
+#undef HAVE_DCNGETTEXT
-/* Whether you have MySQL */
-#undef HAVE_MYSQL
+/* */
+#undef HAVE_BIND_TEXTDOMAIN_CODESET
-/* */
-#undef HAVE_MYSQLILIB
+/* Whether to build gmp as dynamic module */
+#undef COMPILE_DL_GMP
-/* Define to 1 if you have the `mysql_commit' function. */
-#undef HAVE_MYSQL_COMMIT
+/* */
+#undef HAVE_GMP
-/* Define to 1 if you have the `mysql_next_result' function. */
-#undef HAVE_MYSQL_NEXT_RESULT
+/* */
+#undef PHP_MHASH_BC
-/* Define to 1 if you have the `mysql_sqlstate' function. */
-#undef HAVE_MYSQL_SQLSTATE
+/* Have HASH Extension */
+#undef HAVE_HASH_EXT
-/* Define to 1 if you have the `mysql_stmt_prepare' function. */
-#undef HAVE_MYSQL_STMT_PREPARE
+/* Define if processor uses big-endian word */
+#undef WORDS_BIGENDIAN
-/* Define to 1 if you have the `nanosleep' function. */
-#undef HAVE_NANOSLEEP
+/* Whether to build hash as dynamic module */
+#undef COMPILE_DL_HASH
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-#undef HAVE_NDIR_H
+/* */
+#undef HAVE_LIBICONV
-/* Define to 1 if you have the <netdb.h> header file. */
-#undef HAVE_NETDB_H
+/* */
+#undef HAVE_GICONV_H
-/* Define to 1 if you have the <netinet/in.h> header file. */
-#undef HAVE_NETINET_IN_H
+/* */
+#undef HAVE_LIBICONV
-/* Define to 1 if you have the <netinet/tcp.h> header file. */
-#undef HAVE_NETINET_TCP_H
+/* iconv() is aliased to libiconv() in -liconv */
+#undef ICONV_ALIASED_LIBICONV
-/* */
-#undef HAVE_NET_SNMP
+/* */
+#undef HAVE_ICONV
-/* Whether utf8_mime2text() has new signature */
-#undef HAVE_NEW_MIME2TEXT
+/* Which iconv implementation to use */
+#undef PHP_ICONV_IMPL
-/* */
-#undef HAVE_NGETTEXT
+/* Konstantin Chuguev's iconv implementation */
+#undef HAVE_BSD_ICONV
-/* Define to 1 if you have the `nice' function. */
-#undef HAVE_NICE
+/* Which iconv implementation to use */
+#undef PHP_ICONV_IMPL
-/* Define to 1 if you have the `nl_langinfo' function. */
-#undef HAVE_NL_LANGINFO
+/* glibc's iconv implementation */
+#undef HAVE_GLIBC_ICONV
-/* Whether you have a Netscape/iPlanet/Sun Webserver */
-#undef HAVE_NSAPI
+/* Which iconv implementation to use */
+#undef PHP_ICONV_IMPL
-/* */
-#undef HAVE_NSLDAP
+/* IBM iconv implementation */
+#undef HAVE_IBM_ICONV
-/* */
-#undef HAVE_OCI8
+/* Which iconv implementation to use */
+#undef PHP_ICONV_IMPL
-/* */
-#undef HAVE_OCICOLLASSIGN
+/* Whether iconv supports error no or not */
+#undef ICONV_SUPPORTS_ERRNO
-/* */
-#undef HAVE_OCIENVCREATE
+/* Whether iconv supports error no or not */
+#undef ICONV_SUPPORTS_ERRNO
-/* */
-#undef HAVE_OCIENVNLSCREATE
+/* Whether iconv supports error no or not */
+#undef ICONV_SUPPORTS_ERRNO
-/* */
-#undef HAVE_OCILOBISTEMPORARY
+/* Path to iconv.h */
+#undef PHP_ICONV_H_PATH
-/* */
-#undef HAVE_OCISTMTFETCH2
+/* Whether to build iconv as dynamic module */
+#undef COMPILE_DL_ICONV
-/* */
-#undef HAVE_OCI_INSTANT_CLIENT
+/* Whether to build imap as dynamic module */
+#undef COMPILE_DL_IMAP
-/* */
-#undef HAVE_OCI_LOB_READ2
+/* */
+#undef HAVE_IMAP
-/* */
-#undef HAVE_ODBC2
+/* */
+#undef HAVE_IMAP2000
-/* */
-#undef HAVE_ODBCSDK_H
+/* */
+#undef HAVE_IMAP2000
-/* */
-#undef HAVE_ODBC_H
+/* */
+#undef HAVE_IMAP2000
-/* */
-#undef HAVE_ODBC_ROUTER
+/* */
+#undef HAVE_IMAP2000
-/* */
-#undef HAVE_OLD_COMPAT_H
+/* */
+#undef HAVE_IMAP2000
-/* whether you have old-style readdir_r */
-#undef HAVE_OLD_READDIR_R
+/* */
+#undef HAVE_IMAP2000
-/* Define to 1 if the oniguruma library is available */
-#undef HAVE_ONIG
+/* */
+#undef HAVE_IMAP2004
-/* Define to 1 if you have the <openssl/crypto.h> header file. */
-#undef HAVE_OPENSSL_CRYPTO_H
+/* Whether utf8_mime2text() has new signature */
+#undef HAVE_NEW_MIME2TEXT
-/* */
-#undef HAVE_OPENSSL_EXT
+/* */
+#undef HAVE_IMAP2001
-/* */
-#undef HAVE_ORALDAP
+/* */
+#undef HAVE_LIBPAM
-/* */
-#undef HAVE_ORALDAP_10
+/* */
+#undef HAVE_LIBCRYPT
-/* Whether struct _zend_object_value is packed */
-#undef HAVE_PACKED_OBJECT_VALUE
+/* */
+#undef HAVE_IMAP_KRB
-/* */
-#undef HAVE_PCRE
+/* */
+#undef HAVE_IMAP_SSL
-/* */
-#undef HAVE_PDO_DBLIB
+/* */
+#undef HAVE_IMAP_AUTH_GSS
-/* */
-#undef HAVE_PDO_FIREBIRD
+/* */
+#undef HAVE_IMAP_MUTF7
-/* Whether to build PostgreSQL for PDO support or not */
-#undef HAVE_PDO_PGSQL
+/* */
+#undef HAVE_RFC822_OUTPUT_ADDRESS_LIST
-/* */
-#undef HAVE_PDO_SQLITELIB
+/* */
+#undef HAVE_IBASE
-/* Define to 1 if you have the `perror' function. */
-#undef HAVE_PERROR
+/* Whether to build interbase as dynamic module */
+#undef COMPILE_DL_INTERBASE
-/* Whether to build PostgreSQL support or not */
-#undef HAVE_PGSQL
+/* Whether to build intl as dynamic module */
+#undef COMPILE_DL_INTL
-/* Whether libpq is compiled with --enable-multibyte */
-#undef HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT
+/* whether to enable JavaScript Object Serialization support */
+#undef HAVE_JSON
-/* PostgreSQL 7.4 or later */
-#undef HAVE_PGTRANSACTIONSTATUS
+/* Whether to build json as dynamic module */
+#undef COMPILE_DL_JSON
-/* Whether to have pg_config.h */
-#undef HAVE_PG_CONFIG_H
+/* Whether to build ldap as dynamic module */
+#undef COMPILE_DL_LDAP
-/* PostgreSQL 8.1 or later */
-#undef HAVE_PG_LO_CREATE
+/* */
+#undef HAVE_NSLDAP
-/* PostgreSQL 8.4 or later */
-#undef HAVE_PG_LO_IMPORT_WITH_OID
+/* */
+#undef HAVE_NSLDAP
-/* */
-#undef HAVE_PHP_SESSION
+/* */
+#undef HAVE_NSLDAP
-/* Whether you have phttpd */
-#undef HAVE_PHTTPD
+/* */
+#undef HAVE_NSLDAP
-/* Define to 1 if you have the `poll' function. */
-#undef HAVE_POLL
+/* */
+#undef HAVE_ORALDAP
-/* do we have port framework? */
-#undef HAVE_PORT
+/* */
+#undef HAVE_ORALDAP_10
-/* whether to include POSIX-like functions */
-#undef HAVE_POSIX
+/* */
+#undef HAVE_LDAP
-/* whether you have POSIX readdir_r */
-#undef HAVE_POSIX_READDIR_R
+/* Whether 3 arg set_rebind_proc() */
+#undef HAVE_3ARG_SETREBINDPROC
-/* PostgreSQL 7.0.x or later */
-#undef HAVE_PQCLIENTENCODING
+/* */
+#undef HAVE_LDAP_SASL_SASL_H
-/* Broken libpq under windows */
-#undef HAVE_PQCMDTUPLES
+/* */
+#undef HAVE_LDAP_SASL_H
-/* PostgreSQL 7.2.0 or later */
-#undef HAVE_PQESCAPE
+/* LDAP SASL support */
+#undef HAVE_LDAP_SASL
-/* PostgreSQL 8.1.4 or later */
-#undef HAVE_PQESCAPE_BYTEA_CONN
+/* whether to have multibyte string support */
+#undef HAVE_MBSTRING
-/* PostgreSQL 8.1.4 or later */
-#undef HAVE_PQESCAPE_CONN
+/* whether to check multibyte regex backtrack */
+#undef USE_COMBINATION_EXPLOSION_CHECK
-/* PostgreSQL 7.4 or later */
-#undef HAVE_PQEXECPARAMS
+/* Define to 1 if you have the <stdarg.h> header file. */
+#undef HAVE_STDARG_PROTOTYPES
-/* PostgreSQL 7.4 or later */
-#undef HAVE_PQEXECPREPARED
+/* Define to 1 if the bundled oniguruma is used */
+#undef PHP_ONIG_BUNDLED
-/* PostgreSQL 7.4 or later */
-#undef HAVE_PQFREEMEM
+/* Define to 1 if the oniguruma library is available */
+#undef HAVE_ONIG
-/* PostgreSQL 7.4 or later */
-#undef HAVE_PQFTABLE
+/* Define to 1 if the oniguruma library is available */
+#undef HAVE_ONIG
-/* PostgreSQL 7.4 or later */
-#undef HAVE_PQGETCOPYDATA
+/* define to 1 if oniguruma has an invalid entry for KOI8 encoding */
+#undef PHP_ONIG_BAD_KOI8_ENTRY
-/* Older PostgreSQL */
-#undef HAVE_PQOIDVALUE
+/* whether to have multibyte regex support */
+#undef HAVE_MBREGEX
-/* PostgreSQL 7.4 or later */
-#undef HAVE_PQPARAMETERSTATUS
+/* Whether to build mbstring as dynamic module */
+#undef COMPILE_DL_MBSTRING
-/* PostgreSQL 7.4 or later */
-#undef HAVE_PQPREPARE
+/* */
+#undef HAVE_LIBMCRYPT
-/* PostgreSQL 7.4 or later */
-#undef HAVE_PQPROTOCOLVERSION
+/* */
+#undef HAVE_LIBMCRYPT
-/* PostgreSQL 7.4 or later */
-#undef HAVE_PQPUTCOPYDATA
+/* Whether to build mcrypt as dynamic module */
+#undef COMPILE_DL_MCRYPT
-/* PostgreSQL 7.4 or later */
-#undef HAVE_PQPUTCOPYEND
+/* Whether to build mssql as dynamic module */
+#undef COMPILE_DL_MSSQL
-/* PostgreSQL 7.4 or later */
-#undef HAVE_PQRESULTERRORFIELD
+/* */
+#undef HAVE_LIBDNET_STUB
-/* PostgreSQL 7.4 or later */
-#undef HAVE_PQSENDPREPARE
+/* */
+#undef HAVE_MSSQL
-/* PostgreSQL 7.4 or later */
-#undef HAVE_PQSENDQUERYPARAMS
+/* */
+#undef HAVE_FREETDS
-/* PostgreSQL 7.4 or later */
-#undef HAVE_PQSENDQUERYPREPARED
+/* */
+#undef PHP_MYSQL_UNIX_SOCK_ADDR
-/* PostgreSQL 7.4 or later */
-#undef HAVE_PQSETERRORVERBOSITY
+/* */
+#undef PHP_MYSQL_UNIX_SOCK_ADDR
-/* PostgreSQL 7.0.x or later */
-#undef HAVE_PQSETNONBLOCKING
+/* Whether you have MySQL */
+#undef HAVE_MYSQL
-/* PostgreSQL 7.3.0 or later */
-#undef HAVE_PQUNESCAPEBYTEA
+/* Whether to build mysql as dynamic module */
+#undef COMPILE_DL_MYSQL
-/* do we have prctl? */
-#undef HAVE_PRCTL
+/* Whether mysqlnd is enabled */
+#undef MYSQL_USE_MYSQLND
-/* */
-#undef HAVE_PREAD
+/* embedded MySQL support enabled */
+#undef HAVE_EMBEDDED_MYSQLI
-/* */
-#undef HAVE_PSPELL
+/* */
+#undef HAVE_MYSQLILIB
-/* do we have ptrace? */
-#undef HAVE_PTRACE
+/* */
+#undef HAVE_STMT_NEXT_RESULT
-/* Whether ptrdiff_t is available */
-#undef HAVE_PTRDIFF_T
+/* Whether to build mysqli as dynamic module */
+#undef COMPILE_DL_MYSQLI
-/* Define to 1 if you have the `ptsname' function. */
-#undef HAVE_PTSNAME
+/* Whether mysqlnd is enabled */
+#undef MYSQLI_USE_MYSQLND
-/* Define to 1 if you have the `putenv' function. */
-#undef HAVE_PUTENV
+/* */
+#undef HAVE_OCI_LOB_READ2
-/* Define to 1 if you have the <pwd.h> header file. */
-#undef HAVE_PWD_H
+/* Whether to build oci8 as dynamic module */
+#undef COMPILE_DL_OCI8
-/* */
-#undef HAVE_PWRITE
+/* */
+#undef HAVE_OCI8
-/* Define to 1 if you have the `random' function. */
-#undef HAVE_RANDOM
+/* */
+#undef PHP_OCI8_DEF_DIR
-/* Define to 1 if you have the `rand_r' function. */
-#undef HAVE_RAND_R
+/* */
+#undef PHP_OCI8_DEF_SHARED_LIBADD
-/* Define to 1 if you have the `realpath' function. */
-#undef HAVE_REALPATH
+/* */
+#undef HAVE_OCI_INSTANT_CLIENT
-/* Whether Reflection is enabled */
-#undef HAVE_REFLECTION
+/* */
+#undef HAVE_OCI_LOB_READ2
-/* 1 */
-#undef HAVE_REGEX_T_RE_MAGIC
+/* Whether to build oci8 as dynamic module */
+#undef COMPILE_DL_OCI8
-/* Define to 1 if you have the <resolv.h> header file. */
-#undef HAVE_RESOLV_H
+/* */
+#undef HAVE_OCI8
-/* */
-#undef HAVE_RES_NSEARCH
+/* */
+#undef HAVE_ADABAS
-/* */
-#undef HAVE_RES_SEARCH
+/* */
+#undef HAVE_SAPDB
-/* */
-#undef HAVE_RFC822_OUTPUT_ADDRESS_LIST
+/* */
+#undef HAVE_SOLID_35
-/* */
-#undef HAVE_RL_CALLBACK_READ_CHAR
+/* */
+#undef HAVE_SOLID_30
-/* Define to 1 if you have the `rl_completion_matches' function. */
-#undef HAVE_RL_COMPLETION_MATCHES
+/* */
+#undef HAVE_SOLID
-/* Whether you use Roxen */
-#undef HAVE_ROXEN
+/* Needed in sqlunix.h */
+#undef SS_LINUX
-/* */
-#undef HAVE_SAPDB
+/* Needed in sqlunix.h */
+#undef SS_LINUX
-/* Define to 1 if you have the `scandir' function. */
-#undef HAVE_SCANDIR
+/* Needed in sqlunix.h for wchar defs */
+#undef SS_FBX
-/* do we have select? */
-#undef HAVE_SELECT
+/* Needed in sqlunix.h for wchar defs */
+#undef SS_FBX
-/* */
-#undef HAVE_SEMUN
+/* */
+#undef HAVE_IBMDB2
-/* Define to 1 if you have the `setegid' function. */
-#undef HAVE_SETEGID
+/* */
+#undef HAVE_ODBC_ROUTER
-/* Define to 1 if you have the `setenv' function. */
-#undef HAVE_SETENV
+/* */
+#undef HAVE_EMPRESS
-/* Define to 1 if you have the `seteuid' function. */
-#undef HAVE_SETEUID
+/* */
+#undef HAVE_EMPRESS
-/* Define to 1 if you have the `setitimer' function. */
-#undef HAVE_SETITIMER
+/* */
+#undef AIX
-/* Define to 1 if you have the `setlocale' function. */
-#undef HAVE_SETLOCALE
+/* */
+#undef HPUX
-/* Define to 1 if you have the `setpgid' function. */
-#undef HAVE_SETPGID
+/* */
+#undef LINUX
-/* Define to 1 if you have the `setpriority' function. */
-#undef HAVE_SETPRIORITY
+/* */
+#undef NEUTRINO
-/* Define to 1 if you have the `setproctitle' function. */
-#undef HAVE_SETPROCTITLE
+/* */
+#undef ISOLARIS
-/* Define to 1 if you have the `setsid' function. */
-#undef HAVE_SETSID
+/* */
+#undef SOLARIS
-/* Define to 1 if you have the `setsockopt' function. */
-#undef HAVE_SETSOCKOPT
+/* */
+#undef UNIXWARE
-/* Define to 1 if you have the `setvbuf' function. */
-#undef HAVE_SETVBUF
+/* */
+#undef HAVE_BIRDSTEP
-/* */
-#undef HAVE_SHMOP
+/* */
+#undef HAVE_CODBC
-/* Define to 1 if you have the `shutdown' function. */
-#undef HAVE_SHUTDOWN
+/* */
+#undef HAVE_IODBC
-/* */
-#undef HAVE_SIGACTION
+/* */
+#undef HAVE_ODBC2
-/* Define to 1 if you have the <signal.h> header file. */
-#undef HAVE_SIGNAL_H
+/* */
+#undef HAVE_ESOOB
-/* Define to 1 if you have the `sigprocmask' function. */
-#undef HAVE_SIGPROCMASK
+/* */
+#undef HAVE_UNIXODBC
-/* Define to 1 if you have the `sigsetjmp' function. */
-#undef HAVE_SIGSETJMP
+/* Whether you want DBMaker */
+#undef HAVE_DBMAKER
-/* Define to 1 if you have the `sigtimedwait' function. */
-#undef HAVE_SIGTIMEDWAIT
+/* */
+#undef HAVE_SQLDATASOURCES
-/* Define to 1 if you have the `sigwaitinfo' function. */
-#undef HAVE_SIGWAITINFO
+/* */
+#undef HAVE_UODBC
-/* */
-#undef HAVE_SIMPLEXML
+/* Whether to build odbc as dynamic module */
+#undef COMPILE_DL_ODBC
-/* Define to 1 if you have the `sin' function. */
-#undef HAVE_SIN
+/* */
+#undef HAVE_FORK
-/* */
-#undef HAVE_SNMP
+/* */
+#undef HAVE_WAITPID
-/* */
-#undef HAVE_SNMP_PARSE_OID
+/* */
+#undef HAVE_SIGACTION
-/* Define to 1 if you have the `snprintf' function. */
-#undef HAVE_SNPRINTF
+/* Whether to build pcntl as dynamic module */
+#undef COMPILE_DL_PCNTL
-/* */
-#undef HAVE_SOAP
+/* Whether to build pdo as dynamic module */
+#undef COMPILE_DL_PDO
-/* Whether struct sockaddr has field sa_len */
-#undef HAVE_SOCKADDR_SA_LEN
+/* Whether to build pdo_dblib as dynamic module */
+#undef COMPILE_DL_PDO_DBLIB
-/* Whether you have struct sockaddr_storage */
-#undef HAVE_SOCKADDR_STORAGE
+/* */
+#undef HAVE_LIBDNET_STUB
-/* Define if sockaddr_un in sys/un.h contains a sun_len component */
-#undef HAVE_SOCKADDR_UN_SUN_LEN
+/* */
+#undef HAVE_PDO_DBLIB
-/* */
-#undef HAVE_SOCKET
+/* */
+#undef HAVE_FREETDS
-/* Define to 1 if you have the `socketpair' function. */
-#undef HAVE_SOCKETPAIR
+/* */
+#undef HAVE_PDO_FIREBIRD
-/* */
-#undef HAVE_SOCKETS
+/* Whether to build pdo_firebird as dynamic module */
+#undef COMPILE_DL_PDO_FIREBIRD
-/* Whether you have socklen_t */
-#undef HAVE_SOCKLEN_T
+/* Whether pdo_mysql uses mysqlnd */
+#undef PDO_USE_MYSQLND
-/* */
-#undef HAVE_SOLID
+/* Whether you have MySQL */
+#undef HAVE_MYSQL
-/* */
-#undef HAVE_SOLID_30
+/* */
+#undef PDO_MYSQL_UNIX_ADDR
-/* */
-#undef HAVE_SOLID_35
+/* Whether to build pdo_mysql as dynamic module */
+#undef COMPILE_DL_PDO_MYSQL
-/* Whether you want SPL (Standard PHP Library) support */
-#undef HAVE_SPL
+/* */
+#undef HAVE_OCIENVCREATE
-/* */
-#undef HAVE_SQLCLI1_H
+/* */
+#undef HAVE_OCIENVNLSCREATE
-/* */
-#undef HAVE_SQLDATASOURCES
+/* */
+#undef HAVE_OCILOBISTEMPORARY
-/* */
-#undef HAVE_SQLEXT_H
+/* */
+#undef HAVE_OCILOBISTEMPORARY
-/* */
-#undef HAVE_SQLITE3
+/* */
+#undef HAVE_OCICOLLASSIGN
-/* have commercial sqlite3 with crypto support */
-#undef HAVE_SQLITE3_KEY
+/* */
+#undef HAVE_OCISTMTFETCH2
-/* */
-#undef HAVE_SQLTYPES_H
+/* Whether to build pdo_oci as dynamic module */
+#undef COMPILE_DL_PDO_OCI
-/* */
-#undef HAVE_SQLUCODE_H
+/* */
+#undef PHP_PDO_OCI_CLIENT_VERSION
-/* */
-#undef HAVE_SQLUNIX_H
+/* */
+#undef HAVE_ODBC_H
-/* */
-#undef HAVE_SQL_H
+/* */
+#undef HAVE_ODBCSDK_H
-/* Define to 1 if you have the `srand48' function. */
-#undef HAVE_SRAND48
+/* */
+#undef HAVE_IODBC_H
-/* Define to 1 if you have the `srandom' function. */
-#undef HAVE_SRANDOM
+/* */
+#undef HAVE_SQLUNIX_H
-/* Whether ssize_t is available */
-#undef HAVE_SSIZE_T
+/* */
+#undef HAVE_SQLTYPES_H
-/* Define to 1 if you have the `statfs' function. */
-#undef HAVE_STATFS
+/* */
+#undef HAVE_SQLUCODE_H
-/* Define to 1 if you have the `statvfs' function. */
-#undef HAVE_STATVFS
+/* */
+#undef HAVE_SQL_H
-/* Define to 1 if you have the <stdarg.h> header file. */
-#undef HAVE_STDARG_H
+/* */
+#undef HAVE_ISQL_H
-/* Define to 1 if you have the <stdarg.h> header file. */
-#undef HAVE_STDARG_PROTOTYPES
+/* */
+#undef HAVE_SQLEXT_H
-/* Define to 1 if you have the <stdbool.h> header file. */
-#undef HAVE_STDBOOL_H
+/* */
+#undef HAVE_ISQLEXT_H
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
+/* */
+#undef HAVE_UDBCEXT_H
-/* Define to 1 if you have the <stdio.h> header file. */
-#undef HAVE_STDIO_H
+/* */
+#undef HAVE_SQLCLI1_H
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
+/* */
+#undef HAVE_LIBRARYMANAGER_H
-/* Define to 1 if you have the `std_syslog' function. */
-#undef HAVE_STD_SYSLOG
+/* */
+#undef HAVE_CLI0CORE_H
-/* */
-#undef HAVE_STMT_NEXT_RESULT
+/* */
+#undef HAVE_CLI0EXT_H
-/* Define to 1 if you have the `strcasecmp' function. */
-#undef HAVE_STRCASECMP
+/* */
+#undef HAVE_CLI0CLI_H
-/* Define to 1 if you have the `strcoll' function. */
-#undef HAVE_STRCOLL
+/* */
+#undef HAVE_CLI0DEFS_H
-/* Define to 1 if you have the `strdup' function. */
-#undef HAVE_STRDUP
+/* */
+#undef HAVE_CLI0ENV_H
-/* Define to 1 if you have the `strerror' function. */
-#undef HAVE_STRERROR
+/* Whether to build pdo_odbc as dynamic module */
+#undef COMPILE_DL_PDO_ODBC
-/* Define to 1 if you have the `strfmon' function. */
-#undef HAVE_STRFMON
+/* Whether to have pg_config.h */
+#undef HAVE_PG_CONFIG_H
-/* Define to 1 if you have the `strftime' function. */
-#undef HAVE_STRFTIME
+/* Whether to have pg_config.h */
+#undef HAVE_PG_CONFIG_H
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
+/* Whether to build PostgreSQL for PDO support or not */
+#undef HAVE_PDO_PGSQL
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
+/* PostgreSQL 7.4 or later */
+#undef HAVE_PQPARAMETERSTATUS
-/* Define to 1 if you have the `strlcat' function. */
-#undef HAVE_STRLCAT
+/* PostgreSQL 8.0 or later */
+#undef HAVE_PQPREPARE
-/* Define to 1 if you have the `strlcpy' function. */
-#undef HAVE_STRLCPY
+/* PostgreSQL 8.1.4 or later */
+#undef HAVE_PQESCAPE_CONN
-/* Define to 1 if you have the `strndup' function. */
-#undef HAVE_STRNDUP
+/* PostgreSQL 8.1.4 or later */
+#undef HAVE_PQESCAPE_BYTEA_CONN
-/* Define to 1 if you have the `strnlen' function. */
-#undef HAVE_STRNLEN
+/* Whether libpq is compiled with --enable-multibyte */
+#undef HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT
-/* Define to 1 if you have the `strpbrk' function. */
-#undef HAVE_STRPBRK
+/* Whether to build pdo_pgsql as dynamic module */
+#undef COMPILE_DL_PDO_PGSQL
-/* Define to 1 if you have the `strpncpy' function. */
-#undef HAVE_STRPNCPY
+/* */
+#undef HAVE_PDO_SQLITELIB
-/* Define to 1 if you have the `strptime' function. */
-#undef HAVE_STRPTIME
+/* have commercial sqlite3 with crypto support */
+#undef HAVE_SQLITE3_KEY
-/* whether strptime() declaration fails */
-#undef HAVE_STRPTIME_DECL_FAILS
+/* Whether to build pdo_sqlite as dynamic module */
+#undef COMPILE_DL_PDO_SQLITE
-/* Define to 1 if you have the `strstr' function. */
-#undef HAVE_STRSTR
+/* Whether to build pdo_sqlite as dynamic module */
+#undef COMPILE_DL_PDO_SQLITE
-/* Define to 1 if you have the `strtod' function. */
-#undef HAVE_STRTOD
+/* Whether to have pg_config.h */
+#undef HAVE_PG_CONFIG_H
-/* Define to 1 if you have the `strtok_r' function. */
-#undef HAVE_STRTOK_R
+/* Whether to have pg_config.h */
+#undef HAVE_PG_CONFIG_H
-/* Define to 1 if you have the `strtol' function. */
-#undef HAVE_STRTOL
+/* Whether to build PostgreSQL support or not */
+#undef HAVE_PGSQL
-/* Define to 1 if you have the `strtoll' function. */
-#undef HAVE_STRTOLL
+/* PostgreSQL 7.2.0 or later */
+#undef HAVE_PQESCAPE
-/* Define to 1 if you have the `strtoul' function. */
-#undef HAVE_STRTOUL
+/* PostgreSQL 7.3.0 or later */
+#undef HAVE_PQUNESCAPEBYTEA
-/* Define to 1 if you have the `strtoull' function. */
-#undef HAVE_STRTOULL
+/* PostgreSQL 7.0.x or later */
+#undef HAVE_PQSETNONBLOCKING
-/* whether you have struct flock */
-#undef HAVE_STRUCT_FLOCK
+/* Broken libpq under windows */
+#undef HAVE_PQCMDTUPLES
-/* Define to 1 if `st_blksize' is member of `struct stat'. */
-#undef HAVE_STRUCT_STAT_ST_BLKSIZE
+/* Older PostgreSQL */
+#undef HAVE_PQOIDVALUE
-/* Define to 1 if `st_blocks' is member of `struct stat'. */
-#undef HAVE_STRUCT_STAT_ST_BLOCKS
+/* PostgreSQL 7.0.x or later */
+#undef HAVE_PQCLIENTENCODING
-/* Define to 1 if `st_rdev' is member of `struct stat'. */
-#undef HAVE_STRUCT_STAT_ST_RDEV
+/* PostgreSQL 7.4 or later */
+#undef HAVE_PQPARAMETERSTATUS
-/* Define to 1 if `tm_zone' is member of `struct tm'. */
-#undef HAVE_STRUCT_TM_TM_ZONE
+/* PostgreSQL 7.4 or later */
+#undef HAVE_PQPROTOCOLVERSION
-/* Define to 1 if your `struct stat' has `st_blksize'. Deprecated, use
- `HAVE_STRUCT_STAT_ST_BLKSIZE' instead. */
-#undef HAVE_ST_BLKSIZE
+/* PostgreSQL 7.4 or later */
+#undef HAVE_PGTRANSACTIONSTATUS
-/* Define to 1 if your `struct stat' has `st_blocks'. Deprecated, use
- `HAVE_STRUCT_STAT_ST_BLOCKS' instead. */
-#undef HAVE_ST_BLOCKS
+/* PostgreSQL 7.4 or later */
+#undef HAVE_PQEXECPARAMS
-/* Define to 1 if you have the <st.h> header file. */
-#undef HAVE_ST_H
+/* PostgreSQL 7.4 or later */
+#undef HAVE_PQPREPARE
-/* Define to 1 if your `struct stat' has `st_rdev'. Deprecated, use
- `HAVE_STRUCT_STAT_ST_RDEV' instead. */
-#undef HAVE_ST_RDEV
+/* PostgreSQL 7.4 or later */
+#undef HAVE_PQEXECPREPARED
-/* */
-#undef HAVE_SYBASE_CT
+/* PostgreSQL 7.4 or later */
+#undef HAVE_PQRESULTERRORFIELD
-/* Define to 1 if you have the `symlink' function. */
-#undef HAVE_SYMLINK
+/* PostgreSQL 7.4 or later */
+#undef HAVE_PQSENDQUERYPARAMS
-/* Define if you have the __sync_fetch_and_add function */
-#undef HAVE_SYNC_FETCH_AND_ADD
+/* PostgreSQL 7.4 or later */
+#undef HAVE_PQSENDPREPARE
-/* do we have sysconf? */
-#undef HAVE_SYSCONF
+/* PostgreSQL 7.4 or later */
+#undef HAVE_PQSENDQUERYPREPARED
-/* Define to 1 if you have the <sysexits.h> header file. */
-#undef HAVE_SYSEXITS_H
+/* PostgreSQL 7.4 or later */
+#undef HAVE_PQPUTCOPYDATA
-/* Define to 1 if you have the <syslog.h> header file. */
-#undef HAVE_SYSLOG_H
+/* PostgreSQL 7.4 or later */
+#undef HAVE_PQPUTCOPYEND
-/* */
-#undef HAVE_SYSVMSG
+/* PostgreSQL 7.4 or later */
+#undef HAVE_PQGETCOPYDATA
-/* */
-#undef HAVE_SYSVSEM
+/* PostgreSQL 7.4 or later */
+#undef HAVE_PQFREEMEM
-/* */
-#undef HAVE_SYSVSHM
+/* PostgreSQL 7.4 or later */
+#undef HAVE_PQSETERRORVERBOSITY
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
- */
-#undef HAVE_SYS_DIR_H
+/* PostgreSQL 7.4 or later */
+#undef HAVE_PQFTABLE
-/* Define to 1 if you have the <sys/file.h> header file. */
-#undef HAVE_SYS_FILE_H
+/* PostgreSQL 8.1.4 or later */
+#undef HAVE_PQESCAPE_CONN
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-#undef HAVE_SYS_IOCTL_H
+/* PostgreSQL 8.1.4 or later */
+#undef HAVE_PQESCAPE_BYTEA_CONN
-/* Define to 1 if you have the <sys/ipc.h> header file. */
-#undef HAVE_SYS_IPC_H
+/* Whether libpq is compiled with --enable-multibyte */
+#undef HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT
-/* Define to 1 if you have the <sys/loadavg.h> header file. */
-#undef HAVE_SYS_LOADAVG_H
+/* PostgreSQL 8.1 or later */
+#undef HAVE_PG_LO_CREATE
-/* Define to 1 if you have the <sys/mkdev.h> header file. */
-#undef HAVE_SYS_MKDEV_H
+/* PostgreSQL 8.4 or later */
+#undef HAVE_PG_LO_IMPORT_WITH_OID
-/* Define to 1 if you have the <sys/mman.h> header file. */
-#undef HAVE_SYS_MMAN_H
+/* Whether to build pgsql as dynamic module */
+#undef COMPILE_DL_PGSQL
-/* Define to 1 if you have the <sys/mount.h> header file. */
-#undef HAVE_SYS_MOUNT_H
+/* Whether to build phar as dynamic module */
+#undef COMPILE_DL_PHAR
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
- */
-#undef HAVE_SYS_NDIR_H
+/* */
+#undef PHAR_HASH_OK
-/* Define to 1 if you have the <sys/param.h> header file. */
-#undef HAVE_SYS_PARAM_H
+/* */
+#undef PHAR_HAVE_OPENSSL
-/* Define to 1 if you have the <sys/poll.h> header file. */
-#undef HAVE_SYS_POLL_H
+/* whether to include POSIX-like functions */
+#undef HAVE_POSIX
-/* Define to 1 if you have the <sys/resource.h> header file. */
-#undef HAVE_SYS_RESOURCE_H
+/* Whether to build posix as dynamic module */
+#undef COMPILE_DL_POSIX
-/* Define to 1 if you have the <sys/select.h> header file. */
-#undef HAVE_SYS_SELECT_H
+/* Whether you have a working ttyname_r */
+#undef HAVE_TTYNAME_R
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#undef HAVE_SYS_SOCKET_H
+/* Wether struct utsname has domainname */
+#undef HAVE_UTSNAME_DOMAINNAME
-/* Define to 1 if you have the <sys/statfs.h> header file. */
-#undef HAVE_SYS_STATFS_H
+/* Whether to build pspell as dynamic module */
+#undef COMPILE_DL_PSPELL
-/* Define to 1 if you have the <sys/statvfs.h> header file. */
-#undef HAVE_SYS_STATVFS_H
+/* */
+#undef HAVE_PSPELL
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
+/* */
+#undef HAVE_RL_CALLBACK_READ_CHAR
-/* Define to 1 if you have the <sys/sysexits.h> header file. */
-#undef HAVE_SYS_SYSEXITS_H
+/* */
+#undef HAVE_LIBREADLINE
-/* Define to 1 if you have the <sys/times.h> header file. */
-#undef HAVE_SYS_TIMES_H
+/* */
+#undef HAVE_LIBEDIT
-/* Define to 1 if you have the <sys/time.h> header file. */
-#undef HAVE_SYS_TIME_H
+/* Whether to build readline as dynamic module */
+#undef COMPILE_DL_READLINE
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
+/* Whether we have librecode 3.5 */
+#undef HAVE_BROKEN_RECODE
-/* Define to 1 if you have the <sys/uio.h> header file. */
-#undef HAVE_SYS_UIO_H
+/* Whether we have librecode 3.5 or higher */
+#undef HAVE_LIBRECODE
-/* Define to 1 if you have the <sys/un.h> header file. */
-#undef HAVE_SYS_UN_H
+/* Whether to build recode as dynamic module */
+#undef COMPILE_DL_RECODE
-/* Define to 1 if you have the <sys/utsname.h> header file. */
-#undef HAVE_SYS_UTSNAME_H
+/* Whether Reflection is enabled */
+#undef HAVE_REFLECTION
-/* Define to 1 if you have the <sys/varargs.h> header file. */
-#undef HAVE_SYS_VARARGS_H
+/* Whether to build reflection as dynamic module */
+#undef COMPILE_DL_REFLECTION
-/* Define to 1 if you have the <sys/vfs.h> header file. */
-#undef HAVE_SYS_VFS_H
+/* */
+#undef HAVE_PWRITE
-/* Define to 1 if you have the <sys/wait.h> header file. */
-#undef HAVE_SYS_WAIT_H
+/* whether pwrite64 is default */
+#undef PHP_PWRITE_64
-/* Define to 1 if you have the `tempnam' function. */
-#undef HAVE_TEMPNAM
+/* */
+#undef HAVE_PREAD
-/* Define to 1 if you have the <termios.h> header file. */
-#undef HAVE_TERMIOS_H
+/* whether pread64 is default */
+#undef PHP_PREAD_64
-/* */
-#undef HAVE_TIDY
+/* Whether to build session as dynamic module */
+#undef COMPILE_DL_SESSION
-/* */
-#undef HAVE_TIDYOPTGETDOC
+/* */
+#undef HAVE_PHP_SESSION
-/* do we have times? */
-#undef HAVE_TIMES
+/* Whether you have libmm */
+#undef HAVE_LIBMM
-/* Define to 1 if you have the <time.h> header file. */
-#undef HAVE_TIME_H
+/* */
+#undef HAVE_SHMOP
-/* whether you have tm_gmtoff in struct tm */
-#undef HAVE_TM_GMTOFF
+/* Whether to build shmop as dynamic module */
+#undef COMPILE_DL_SHMOP
-/* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use
- `HAVE_STRUCT_TM_TM_ZONE' instead. */
-#undef HAVE_TM_ZONE
+/* */
+#undef HAVE_LIBXML
-/* Whether you have a working ttyname_r */
-#undef HAVE_TTYNAME_R
+/* */
+#undef HAVE_SIMPLEXML
-/* Define to 1 if you have the <tuxmodule.h> header file. */
-#undef HAVE_TUXMODULE_H
+/* Whether to build simplexml as dynamic module */
+#undef COMPILE_DL_SIMPLEXML
-/* Define to 1 if you don't have `tm_zone' but do have the external array
- `tzname'. */
-#undef HAVE_TZNAME
+/* */
+#undef HAVE_NET_SNMP
-/* Define to 1 if you have the `tzset' function. */
-#undef HAVE_TZSET
+/* */
+#undef HAVE_SNMP_PARSE_OID
-/* */
-#undef HAVE_UDBCEXT_H
+/* */
+#undef HAVE_SNMP
-/* Define if uint32_t type is present. */
-#undef HAVE_UINT32_T
+/* */
+#undef UCD_SNMP_HACK
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
+/* Whether to build snmp as dynamic module */
+#undef COMPILE_DL_SNMP
-/* */
-#undef HAVE_UNIXODBC
+/* */
+#undef HAVE_LIBXML
-/* Define to 1 if you have the <unix.h> header file. */
-#undef HAVE_UNIX_H
+/* */
+#undef HAVE_SOAP
-/* Define to 1 if you have the `unlockpt' function. */
-#undef HAVE_UNLOCKPT
+/* Whether to build soap as dynamic module */
+#undef COMPILE_DL_SOAP
-/* Define to 1 if you have the `unsetenv' function. */
-#undef HAVE_UNSETENV
+/* Whether you have struct cmsghdr */
+#undef HAVE_CMSGHDR
-/* */
-#undef HAVE_UODBC
+/* */
+#undef MISSING_MSGHDR_MSGFLAGS
-/* Define to 1 if you have the `usleep' function. */
-#undef HAVE_USLEEP
+/* */
+#undef HAVE_SOCKETS
-/* Define to 1 if you have the `utime' function. */
-#undef HAVE_UTIME
+/* Whether to build sockets as dynamic module */
+#undef COMPILE_DL_SOCKETS
-/* Define to 1 if you have the `utimes' function. */
-#undef HAVE_UTIMES
+/* Whether struct _zend_object_value is packed */
+#undef HAVE_PACKED_OBJECT_VALUE
-/* Define to 1 if you have the <utime.h> header file. */
-#undef HAVE_UTIME_H
+/* Whether you want SPL (Standard PHP Library) support */
+#undef HAVE_SPL
-/* Define to 1 if `utime(file, NULL)' sets file's timestamp to the present. */
-#undef HAVE_UTIME_NULL
+/* Whether to build spl as dynamic module */
+#undef COMPILE_DL_SPL
-/* Wether struct utsname has domainname */
-#undef HAVE_UTSNAME_DOMAINNAME
+/* Have PDO */
+#undef PHP_SQLITE2_HAVE_PDO
-/* Define to 1 if you have the `vasprintf' function. */
-#undef HAVE_VASPRINTF
+/* Whether to build sqlite as dynamic module */
+#undef COMPILE_DL_SQLITE
-/* Define to 1 if you have the `vprintf' function. */
-#undef HAVE_VPRINTF
+/* Size of a pointer */
+#undef SQLITE_PTR_SZ
-/* Define to 1 if you have the `vsnprintf' function. */
-#undef HAVE_VSNPRINTF
+/* */
+#undef SQLITE_UTF8
-/* Define to 1 if you have the `wait3' function. */
-#undef HAVE_WAIT3
+/* Define if flush should be called explicitly after a buffered io. */
+#undef HAVE_FLUSHIO
-/* */
-#undef HAVE_WAITPID
+/* */
+#undef HAVE_CRYPT
-/* Define to 1 if you have the <wchar.h> header file. */
-#undef HAVE_WCHAR_H
+/* whether the compiler supports __alignof__ */
+#undef HAVE_ALIGNOF
-/* */
-#undef HAVE_WDDX
+/* whether the compiler supports __attribute__ ((__aligned__)) */
+#undef HAVE_ATTRIBUTE_ALIGNED
-/* */
-#undef HAVE_XML
+/* Whether PHP has to use its own crypt_r for blowfish, des, ext des and md5 */
+#undef PHP_USE_PHP_CRYPT_R
-/* Define to 1 if you have the <xmlparse.h> header file. */
-#undef HAVE_XMLPARSE_H
+/* Whether the system supports standard DES salt */
+#undef PHP_STD_DES_CRYPT
-/* */
-#undef HAVE_XMLREADER
+/* Whether the system supports BlowFish salt */
+#undef PHP_BLOWFISH_CRYPT
-/* */
-#undef HAVE_XMLRPC
+/* Whether the system supports extended DES salt */
+#undef PHP_EXT_DES_CRYPT
-/* Define to 1 if you have the <xmltok.h> header file. */
-#undef HAVE_XMLTOK_H
+/* Whether the system supports MD5 salt */
+#undef PHP_MD5_CRYPT
-/* */
-#undef HAVE_XMLWRITER
+/* Whether the system supports SHA512 salt */
+#undef PHP_SHA512_CRYPT
-/* */
-#undef HAVE_XSL
+/* Whether the system supports SHA256 salt */
+#undef PHP_SHA256_CRYPT
-/* */
-#undef HAVE_XSL_EXSLT
+/* Whether the system supports standard DES salt */
+#undef PHP_STD_DES_CRYPT
-/* */
-#undef HAVE_YP_GET_DEFAULT_DOMAIN
+/* Whether the system supports BlowFish salt */
+#undef PHP_BLOWFISH_CRYPT
-/* */
-#undef HAVE_ZIP
+/* Whether the system supports extended DES salt */
+#undef PHP_EXT_DES_CRYPT
-/* */
-#undef HAVE_ZLIB
+/* Whether the system supports MD5 salt */
+#undef PHP_MD5_CRYPT
-/* whether _controlfp is present usable */
-#undef HAVE__CONTROLFP
+/* Whether the system supports SHA512 salt */
+#undef PHP_SHA512_CRYPT
-/* whether _controlfp_s is present and usable */
-#undef HAVE__CONTROLFP_S
+/* Whether the system supports SHA256 salt */
+#undef PHP_SHA256_CRYPT
-/* whether _FPU_SETCW is present and usable */
-#undef HAVE__FPU_SETCW
+/* Whether PHP has to use its own crypt_r for blowfish, des and ext des */
+#undef PHP_USE_PHP_CRYPT_R
-/* */
-#undef HPUX
+/* Define if your system has fork/vfork/CreateProcess */
+#undef PHP_CAN_SUPPORT_PROC_OPEN
-/* */
-#undef HSREGEX
+/* Whether to enable chroot() function */
+#undef ENABLE_CHROOT_FUNC
-/* iconv() is aliased to libiconv() in -liconv */
-#undef ICONV_ALIASED_LIBICONV
+/* */
+#undef HAVE_RES_NSEARCH
-/* Whether iconv supports error no or not */
-#undef ICONV_SUPPORTS_ERRNO
+/* */
+#undef HAVE_RES_NSEARCH
-/* */
-#undef ISOLARIS
+/* */
+#undef HAVE_LIBRESOLV
-/* */
-#undef LINUX
+/* */
+#undef HAVE_RES_NSEARCH
-/* */
-#undef MAGIC_QUOTES
+/* */
+#undef HAVE_LIBBIND
-/* Whether asctime_r is declared */
-#undef MISSING_ASCTIME_R_DECL
+/* */
+#undef HAVE_RES_NSEARCH
-/* Whether ctime_r is declared */
-#undef MISSING_CTIME_R_DECL
+/* */
+#undef HAVE_LIBSOCKET
-/* */
-#undef MISSING_FCLOSE_DECL
+/* */
+#undef HAVE_DNS_SEARCH
-/* Whether gmtime_r is declared */
-#undef MISSING_GMTIME_R_DECL
+/* */
+#undef HAVE_DNS_SEARCH
-/* Whether localtime_r is declared */
-#undef MISSING_LOCALTIME_R_DECL
+/* */
+#undef HAVE_LIBRESOLV
-/* */
-#undef MISSING_MSGHDR_MSGFLAGS
+/* */
+#undef HAVE_DNS_SEARCH
-/* Whether strtok_r is declared */
-#undef MISSING_STRTOK_R_DECL
+/* */
+#undef HAVE_LIBBIND
-/* Whether mysqlnd is enabled */
-#undef MYSQLI_USE_MYSQLND
+/* */
+#undef HAVE_DNS_SEARCH
-/* Enable compressed protocol support */
-#undef MYSQLND_COMPRESSION_WANTED
+/* */
+#undef HAVE_LIBSOCKET
-/* Enable SSL support */
-#undef MYSQLND_SSL_SUPPORTED
+/* */
+#undef HAVE_DN_EXPAND
-/* Whether mysqlnd is enabled */
-#undef MYSQL_USE_MYSQLND
+/* */
+#undef HAVE_DN_EXPAND
-/* */
-#undef NDBM_INCLUDE_FILE
+/* */
+#undef HAVE_LIBRESOLV
-/* */
-#undef NEUTRINO
+/* */
+#undef HAVE_DN_EXPAND
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
+/* */
+#undef HAVE_LIBBIND
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
+/* */
+#undef HAVE_DN_EXPAND
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
+/* */
+#undef HAVE_LIBSOCKET
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
+/* */
+#undef HAVE_DN_SKIPNAME
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
+/* */
+#undef HAVE_DN_SKIPNAME
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
+/* */
+#undef HAVE_LIBRESOLV
-/* */
-#undef PDO_MYSQL_UNIX_ADDR
+/* */
+#undef HAVE_DN_SKIPNAME
-/* Whether pdo_mysql uses mysqlnd */
-#undef PDO_USE_MYSQLND
+/* */
+#undef HAVE_LIBBIND
-/* */
-#undef PHAR_HASH_OK
+/* */
+#undef HAVE_DN_SKIPNAME
-/* */
-#undef PHAR_HAVE_OPENSSL
+/* */
+#undef HAVE_LIBSOCKET
-/* */
-#undef PHP_APACHE_HAVE_CLIENT_FD
+/* */
+#undef HAVE_RES_SEARCH
-/* Whether the system supports BlowFish salt */
-#undef PHP_BLOWFISH_CRYPT
+/* */
+#undef HAVE_RES_SEARCH
-/* PHP build date */
-#undef PHP_BUILD_DATE
+/* */
+#undef HAVE_LIBRESOLV
-/* Define if your system has fork/vfork/CreateProcess */
-#undef PHP_CAN_SUPPORT_PROC_OPEN
+/* */
+#undef HAVE_RES_SEARCH
-/* */
-#undef PHP_CURL_URL_WRAPPERS
+/* */
+#undef HAVE_LIBBIND
-/* Whether the system supports extended DES salt */
-#undef PHP_EXT_DES_CRYPT
+/* */
+#undef HAVE_RES_SEARCH
-/* fpm group name */
-#undef PHP_FPM_GROUP
+/* */
+#undef HAVE_LIBSOCKET
-/* fpm user name */
-#undef PHP_FPM_USER
+/* whether atof() accepts NAN */
+#undef HAVE_ATOF_ACCEPTS_NAN
-/* Whether you have HP-UX 10.x */
-#undef PHP_HPUX_TIME_R
+/* whether atof() accepts INF */
+#undef HAVE_ATOF_ACCEPTS_INF
-/* Path to iconv.h */
-#undef PHP_ICONV_H_PATH
+/* whether HUGE_VAL == INF */
+#undef HAVE_HUGE_VAL_INF
-/* Which iconv implementation to use */
-#undef PHP_ICONV_IMPL
+/* whether HUGE_VAL + -HUGEVAL == NAN */
+#undef HAVE_HUGE_VAL_NAN
-/* Whether you have IRIX-style functions */
-#undef PHP_IRIX_TIME_R
+/* whether strptime() declaration fails */
+#undef HAVE_STRPTIME_DECL_FAILS
-/* Whether the system supports MD5 salt */
-#undef PHP_MD5_CRYPT
+/* Define if your system has mbstate_t in wchar.h */
+#undef HAVE_MBSTATE_T
-/* */
-#undef PHP_MHASH_BC
+/* Whether to build standard as dynamic module */
+#undef COMPILE_DL_STANDARD
-/* */
-#undef PHP_MYSQL_UNIX_SOCK_ADDR
+/* */
+#undef HAVE_SYBASE_CT
-/* */
-#undef PHP_OCI8_DEF_DIR
+/* Whether to build sybase_ct as dynamic module */
+#undef COMPILE_DL_SYBASE_CT
-/* */
-#undef PHP_OCI8_DEF_SHARED_LIBADD
+/* */
+#undef HAVE_SYSVMSG
-/* define to 1 if oniguruma has an invalid entry for KOI8 encoding */
-#undef PHP_ONIG_BAD_KOI8_ENTRY
+/* Whether to build sysvmsg as dynamic module */
+#undef COMPILE_DL_SYSVMSG
-/* Define to 1 if the bundled oniguruma is used */
-#undef PHP_ONIG_BUNDLED
+/* Whether to build sysvsem as dynamic module */
+#undef COMPILE_DL_SYSVSEM
-/* uname output */
-#undef PHP_OS
+/* */
+#undef HAVE_SYSVSEM
-/* */
-#undef PHP_PDO_OCI_CLIENT_VERSION
+/* */
+#undef HAVE_SEMUN
-/* whether pread64 is default */
-#undef PHP_PREAD_64
+/* */
+#undef HAVE_SEMUN
-/* whether pwrite64 is default */
-#undef PHP_PWRITE_64
+/* */
+#undef HAVE_SYSVSHM
-/* */
-#undef PHP_SAFE_MODE
+/* Whether to build sysvshm as dynamic module */
+#undef COMPILE_DL_SYSVSHM
-/* */
-#undef PHP_SAFE_MODE_EXEC_DIR
+/* */
+#undef HAVE_TIDYOPTGETDOC
-/* Whether the system supports SHA256 salt */
-#undef PHP_SHA256_CRYPT
+/* Whether to build tidy as dynamic module */
+#undef COMPILE_DL_TIDY
-/* Whether the system supports SHA512 salt */
-#undef PHP_SHA512_CRYPT
+/* */
+#undef HAVE_TIDY
-/* */
-#undef PHP_SIGCHILD
+/* Whether to build tokenizer as dynamic module */
+#undef COMPILE_DL_TOKENIZER
-/* Have PDO */
-#undef PHP_SQLITE2_HAVE_PDO
+/* */
+#undef HAVE_LIBXML
-/* Whether the system supports standard DES salt */
-#undef PHP_STD_DES_CRYPT
+/* */
+#undef HAVE_LIBEXPAT
-/* uname -a output */
-#undef PHP_UNAME
+/* */
+#undef HAVE_WDDX
-/* Whether PHP has to use its own crypt_r for blowfish, des and ext des */
-#undef PHP_USE_PHP_CRYPT_R
+/* Whether to build wddx as dynamic module */
+#undef COMPILE_DL_WDDX
-/* whether write(2) works */
-#undef PHP_WRITE_STDOUT
+/* */
+#undef HAVE_LIBXML
-/* /proc/pid/mem interface */
-#undef PROC_MEM_FILE
+/* */
+#undef HAVE_LIBEXPAT
-/* Whether to use Pthreads */
-#undef PTHREADS
+/* Whether to build xml as dynamic module */
+#undef COMPILE_DL_XML
-/* */
-#undef QDBM_INCLUDE_FILE
+/* */
+#undef HAVE_XML
-/* */
-#undef REGEX
+/* */
+#undef HAVE_LIBXML
-/* Define as the return type of signal handlers (`int' or `void'). */
-#undef RETSIGTYPE
+/* */
+#undef HAVE_XMLREADER
-/* Whether to use Roxen in ZTS mode */
-#undef ROXEN_USE_ZTS
+/* Whether to build xmlreader as dynamic module */
+#undef COMPILE_DL_XMLREADER
-/* The size of `char', as computed by sizeof. */
-#undef SIZEOF_CHAR
+/* */
+#undef HAVE_XMLRPC
-/* The size of `char *', as computed by sizeof. */
-#undef SIZEOF_CHAR_P
+/* */
+#undef HAVE_LIBXML
-/* The size of `int', as computed by sizeof. */
-#undef SIZEOF_INT
+/* */
+#undef HAVE_LIBEXPAT
-/* Size of intmax_t */
-#undef SIZEOF_INTMAX_T
+/* */
+#undef HAVE_LIBICONV
-/* The size of `long', as computed by sizeof. */
-#undef SIZEOF_LONG
+/* */
+#undef HAVE_GICONV_H
-/* The size of `long int', as computed by sizeof. */
-#undef SIZEOF_LONG_INT
+/* */
+#undef HAVE_LIBICONV
-/* The size of `long long', as computed by sizeof. */
-#undef SIZEOF_LONG_LONG
+/* iconv() is aliased to libiconv() in -liconv */
+#undef ICONV_ALIASED_LIBICONV
-/* The size of `long long int', as computed by sizeof. */
-#undef SIZEOF_LONG_LONG_INT
+/* */
+#undef HAVE_ICONV
-/* Size of ptrdiff_t */
-#undef SIZEOF_PTRDIFF_T
+/* */
+#undef UNDEF_THREADS_HACK
-/* The size of `short', as computed by sizeof. */
-#undef SIZEOF_SHORT
+/* Whether to build xmlrpc as dynamic module */
+#undef COMPILE_DL_XMLRPC
-/* The size of `size_t', as computed by sizeof. */
-#undef SIZEOF_SIZE_T
+/* Whether to build xmlrpc as dynamic module */
+#undef COMPILE_DL_XMLRPC
-/* Size of ssize_t */
-#undef SIZEOF_SSIZE_T
+/* */
+#undef HAVE_LIBXML
-/* */
-#undef SOLARIS
+/* */
+#undef HAVE_XMLWRITER
-/* have sqlite3 with extension support */
-#undef SQLITE_OMIT_LOAD_EXTENSION
+/* Whether to build xmlwriter as dynamic module */
+#undef COMPILE_DL_XMLWRITER
-/* Size of a pointer */
-#undef SQLITE_PTR_SZ
+/* */
+#undef HAVE_XSL_EXSLT
-/* */
-#undef SQLITE_UTF8
+/* */
+#undef HAVE_XSL
-/* Needed in sqlunix.h for wchar defs */
-#undef SS_FBX
+/* Whether to build xsl as dynamic module */
+#undef COMPILE_DL_XSL
-/* Needed in sqlunix.h */
-#undef SS_LINUX
+/* */
+#undef HAVE_ZIP
-/* If using the C implementation of alloca, define if you know the
- direction of stack growth for your system; otherwise it will be
- automatically deduced at runtime.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown */
-#undef STACK_DIRECTION
+/* Whether to build zip as dynamic module */
+#undef COMPILE_DL_ZIP
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
+/* Enable compressed protocol support */
+#undef MYSQLND_COMPRESSION_WANTED
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#undef TIME_WITH_SYS_TIME
+/* Enable SSL support */
+#undef MYSQLND_SSL_SUPPORTED
-/* Define to 1 if your <sys/time.h> declares `struct tm'. */
-#undef TM_IN_SYS_TIME
+/* Whether to build mysqlnd as dynamic module */
+#undef COMPILE_DL_MYSQLND
-/* */
-#undef TSRM_ST
+/* Define if int32_t type is present. */
+#undef HAVE_INT32_T
-/* */
-#undef UCD_SNMP_HACK
+/* Define if uint32_t type is present. */
+#undef HAVE_UINT32_T
-/* */
-#undef UNDEF_THREADS_HACK
+/* Whether sprintf is broken */
+#undef ZEND_BROKEN_SPRINTF
-/* */
-#undef UNIXWARE
+/* whether floatingpoint.h defines fp_except */
+#undef HAVE_FP_EXCEPT
-/* whether to check multibyte regex backtrack */
-#undef USE_COMBINATION_EXPLOSION_CHECK
+/* whether _FPU_SETCW is present and usable */
+#undef HAVE__FPU_SETCW
-/* */
-#undef USE_GD_IMGSTRTTF
+/* whether fpsetprec is present and usable */
+#undef HAVE_FPSETPREC
-/* */
-#undef USE_GD_JISX0208
+/* whether _controlfp is present usable */
+#undef HAVE__CONTROLFP
-/* Define if cross-process locking is required by accept() */
-#undef USE_LOCKING
+/* whether _controlfp_s is present and usable */
+#undef HAVE__CONTROLFP_S
-/* Enable extensions on AIX 3, Interix. */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-/* Enable GNU extensions on systems that have them. */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-/* Enable threading extensions on Solaris. */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-/* Enable extensions on HP NonStop. */
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-/* Enable general extensions on Solaris. */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
+/* whether FPU control word can be manipulated by inline assembler */
+#undef HAVE_FPU_INLINE_ASM_X86
+/* Define if double cast to long preserves least significant bits */
+#undef ZEND_DVAL_TO_LVAL_CAST_OK
-/* */
-#undef USE_TRANSFER_TABLES
+/* Define if dlsym() requires a leading underscore in symbol names. */
+#undef DLSYM_NEEDS_UNDERSCORE
-/* whether you want Pi3Web support */
-#undef WITH_PI3WEB
+/* virtual machine dispatch method */
+#undef ZEND_VM_KIND
-/* */
-#undef WITH_ZEUS
+/* virtual machine dispatch method */
+#undef ZEND_VM_KIND
-/* Define if processor uses big-endian word */
-#undef WORDS_BIGENDIAN
+/* virtual machine dispatch method */
+#undef ZEND_VM_KIND
-/* Whether sprintf is broken */
-#undef ZEND_BROKEN_SPRINTF
+/* */
+#undef ZEND_DEBUG
-/* */
+/* */
#undef ZEND_DEBUG
-/* Define if double cast to long preserves least significant bits */
-#undef ZEND_DVAL_TO_LVAL_CAST_OK
+/* */
+#undef ZTS
+
+/* */
+#undef ZEND_MULTIBYTE
+
+/* Define if the target system is darwin */
+#undef DARWIN
-/* */
+/* */
#undef ZEND_MM_ALIGNMENT
-/* */
+/* */
#undef ZEND_MM_ALIGNMENT_LOG2
-/* */
-#undef ZEND_MULTIBYTE
+/* Define if the target system has support for memory allocation using mmap(MAP_ANON) */
+#undef HAVE_MEM_MMAP_ANON
-/* virtual machine dispatch method */
-#undef ZEND_VM_KIND
+/* Define if the target system has support for memory allocation using mmap(/dev/zero) */
+#undef HAVE_MEM_MMAP_ZERO
-/* */
+/* */
#undef ZTS
-/* Define to 1 if on MINIX. */
-#undef _MINIX
+/* Whether you use GNU Pth */
+#undef GNUPTH
-/* Define to 2 if the system does not provide POSIX.1 features except with
- this defined. */
-#undef _POSIX_1_SOURCE
+/* */
+#undef TSRM_ST
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-#undef _POSIX_SOURCE
+/* Whether to use native BeOS threads */
+#undef BETHREADS
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
+/* Whether to use Pthreads */
+#undef PTHREADS
-/* Define to `int' if <sys/types.h> doesn't define. */
-#undef gid_t
+/* PHP build date */
+#undef PHP_BUILD_DATE
-/* */
-#undef in_addr_t
+/* hardcode for each of the cross compiler host */
+#undef PHP_OS
-/* Define to `__inline__' or `__inline' if that's what the C compiler
- calls it, or to nothing if 'inline' is not supported under any name. */
-#ifndef __cplusplus
-#undef inline
-#endif
+/* hardcode for each of the cross compiler host */
+#undef PHP_UNAME
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-#undef size_t
+/* uname -a output */
+#undef PHP_UNAME
-/* Define to `int' if <sys/types.h> doesn't define. */
-#undef uid_t
+/* uname output */
+#undef PHP_OS
-/* Define to `unsigned int ' if <sys/types.h> does not define. */
-#undef uint
+/* */
+#undef HAVE_BUILD_DEFS_H
-/* Define to `unsigned long ' if <sys/types.h> does not define. */
-#undef ulong
#ifndef ZEND_ACCONFIG_H_NO_C_PROTOS
diff -Naur php-5.3.15-patch1/sapi/cgi/Makefile.frag php-5.3.15/sapi/cgi/Makefile.frag
--- php-5.3.15-patch1/sapi/cgi/Makefile.frag 2012-07-27 15:24:23.000000000 -0700
+++ php-5.3.15/sapi/cgi/Makefile.frag 2012-07-27 15:55:17.000000000 -0700
@@ -1,2 +1,9 @@
-$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+cgi: $(SAPI_CGI_PATH)
+
+$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_CGI_OBJS)
$(BUILD_CGI)
+
+install-cgi: $(SAPI_CGI_PATH)
+ @echo "Installing PHP CGI binary: $(INSTALL_ROOT)$(bindir)/"
+ @$(INSTALL) -m 0755 $(SAPI_CGI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT)
+
diff -Naur php-5.3.15-patch1/sapi/cgi/config9.m4 php-5.3.15/sapi/cgi/config9.m4
--- php-5.3.15-patch1/sapi/cgi/config9.m4 2012-07-27 15:24:23.000000000 -0700
+++ php-5.3.15/sapi/cgi/config9.m4 2012-07-27 15:55:17.000000000 -0700
@@ -8,11 +8,9 @@
dnl
dnl CGI setup
dnl
-if test "$PHP_SAPI" = "default"; then
- AC_MSG_CHECKING(whether to build CGI binary)
- if test "$PHP_CGI" != "no"; then
+AC_MSG_CHECKING(for CGI build)
+if test "$PHP_CGI" != "no"; then
AC_MSG_RESULT(yes)
-
AC_MSG_CHECKING([for socklen_t in sys/socket.h])
AC_EGREP_HEADER([socklen_t], [sys/socket.h],
[AC_MSG_RESULT([yes])
@@ -50,31 +48,29 @@
SAPI_CGI_PATH=sapi/cgi/php-cgi
;;
esac
- PHP_SUBST(SAPI_CGI_PATH)
- dnl Set install target and select SAPI
- INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
+ dnl Select SAPI
PHP_SELECT_SAPI(cgi, program, cgi_main.c fastcgi.c,, '$(SAPI_CGI_PATH)')
case $host_alias in
*aix*)
- BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
+ if test "$php_sapi_module" = "shared"; then
+ BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CGI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/.libs\/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
+ else
+ BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CGI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
+ fi
;;
*darwin*)
- BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
+ BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
;;
*)
- BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
+ BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
;;
esac
+ dnl Expose to Makefile
+ PHP_SUBST(SAPI_CGI_PATH)
PHP_SUBST(BUILD_CGI)
-
- elif test "$PHP_CLI" != "no"; then
- AC_MSG_RESULT(no)
- OVERALL_TARGET=
- PHP_SAPI=cli
- else
- AC_MSG_ERROR([No SAPIs selected.])
- fi
+else
+ AC_MSG_RESULT(yes)
fi
diff -Naur php-5.3.15-patch1/sapi/cli/Makefile.frag php-5.3.15/sapi/cli/Makefile.frag
--- php-5.3.15-patch1/sapi/cli/Makefile.frag 2012-07-27 15:24:23.000000000 -0700
+++ php-5.3.15/sapi/cli/Makefile.frag 2012-07-27 15:55:17.000000000 -0700
@@ -1,11 +1,12 @@
cli: $(SAPI_CLI_PATH)
-$(SAPI_CLI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_CLI_OBJS)
+$(SAPI_CLI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_CLI_OBJS)
$(BUILD_CLI)
install-cli: $(SAPI_CLI_PATH)
@echo "Installing PHP CLI binary: $(INSTALL_ROOT)$(bindir)/"
- @$(INSTALL_CLI)
+ @$(INSTALL) -m 0755 $(SAPI_CLI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)
@echo "Installing PHP CLI man page: $(INSTALL_ROOT)$(mandir)/man1/"
@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
- @$(INSTALL_DATA) $(builddir)/php.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php$(program_suffix).1
+ @$(INSTALL_DATA) sapi/cli/php.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php$(program_suffix).1
+
diff -Naur php-5.3.15-patch1/sapi/cli/config.m4 php-5.3.15/sapi/cli/config.m4
--- php-5.3.15-patch1/sapi/cli/config.m4 2012-07-27 15:24:23.000000000 -0700
+++ php-5.3.15/sapi/cli/config.m4 2012-07-27 15:55:17.000000000 -0700
@@ -8,32 +8,41 @@
AC_MSG_CHECKING(for CLI build)
if test "$PHP_CLI" != "no"; then
- PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/cli/Makefile.frag,$abs_srcdir/sapi/cli,sapi/cli)
+ PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/cli/Makefile.frag)
+
+ dnl Set filename
SAPI_CLI_PATH=sapi/cli/php
- PHP_SUBST(SAPI_CLI_PATH)
+
+ dnl Select SAPI
+ PHP_SELECT_SAPI(cli, program, php_cli.c php_cli_readline.c,, '$(SAPI_CLI_PATH)')
case $host_alias in
*aix*)
- if test "$php_build_target" = "shared"; then
- BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/.libs\/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
+ if test "$php_sapi_module" = "shared"; then
+ BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/.libs\/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
else
- BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
+ BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
fi
;;
*darwin*)
- BUILD_CLI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
+ BUILD_CLI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
;;
*netware*)
- BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -Lnetware -lphp5lib -o \$(SAPI_CLI_PATH)"
+ BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -Lnetware -lphp5lib -o \$(SAPI_CLI_PATH)"
;;
*)
- BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
+ BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
;;
esac
- INSTALL_CLI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 \$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)\$(EXEEXT)"
+ dnl Set executable for tests
+ PHP_EXECUTABLE="\$(top_builddir)/\$(SAPI_CLI_PATH)"
+ PHP_SUBST(PHP_EXECUTABLE)
+
+ dnl Expose to Makefile
+ PHP_SUBST(SAPI_CLI_PATH)
PHP_SUBST(BUILD_CLI)
- PHP_SUBST(INSTALL_CLI)
+
PHP_OUTPUT(sapi/cli/php.1)
fi
AC_MSG_RESULT($PHP_CLI)
diff -Naur php-5.3.15-patch1/sapi/fpm/Makefile.frag php-5.3.15/sapi/fpm/Makefile.frag
--- php-5.3.15-patch1/sapi/fpm/Makefile.frag 2012-07-27 15:24:24.000000000 -0700
+++ php-5.3.15/sapi/fpm/Makefile.frag 2012-07-27 15:55:17.000000000 -0700
@@ -1,17 +1,9 @@
fpm: $(SAPI_FPM_PATH)
-$(builddir)/fpm:
- @mkdir -p $(builddir)/fpm
- @mkdir -p $(builddir)/fpm/events
-
-$(SAPI_FPM_PATH): $(builddir)/fpm $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS)
+$(SAPI_FPM_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_FPM_OBJS)
$(BUILD_FPM)
-$(builddir)/fpm/fpm_conf.lo: $(builddir)/../../main/build-defs.h
-
-install-build: install-fpm
-
-install-fpm: install-sapi
+install-fpm: $(SAPI_FPM_PATH)
@echo "Installing PHP FPM binary: $(INSTALL_ROOT)$(sbindir)/"
@$(mkinstalldirs) $(INSTALL_ROOT)$(sbindir)
@$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/log
@@ -20,7 +12,6 @@
@echo "Installing PHP FPM config: $(INSTALL_ROOT)$(sysconfdir)/" && \
$(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir) || :
-
@$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default || :
@echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/"
diff -Naur php-5.3.15-patch1/sapi/fpm/config.m4 php-5.3.15/sapi/fpm/config.m4
--- php-5.3.15-patch1/sapi/fpm/config.m4 2012-07-27 15:24:23.000000000 -0700
+++ php-5.3.15/sapi/fpm/config.m4 2012-07-27 15:55:17.000000000 -0700
@@ -583,11 +583,12 @@
AC_DEFINE_UNQUOTED(PHP_FPM_USER, "$php_fpm_user", [fpm user name])
AC_DEFINE_UNQUOTED(PHP_FPM_GROUP, "$php_fpm_group", [fpm group name])
+ PHP_ADD_BUILD_DIR(sapi/fpm/fpm)
+ PHP_ADD_BUILD_DIR(sapi/fpm/fpm/events)
PHP_OUTPUT(sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.8 sapi/fpm/status.html)
- PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/fpm/Makefile.frag], [$abs_srcdir/sapi/fpm], [sapi/fpm])
+ PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/fpm/Makefile.frag])
SAPI_FPM_PATH=sapi/fpm/php-fpm
- PHP_SUBST(SAPI_FPM_PATH)
if test "$fpm_trace_type" && test -f "$abs_srcdir/sapi/fpm/fpm/fpm_trace_$fpm_trace_type.c"; then
PHP_FPM_TRACE_FILES="fpm/fpm_trace.c fpm/fpm_trace_$fpm_trace_type.c"
@@ -595,7 +596,6 @@
PHP_FPM_CFLAGS="-I$abs_srcdir/sapi/fpm"
- INSTALL_IT=":"
PHP_FPM_FILES="fpm/fastcgi.c \
fpm/fpm.c \
fpm/fpm_children.c \
@@ -631,17 +631,19 @@
case $host_alias in
*aix*)
- BUILD_FPM="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
+ BUILD_FPM="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FPM_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
;;
*darwin*)
- BUILD_FPM="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
+ BUILD_FPM="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FPM_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
;;
*)
- BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
+ BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
;;
esac
+ PHP_SUBST(SAPI_FPM_PATH)
PHP_SUBST(BUILD_FPM)
+
else
AC_MSG_RESULT(no)
fi
diff -Naur php-5.3.15-patch1/sapi/litespeed/Makefile.frag php-5.3.15/sapi/litespeed/Makefile.frag
--- php-5.3.15-patch1/sapi/litespeed/Makefile.frag 2012-07-27 15:24:24.000000000 -0700
+++ php-5.3.15/sapi/litespeed/Makefile.frag 2012-07-27 15:55:17.000000000 -0700
@@ -1,3 +1,9 @@
-$(SAPI_LITESPEED_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+litespeed: $(SAPI_LITESPEED_PATH)
+
+$(SAPI_LITESPEED_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_LITESPEED_OBJS)
$(BUILD_LITESPEED)
+install-litespeed: $(SAPI_LITESPEED_PATH)
+ @echo "Installing PHP LitSpeed binary: $(INSTALL_ROOT)$(bindir)/"
+ @$(INSTALL) -m 0755 $(SAPI_LITESPEED_PATH) $(INSTALL_ROOT)$(bindir)/lsphp
+
diff -Naur php-5.3.15-patch1/sapi/litespeed/config.m4 php-5.3.15/sapi/litespeed/config.m4
--- php-5.3.15-patch1/sapi/litespeed/config.m4 2012-07-27 15:24:24.000000000 -0700
+++ php-5.3.15/sapi/litespeed/config.m4 2012-07-27 15:55:17.000000000 -0700
@@ -10,22 +10,22 @@
if test "$PHP_LITESPEED" != "no"; then
PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/litespeed/Makefile.frag,$abs_srcdir/sapi/litespeed,sapi/litespeed)
SAPI_LITESPEED_PATH=sapi/litespeed/php
- PHP_SUBST(SAPI_LITESPEED_PATH)
PHP_SELECT_SAPI(litespeed, program, lsapi_main.c lsapilib.c, "", '$(SAPI_LITESPEED_PATH)')
INSTALL_IT="@echo \"Installing PHP LiteSpeed into: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_LITESPEED_PATH) \$(INSTALL_ROOT)\$(bindir)/lsphp"
case $host_alias in
*darwin*)
- BUILD_LITESPEED="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
+ BUILD_LITESPEED="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_LITESPEED_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
;;
*cygwin*)
SAPI_LITESPEED_PATH=sapi/litespeed/php.exe
- BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
+ BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_LITESPEED_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
;;
*)
- BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
+ BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_LITESPEED_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
;;
esac
+ PHP_SUBST(SAPI_LITESPEED_PATH)
PHP_SUBST(BUILD_LITESPEED)
fi
diff -Naur php-5.3.15-patch1/sapi/milter/Makefile.frag php-5.3.15/sapi/milter/Makefile.frag
--- php-5.3.15-patch1/sapi/milter/Makefile.frag 2012-07-27 15:24:24.000000000 -0700
+++ php-5.3.15/sapi/milter/Makefile.frag 2012-07-27 15:55:17.000000000 -0700
@@ -1,2 +1,8 @@
-$(SAPI_MILTER_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+milter: $(SAPI_MILTER_PATH)
+
+$(SAPI_MILTER_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_SAPI_OBJS)
$(BUILD_MILTER)
+
+install-milter: $(SAPI_MILTER_PATH)
+ @$(INSTALL) -m 0755 $(SAPI_MILTER_PATH) $(bindir)/php-milter
+
diff -Naur php-5.3.15-patch1/sapi/milter/config.m4 php-5.3.15/sapi/milter/config.m4
--- php-5.3.15-patch1/sapi/milter/config.m4 2012-07-27 15:24:24.000000000 -0700
+++ php-5.3.15/sapi/milter/config.m4 2012-07-27 15:55:17.000000000 -0700
@@ -25,8 +25,7 @@
PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/milter/Makefile.frag)
PHP_SELECT_SAPI(milter, program, php_milter.c getopt.c,,'$(SAPI_MILTER_PATH)')
PHP_ADD_LIBRARY_WITH_PATH(milter, $MILTERPATH,)
- BUILD_MILTER="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_MILTER_PATH)"
- INSTALL_IT="\$(INSTALL) -m 0755 \$(SAPI_MILTER_PATH) \$(bindir)/php-milter"
+ BUILD_MILTER="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_MILTER_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_MILTER_PATH)"
PHP_SUBST(SAPI_MILTER_PATH)
PHP_SUBST(BUILD_MILTER)
fi