mirror of
https://github.com/Stichting-MINIX-Research-Foundation/pkgsrc-ng.git
synced 2025-08-04 02:08:49 -04:00
138 lines
4.3 KiB
Plaintext
138 lines
4.3 KiB
Plaintext
$NetBSD: patch-configure,v 1.9 2014/07/26 00:12:54 taca Exp $
|
|
|
|
--- configure.orig 2014-07-23 01:10:11.000000000 +0000
|
|
+++ configure
|
|
@@ -8319,27 +8319,6 @@ EOF
|
|
;;
|
|
esac
|
|
|
|
- if test "$APACHE_VERSION" -lt 2004001; then
|
|
- APXS_MPM=`$APXS -q MPM_NAME`
|
|
- if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then
|
|
-
|
|
- enable_maintainer_zts=yes
|
|
- if test "$pthreads_working" != "yes"; then
|
|
- as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
|
|
- fi
|
|
-
|
|
- fi
|
|
- else
|
|
- APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
|
|
- if test -n "$APACHE_THREADED_MPM"; then
|
|
-
|
|
- enable_maintainer_zts=yes
|
|
- if test "$pthreads_working" != "yes"; then
|
|
- as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
|
|
- fi
|
|
-
|
|
- fi
|
|
- fi
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
$as_echo "yes" >&6; }
|
|
|
|
@@ -9143,27 +9122,6 @@ EOF
|
|
;;
|
|
esac
|
|
|
|
- if test "$APACHE_VERSION" -lt 2004001; then
|
|
- APXS_MPM=`$APXS -q MPM_NAME`
|
|
- if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then
|
|
-
|
|
- enable_maintainer_zts=yes
|
|
- if test "$pthreads_working" != "yes"; then
|
|
- as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
|
|
- fi
|
|
-
|
|
- fi
|
|
- else
|
|
- APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
|
|
- if test -n "$APACHE_THREADED_MPM"; then
|
|
-
|
|
- enable_maintainer_zts=yes
|
|
- if test "$pthreads_working" != "yes"; then
|
|
- as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
|
|
- fi
|
|
-
|
|
- fi
|
|
- fi
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
$as_echo "yes" >&6; }
|
|
|
|
@@ -23554,7 +23512,7 @@ fi
|
|
if test "$found_openssl" = "no"; then
|
|
|
|
if test "$PHP_OPENSSL_DIR" = "yes"; then
|
|
- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
|
|
+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
|
|
fi
|
|
|
|
for i in $PHP_OPENSSL_DIR; do
|
|
@@ -25704,7 +25662,7 @@ $as_echo "yes" >&6; }
|
|
PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
|
|
|
|
|
|
- for header_file in ext/sqlite3/libsqlite/sqlite3.h; do
|
|
+ for header_file; do
|
|
|
|
|
|
unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
|
|
@@ -36944,7 +36902,7 @@ fi
|
|
if test "$found_openssl" = "no"; then
|
|
|
|
if test "$PHP_OPENSSL_DIR" = "yes"; then
|
|
- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
|
|
+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
|
|
fi
|
|
|
|
for i in $PHP_OPENSSL_DIR; do
|
|
@@ -51409,7 +51367,7 @@ fi
|
|
if test "$found_openssl" = "no"; then
|
|
|
|
if test "$PHP_OPENSSL_DIR" = "yes"; then
|
|
- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
|
|
+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
|
|
fi
|
|
|
|
for i in $PHP_OPENSSL_DIR; do
|
|
@@ -105614,12 +105572,7 @@ old_CC=$CC
|
|
if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then
|
|
CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags"
|
|
INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags"
|
|
- cat >meta_ccld<<EOF
|
|
-#! /bin/sh
|
|
-exec $CC $ac_cv_pthreads_cflags \$@
|
|
-EOF
|
|
- CC="$abs_builddir/meta_ccld"
|
|
- chmod +x meta_ccld
|
|
+ CPPFLAGS="$CPPFLAGS $ac_cv_pthreads_cflags"
|
|
fi
|
|
|
|
if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then
|
|
@@ -109385,7 +109338,7 @@ freebsd* | dragonfly*)
|
|
objformat=`/usr/bin/objformat`
|
|
else
|
|
case $host_os in
|
|
- freebsd[123]*) objformat=aout ;;
|
|
+ freebsd[123]|freebsd[123].*) objformat=aout ;;
|
|
*) objformat=elf ;;
|
|
esac
|
|
fi
|
|
@@ -111465,7 +111418,7 @@ if test -z "$aix_libpath"; then aix_libp
|
|
;;
|
|
esac
|
|
;;
|
|
- freebsd[12]*)
|
|
+ freebsd[12]|freebsd[12].*)
|
|
# C++ shared libraries reported to be fairly broken before switch to ELF
|
|
ld_shlibs_CXX=no
|
|
;;
|
|
@@ -113018,7 +112971,7 @@ freebsd* | dragonfly*)
|
|
objformat=`/usr/bin/objformat`
|
|
else
|
|
case $host_os in
|
|
- freebsd[123]*) objformat=aout ;;
|
|
+ freebsd[123]|freebsd[123].*) objformat=aout ;;
|
|
*) objformat=elf ;;
|
|
esac
|
|
fi
|