archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Trim trailing whitespaces in build files

Browse source 
Some editors utilizing .editorconfig automatically trim whitespaces. For
convenience this patch removes whitespaces in certain build files:
- ext/*/config*.m4
- configure.ac
- acinclude.m4
This commit is contained in:
Peter Kokot 2018-07-29 03:43:45 +02:00
parent b60d8ab2e2
commit cf3b852109
40 changed files with 202 additions and 202 deletions
Download patch file Download diff file Expand all files Collapse all files

110
acinclude.m4
View file

@ -10,7 +10,7 @@ dnl
dnl PHP_HELP_SEPARATOR(title) dnl PHP_HELP_SEPARATOR(title)
dnl dnl
dnl Adds separator title into the configure --help display. dnl Adds separator title into the configure --help display.
dnl dnl
AC_DEFUN([PHP_HELP_SEPARATOR],[ AC_DEFUN([PHP_HELP_SEPARATOR],[
AC_ARG_ENABLE([],[ AC_ARG_ENABLE([],[
$1 $1
@ -146,7 +146,7 @@ $EGREP $pattern'.*include/php' $srcdir/configure|$SED 's/.*>//'|xargs touch 2>/d
dnl dnl
dnl PHP_GEN_GLOBAL_MAKEFILE dnl PHP_GEN_GLOBAL_MAKEFILE
dnl dnl
dnl Generates the global makefile. dnl Generates the global makefile.
dnl dnl
AC_DEFUN([PHP_GEN_GLOBAL_MAKEFILE],[ AC_DEFUN([PHP_GEN_GLOBAL_MAKEFILE],[
@ -181,10 +181,10 @@ AC_DEFUN([PHP_ADD_MAKEFILE_FRAGMENT],[
dnl dnl
dnl PHP_ADD_SOURCES(source-path, sources [, special-flags [, type]]) dnl PHP_ADD_SOURCES(source-path, sources [, special-flags [, type]])
dnl dnl
dnl Adds sources which are located relative to source-path to the dnl Adds sources which are located relative to source-path to the
dnl array of type type. Sources are processed with optional dnl array of type type. Sources are processed with optional
dnl special-flags which are passed to the compiler. Sources dnl special-flags which are passed to the compiler. Sources
dnl can be either written in C or C++ (filenames shall end in .c dnl can be either written in C or C++ (filenames shall end in .c
dnl or .cpp, respectively). dnl or .cpp, respectively).
dnl dnl
dnl Note: If source-path begins with a "/", the "/" is removed and dnl Note: If source-path begins with a "/", the "/" is removed and
@ -225,7 +225,7 @@ dnl name of the array target-var directly, as well as whether
dnl shared objects will be built from the sources. dnl shared objects will be built from the sources.
dnl dnl
dnl Should not be used directly. dnl Should not be used directly.
dnl dnl
AC_DEFUN([PHP_ADD_SOURCES_X],[ AC_DEFUN([PHP_ADD_SOURCES_X],[
dnl relative to source- or build-directory? dnl relative to source- or build-directory?
dnl ac_srcdir/ac_bdir include trailing slash dnl ac_srcdir/ac_bdir include trailing slash
@ -234,20 +234,20 @@ dnl ac_srcdir/ac_bdir include trailing slash
/*[)] ac_srcdir=`echo "$1"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; /*[)] ac_srcdir=`echo "$1"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
*[)] ac_srcdir="$abs_srcdir/$1/"; ac_bdir="$1/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; *[)] ac_srcdir="$abs_srcdir/$1/"; ac_bdir="$1/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
esac esac
dnl how to build .. shared or static? dnl how to build .. shared or static?
ifelse($5,yes,_PHP_ASSIGN_BUILD_VARS(shared),_PHP_ASSIGN_BUILD_VARS(php)) ifelse($5,yes,_PHP_ASSIGN_BUILD_VARS(shared),_PHP_ASSIGN_BUILD_VARS(php))
dnl iterate over the sources dnl iterate over the sources
old_IFS=[$]IFS old_IFS=[$]IFS
for ac_src in $2; do for ac_src in $2; do
dnl remove the suffix dnl remove the suffix
IFS=. IFS=.
set $ac_src set $ac_src
ac_obj=[$]1 ac_obj=[$]1
IFS=$old_IFS IFS=$old_IFS
dnl append to the array which has been dynamically chosen at m4 time dnl append to the array which has been dynamically chosen at m4 time
$4="[$]$4 [$]ac_bdir[$]ac_obj.lo" $4="[$]$4 [$]ac_bdir[$]ac_obj.lo"
@ -362,7 +362,7 @@ AC_DEFUN([PHP_LIBGCC_LIBPATH],[
]) ])
dnl ------------------------------------------------------------------------- dnl -------------------------------------------------------------------------
dnl Macros to modify LIBS, INCLUDES, etc. variables dnl Macros to modify LIBS, INCLUDES, etc. variables
dnl ------------------------------------------------------------------------- dnl -------------------------------------------------------------------------
dnl dnl
@ -484,7 +484,7 @@ dnl cc-specific
dnl dnl
dnl PHP_ADD_INCLUDE(path [,before]) dnl PHP_ADD_INCLUDE(path [,before])
dnl dnl
dnl add an include path. dnl add an include path.
dnl if before is 1, add in the beginning of INCLUDES. dnl if before is 1, add in the beginning of INCLUDES.
dnl dnl
AC_DEFUN([PHP_ADD_INCLUDE],[ AC_DEFUN([PHP_ADD_INCLUDE],[
@ -772,7 +772,7 @@ AC_DEFUN([PHP_BUILD_SHARED],[
PHP_BUILD_PROGRAM PHP_BUILD_PROGRAM
OVERALL_TARGET=libphp[]$PHP_MAJOR_VERSION[.la] OVERALL_TARGET=libphp[]$PHP_MAJOR_VERSION[.la]
php_sapi_module=shared php_sapi_module=shared
php_c_pre=$shared_c_pre php_c_pre=$shared_c_pre
php_c_meta=$shared_c_meta php_c_meta=$shared_c_meta
php_c_post=$shared_c_post php_c_post=$shared_c_post
@ -883,7 +883,7 @@ AC_DEFUN([PHP_SELECT_SAPI],[
]) ])
else else
PHP_SAPI=$1 PHP_SAPI=$1
fi fi
PHP_ADD_BUILD_DIR([sapi/$1]) PHP_ADD_BUILD_DIR([sapi/$1])
@ -940,7 +940,7 @@ dnl to build the extension.
dnl "shared" can be set to "shared" or "yes" to build the extension as dnl "shared" can be set to "shared" or "yes" to build the extension as
dnl a dynamically loadable library. Optional parameter "sapi_class" can dnl a dynamically loadable library. Optional parameter "sapi_class" can
dnl be set to "cli" to mark extension build only with CLI or CGI sapi's. dnl be set to "cli" to mark extension build only with CLI or CGI sapi's.
dnl "extra-cflags" are passed to the compiler, with dnl "extra-cflags" are passed to the compiler, with
dnl @ext_srcdir@ and @ext_builddir@ being substituted. dnl @ext_srcdir@ and @ext_builddir@ being substituted.
dnl "cxx" can be used to indicate that a C++ shared module is desired. dnl "cxx" can be used to indicate that a C++ shared module is desired.
dnl "zend_ext" indicates a zend extension. dnl "zend_ext" indicates a zend extension.
@ -986,7 +986,7 @@ dnl ---------------------------------------------- CLI static module
PHP_ADD_BUILD_DIR($ext_builddir) PHP_ADD_BUILD_DIR($ext_builddir)
dnl Set for phpize builds only dnl Set for phpize builds only
dnl --------------------------- dnl ---------------------------
if test "$ext_builddir" = "."; then if test "$ext_builddir" = "."; then
PHP_PECL_EXTENSION=$1 PHP_PECL_EXTENSION=$1
PHP_SUBST(PHP_PECL_EXTENSION) PHP_SUBST(PHP_PECL_EXTENSION)
@ -1016,7 +1016,7 @@ dnl $3 = optional: if true, it's ok for $2 to have not been configured
dnl default is false and should halt the build. dnl default is false and should halt the build.
dnl To be effective, this macro must be invoked *after* PHP_NEW_EXTENSION. dnl To be effective, this macro must be invoked *after* PHP_NEW_EXTENSION.
dnl The extension on which it depends must also have been configured. dnl The extension on which it depends must also have been configured.
dnl See ADD_EXTENSION_DEP in win32 build dnl See ADD_EXTENSION_DEP in win32 build
dnl dnl
AC_DEFUN([PHP_ADD_EXTENSION_DEP], [ AC_DEFUN([PHP_ADD_EXTENSION_DEP], [
am_i_shared=$[PHP_]translit($1,a-z_-,A-Z__)[_SHARED] am_i_shared=$[PHP_]translit($1,a-z_-,A-Z__)[_SHARED]
@ -1178,7 +1178,7 @@ main() {
struct tm t, *s; struct tm t, *s;
time_t old = 0; time_t old = 0;
char buf[27], *p; char buf[27], *p;
s = gmtime_r(&old, &t); s = gmtime_r(&old, &t);
p = asctime_r(&t, buf, 26); p = asctime_r(&t, buf, 26);
if (p == buf && s == &t) return (0); if (p == buf && s == &t) return (0);
@ -1243,7 +1243,7 @@ AC_DEFUN([PHP_DOES_PREAD_WORK],[
#include <errno.h> #include <errno.h>
$1 $1
main() { main() {
char buf[3]; char buf[3];
int fd = open("conftest_in", O_RDONLY); int fd = open("conftest_in", O_RDONLY);
if (fd < 0) exit(1); if (fd < 0) exit(1);
if (pread(fd, buf, 2, 0) != 2) exit(1); if (pread(fd, buf, 2, 0) != 2) exit(1);
@ -1280,7 +1280,7 @@ AC_DEFUN([PHP_PWRITE_TEST],[
if test "$ac_cv_pwrite" = "64"; then if test "$ac_cv_pwrite" = "64"; then
AC_DEFINE(PHP_PWRITE_64, 1, [whether pwrite64 is default]) AC_DEFINE(PHP_PWRITE_64, 1, [whether pwrite64 is default])
fi fi
fi fi
]) ])
dnl dnl
@ -1302,7 +1302,7 @@ AC_DEFUN([PHP_PREAD_TEST],[
if test "$ac_cv_pread" = "64"; then if test "$ac_cv_pread" = "64"; then
AC_DEFINE(PHP_PREAD_64, 1, [whether pread64 is default]) AC_DEFINE(PHP_PREAD_64, 1, [whether pread64 is default])
fi fi
fi fi
]) ])
dnl dnl
@ -1340,7 +1340,7 @@ AC_DEFUN([PHP_MISSING_TIME_R_DECL],[
dnl dnl
dnl PHP_READDIR_R_TYPE dnl PHP_READDIR_R_TYPE
dnl dnl
AC_DEFUN([PHP_READDIR_R_TYPE],[ AC_DEFUN([PHP_READDIR_R_TYPE],[
dnl HAVE_READDIR_R is also defined by libmysql dnl HAVE_READDIR_R is also defined by libmysql
AC_CHECK_FUNC(readdir_r,ac_cv_func_readdir_r=yes,ac_cv_func_readdir=no) AC_CHECK_FUNC(readdir_r,ac_cv_func_readdir_r=yes,ac_cv_func_readdir=no)
@ -1361,7 +1361,7 @@ main() {
struct dirent *pentry = (struct dirent *) &entry; struct dirent *pentry = (struct dirent *) &entry;
dir = opendir("/"); dir = opendir("/");
if (!dir) if (!dir)
exit(1); exit(1);
if (readdir_r(dir, (struct dirent *) entry, &pentry) == 0) { if (readdir_r(dir, (struct dirent *) entry, &pentry) == 0) {
close(dir); close(dir);
@ -1399,7 +1399,7 @@ int readdir_r(DIR *, struct dirent *);
dnl dnl
dnl PHP_TM_GMTOFF dnl PHP_TM_GMTOFF
dnl dnl
AC_DEFUN([PHP_TM_GMTOFF],[ AC_DEFUN([PHP_TM_GMTOFF],[
AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff, AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff,
[AC_TRY_COMPILE([#include <sys/types.h> [AC_TRY_COMPILE([#include <sys/types.h>
@ -1502,7 +1502,7 @@ AC_DEFUN([PHP_AC_BROKEN_SNPRINTF],[
main() { main() {
char buf[20]; char buf[20];
int res = 0; int res = 0;
res = res || (snprintf(buf, 2, "marcus") != 6); res = res || (snprintf(buf, 2, "marcus") != 6);
res = res || (buf[1] != '\0'); res = res || (buf[1] != '\0');
/* Implementations may consider this as an encoding error */ /* Implementations may consider this as an encoding error */
snprintf(buf, 0, "boerger"); snprintf(buf, 0, "boerger");
@ -1510,7 +1510,7 @@ main() {
res = res || (buf[0] != 'm'); res = res || (buf[0] != 'm');
res = res || (snprintf(NULL, 0, "boerger") != 7); res = res || (snprintf(NULL, 0, "boerger") != 7);
res = res || (snprintf(buf, sizeof(buf), "%f", 0.12345678) != 8); res = res || (snprintf(buf, sizeof(buf), "%f", 0.12345678) != 8);
exit(res); exit(res);
} }
],[ ],[
ac_cv_broken_snprintf=no ac_cv_broken_snprintf=no
@ -1617,7 +1617,7 @@ AC_DEFUN([PHP_SOCKADDR_CHECKS], [
if test "$ac_cv_sockaddr_storage" = "yes"; then if test "$ac_cv_sockaddr_storage" = "yes"; then
AC_DEFINE(HAVE_SOCKADDR_STORAGE, 1, [Whether you have struct sockaddr_storage]) AC_DEFINE(HAVE_SOCKADDR_STORAGE, 1, [Whether you have struct sockaddr_storage])
fi fi
dnl Check if field sa_len exists in struct sockaddr dnl Check if field sa_len exists in struct sockaddr
AC_CACHE_CHECK([for field sa_len in struct sockaddr],ac_cv_sockaddr_sa_len,[ AC_CACHE_CHECK([for field sa_len in struct sockaddr],ac_cv_sockaddr_sa_len,[
AC_TRY_COMPILE([#include <sys/types.h> AC_TRY_COMPILE([#include <sys/types.h>
#include <sys/socket.h>], #include <sys/socket.h>],
@ -1658,9 +1658,9 @@ dnl
AC_DEFUN([PHP_EBCDIC], [ AC_DEFUN([PHP_EBCDIC], [
AC_CACHE_CHECK([whether system uses EBCDIC],ac_cv_ebcdic,[ AC_CACHE_CHECK([whether system uses EBCDIC],ac_cv_ebcdic,[
AC_TRY_RUN( [ AC_TRY_RUN( [
int main(void) { int main(void) {
return (unsigned char)'A' != (unsigned char)0xC1; return (unsigned char)'A' != (unsigned char)0xC1;
} }
],[ ],[
ac_cv_ebcdic=yes ac_cv_ebcdic=yes
],[ ],[
@ -1704,7 +1704,7 @@ int main(int argc, char *argv[])
FILE *fp; FILE *fp;
long position; long position;
char *filename = tmpnam(NULL); char *filename = tmpnam(NULL);
fp = fopen(filename, "w"); fp = fopen(filename, "w");
if (fp == NULL) { if (fp == NULL) {
perror("fopen"); perror("fopen");
@ -1798,7 +1798,7 @@ main() {
], [ ], [
cookie_io_functions_use_off64_t=no cookie_io_functions_use_off64_t=no
]) ])
else else
dnl older glibc versions (up to 2.1.2 ?) dnl older glibc versions (up to 2.1.2 ?)
@ -1835,7 +1835,7 @@ dnl
AC_DEFUN([PHP_CHECK_LIBRARY], [ AC_DEFUN([PHP_CHECK_LIBRARY], [
save_old_LDFLAGS=$LDFLAGS save_old_LDFLAGS=$LDFLAGS
ac_stuff="$5" ac_stuff="$5"
save_ext_shared=$ext_shared save_ext_shared=$ext_shared
ext_shared=yes ext_shared=yes
PHP_EVAL_LIBLINE([$]ac_stuff, LDFLAGS) PHP_EVAL_LIBLINE([$]ac_stuff, LDFLAGS)
@ -1925,11 +1925,11 @@ AC_DEFUN([PHP_CHECK_FUNC],[
unset ac_cv_func_$1 unset ac_cv_func_$1
unset ac_cv_func___$1 unset ac_cv_func___$1
unset found unset found
AC_CHECK_FUNC($1, [found=yes],[ AC_CHECK_FUNC(__$1,[found=yes],[found=no]) ]) AC_CHECK_FUNC($1, [found=yes],[ AC_CHECK_FUNC(__$1,[found=yes],[found=no]) ])
case $found in case $found in
yes[)] yes[)]
PHP_DEF_HAVE($1) PHP_DEF_HAVE($1)
ac_cv_func_$1=yes ac_cv_func_$1=yes
;; ;;
@ -2000,7 +2000,7 @@ dnl
dnl PHP_CHECK_64BIT([do if 32], [do if 64]) dnl PHP_CHECK_64BIT([do if 32], [do if 64])
dnl dnl
dnl This macro is used to detect if we're at 64-bit platform or not. dnl This macro is used to detect if we're at 64-bit platform or not.
dnl It could be useful for those external libs, that have different precompiled dnl It could be useful for those external libs, that have different precompiled
dnl versions in different directories. dnl versions in different directories.
dnl dnl
AC_DEFUN([PHP_CHECK_64BIT],[ AC_DEFUN([PHP_CHECK_64BIT],[
@ -2070,9 +2070,9 @@ AC_DEFUN([PHP_PROG_AWK], [
*mawk) *mawk)
AC_MSG_WARN([mawk is known to have problems on some systems. You should install GNU awk]) AC_MSG_WARN([mawk is known to have problems on some systems. You should install GNU awk])
;; ;;
*gawk) *gawk)
;; ;;
bork) bork)
AC_MSG_ERROR([Could not find awk; Install GNU awk]) AC_MSG_ERROR([Could not find awk; Install GNU awk])
;; ;;
*) *)
@ -2107,7 +2107,7 @@ dnl
AC_DEFUN([PHP_PROG_LEX], [ AC_DEFUN([PHP_PROG_LEX], [
dnl we only support certain flex versions dnl we only support certain flex versions
flex_version_list="2.5.4" flex_version_list="2.5.4"
AC_PROG_LEX AC_PROG_LEX
dnl ## Make flex scanners use const if they can, even if __STDC__ is not dnl ## Make flex scanners use const if they can, even if __STDC__ is not
dnl ## true, for compilers like Sun's that only set __STDC__ true in dnl ## true, for compilers like Sun's that only set __STDC__ true in
@ -2130,7 +2130,7 @@ dnl we only support certain flex versions
else else
flex_version=none flex_version=none
fi fi
case $php_cv_flex_version in case $php_cv_flex_version in
""|invalid[)] ""|invalid[)]
if test -f "$abs_srcdir/Zend/zend_language_scanner.c" && test -f "$abs_srcdir/Zend/zend_ini_scanner.c"; then if test -f "$abs_srcdir/Zend/zend_language_scanner.c" && test -f "$abs_srcdir/Zend/zend_ini_scanner.c"; then
@ -2164,7 +2164,7 @@ AC_DEFUN([PHP_PROG_RE2C],[
php_cv_re2c_version=invalid php_cv_re2c_version=invalid
else else
php_cv_re2c_version="`$RE2C --version | cut -d ' ' -f 2 2>/dev/null` (ok)" php_cv_re2c_version="`$RE2C --version | cut -d ' ' -f 2 2>/dev/null` (ok)"
fi fi
]) ])
fi fi
case $php_cv_re2c_version in case $php_cv_re2c_version in
@ -2299,7 +2299,7 @@ ifelse([$3],[],,[else $3])
fi fi
]) ])
dnl dnl
dnl PHP_SETUP_OPENSSL(shared-add [, action-found [, action-not-found]]) dnl PHP_SETUP_OPENSSL(shared-add [, action-found [, action-not-found]])
dnl dnl
dnl Common setup macro for openssl dnl Common setup macro for openssl
@ -2346,7 +2346,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
dnl If pkg-config fails for some reason, revert to the old method dnl If pkg-config fails for some reason, revert to the old method
if test "$found_openssl" = "no"; then if test "$found_openssl" = "no"; then
if test "$PHP_OPENSSL_DIR" = "yes"; 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 fi
@ -2385,7 +2385,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
CPPFLAGS=$old_CPPFLAGS CPPFLAGS=$old_CPPFLAGS
PHP_ADD_INCLUDE($OPENSSL_INCDIR) PHP_ADD_INCLUDE($OPENSSL_INCDIR)
PHP_CHECK_LIBRARY(crypto, CRYPTO_free, [ PHP_CHECK_LIBRARY(crypto, CRYPTO_free, [
PHP_ADD_LIBRARY(crypto,,$1) PHP_ADD_LIBRARY(crypto,,$1)
],[ ],[
@ -2420,7 +2420,7 @@ ifelse([$3],[],,[else $3])
fi fi
]) ])
dnl dnl
dnl PHP_SETUP_ICONV(shared-add [, action-found [, action-not-found]]) dnl PHP_SETUP_ICONV(shared-add [, action-found [, action-not-found]])
dnl dnl
dnl Common setup macro for iconv dnl Common setup macro for iconv
@ -2484,7 +2484,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [
if test -z "$ICONV_DIR"; then if test -z "$ICONV_DIR"; then
AC_MSG_ERROR([Please specify the install prefix of iconv with --with-iconv=<DIR>]) AC_MSG_ERROR([Please specify the install prefix of iconv with --with-iconv=<DIR>])
fi fi
if test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.a || if test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.a ||
test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME
then then
@ -2518,7 +2518,7 @@ ifelse([$3],[],,[else $3])
fi fi
]) ])
dnl dnl
dnl PHP_SETUP_LIBXML(shared-add [, action-found [, action-not-found]]) dnl PHP_SETUP_LIBXML(shared-add [, action-found [, action-not-found]])
dnl dnl
dnl Common setup macro for libxml dnl Common setup macro for libxml
@ -2600,7 +2600,7 @@ dnl -------------------------------------------------------------------------
dnl Misc. macros dnl Misc. macros
dnl ------------------------------------------------------------------------- dnl -------------------------------------------------------------------------
dnl dnl
dnl PHP_INSTALL_HEADERS(path [, file ...]) dnl PHP_INSTALL_HEADERS(path [, file ...])
dnl dnl
dnl PHP header files to be installed dnl PHP header files to be installed
@ -2611,7 +2611,7 @@ AC_DEFUN([PHP_INSTALL_HEADERS],[
PHP_RUN_ONCE(INSTALLHEADERS, $header_file, [ PHP_RUN_ONCE(INSTALLHEADERS, $header_file, [
INSTALL_HEADERS="$INSTALL_HEADERS $header_file" INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
]) ])
done done
], [ ], [
header_path=$1 header_path=$1
for header_file in $2; do for header_file in $2; do
@ -2619,7 +2619,7 @@ AC_DEFUN([PHP_INSTALL_HEADERS],[
PHP_RUN_ONCE(INSTALLHEADERS, $hp_hf, [ PHP_RUN_ONCE(INSTALLHEADERS, $hp_hf, [
INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"
]) ])
done done
]) ])
]) ])
@ -2642,7 +2642,7 @@ IFS="- /.
dnl dnl
dnl PHP_DEBUG_MACRO(filename) dnl PHP_DEBUG_MACRO(filename)
dnl dnl
AC_DEFUN([PHP_DEBUG_MACRO],[ AC_DEFUN([PHP_DEBUG_MACRO],[
DEBUG_LOG=$1 DEBUG_LOG=$1
cat >$1 <<X cat >$1 <<X
@ -2704,7 +2704,7 @@ EOF
echo "'[$]0' \\" >> $1 echo "'[$]0' \\" >> $1
if test `expr " [$]0" : " '.*"` = 0; then if test `expr " [$]0" : " '.*"` = 0; then
CONFIGURE_COMMAND="$CONFIGURE_COMMAND '[$]0'" CONFIGURE_COMMAND="$CONFIGURE_COMMAND '[$]0'"
else else
CONFIGURE_COMMAND="$CONFIGURE_COMMAND [$]0" CONFIGURE_COMMAND="$CONFIGURE_COMMAND [$]0"
fi fi
CONFIGURE_ARGS="$clean_configure_args" CONFIGURE_ARGS="$clean_configure_args"
@ -2772,7 +2772,7 @@ AC_DEFUN([PHP_CHECK_CONFIGURE_OPTIONS],[
if test "$PHP_MAJOR_VERSION" -lt "6"; then if test "$PHP_MAJOR_VERSION" -lt "6"; then
case $arg_name in case $arg_name in
enable-zend-multibyte[)] continue;; enable-zend-multibyte[)] continue;;
esac esac
fi fi
is_arg_set=php_[]`echo [$]arg_name | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ-' 'abcdefghijklmnopqrstuvwxyz_'` is_arg_set=php_[]`echo [$]arg_name | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ-' 'abcdefghijklmnopqrstuvwxyz_'`
@ -2854,7 +2854,7 @@ AC_DEFUN([PHP_CRYPT_R_STYLE],
],[ ],[
CRYPTD buffer; CRYPTD buffer;
crypt_r("passwd", "hash", &buffer); crypt_r("passwd", "hash", &buffer);
], ],
php_cv_crypt_r_style=cryptd) php_cv_crypt_r_style=cryptd)
if test "$php_cv_crypt_r_style" = "none"; then if test "$php_cv_crypt_r_style" = "none"; then
@ -2864,7 +2864,7 @@ php_cv_crypt_r_style=cryptd)
],[ ],[
struct crypt_data buffer; struct crypt_data buffer;
crypt_r("passwd", "hash", &buffer); crypt_r("passwd", "hash", &buffer);
], ],
php_cv_crypt_r_style=struct_crypt_data) php_cv_crypt_r_style=struct_crypt_data)
fi fi
@ -2876,7 +2876,7 @@ php_cv_crypt_r_style=struct_crypt_data)
],[ ],[
struct crypt_data buffer; struct crypt_data buffer;
crypt_r("passwd", "hash", &buffer); crypt_r("passwd", "hash", &buffer);
], ],
php_cv_crypt_r_style=struct_crypt_data_gnu_source) php_cv_crypt_r_style=struct_crypt_data_gnu_source)
fi fi
]) ])

20
configure.ac
View file

@ -692,7 +692,7 @@ dnl Check for getaddrinfo, should be a better way, but...
dnl Also check for working getaddrinfo dnl Also check for working getaddrinfo
AC_CACHE_CHECK([for getaddrinfo], ac_cv_func_getaddrinfo, AC_CACHE_CHECK([for getaddrinfo], ac_cv_func_getaddrinfo,
[AC_TRY_LINK([#include <netdb.h>], [AC_TRY_LINK([#include <netdb.h>],
[struct addrinfo *g,h;g=&h;getaddrinfo("","",g,&g);], [struct addrinfo *g,h;g=&h;getaddrinfo("","",g,&g);],
[AC_TRY_RUN([ [AC_TRY_RUN([
#include <netdb.h> #include <netdb.h>
#include <sys/types.h> #include <sys/types.h>
@ -714,7 +714,7 @@ int main(void) {
} }
pai = ai; pai = ai;
while (pai) { while (pai) {
if (pai->ai_family != AF_INET) { if (pai->ai_family != AF_INET) {
/* 127.0.0.1/NUMERICHOST should only resolve ONE way */ /* 127.0.0.1/NUMERICHOST should only resolve ONE way */
@ -829,7 +829,7 @@ if test "$PHP_GCOV" = "yes"; then
if test "$GCC" != "yes"; then if test "$GCC" != "yes"; then
AC_MSG_ERROR([GCC is required for --enable-gcov]) AC_MSG_ERROR([GCC is required for --enable-gcov])
fi fi
dnl Check if ccache is being used dnl Check if ccache is being used
case `$php_shtool path $CC` in case `$php_shtool path $CC` in
*ccache*[)] gcc_ccache=yes;; *ccache*[)] gcc_ccache=yes;;
@ -839,7 +839,7 @@ if test "$PHP_GCOV" = "yes"; then
if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then
AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.]) AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
fi fi
dnl min: 1.5 (i.e. 105, major * 100 + minor for easier comparison) dnl min: 1.5 (i.e. 105, major * 100 + minor for easier comparison)
ltp_version_min="105" ltp_version_min="105"
dnl non-working versions, e.g. "1.8 1.18"; dnl non-working versions, e.g. "1.8 1.18";
@ -872,7 +872,7 @@ if test "$PHP_GCOV" = "yes"; then
fi fi
]) ])
else else
ltp_msg="To enable code coverage reporting you must have LTP installed" ltp_msg="To enable code coverage reporting you must have LTP installed"
AC_MSG_ERROR([$ltp_msg]) AC_MSG_ERROR([$ltp_msg])
fi fi
@ -962,7 +962,7 @@ fi
AC_MSG_CHECKING([where to scan for configuration files]) AC_MSG_CHECKING([where to scan for configuration files])
PHP_ARG_WITH(config-file-scan-dir,, PHP_ARG_WITH(config-file-scan-dir,,
[ --with-config-file-scan-dir=PATH [ --with-config-file-scan-dir=PATH
Set the path where to scan for configuration files], DEFAULT, no) Set the path where to scan for configuration files], DEFAULT, no)
if test "$PHP_CONFIG_FILE_SCAN_DIR" = "DEFAULT"; then if test "$PHP_CONFIG_FILE_SCAN_DIR" = "DEFAULT"; then
PHP_CONFIG_FILE_SCAN_DIR= PHP_CONFIG_FILE_SCAN_DIR=
fi fi
@ -1060,7 +1060,7 @@ dnl -------------------------------------------------------------------------
PHP_HELP_SEPARATOR([Extensions: PHP_HELP_SEPARATOR([Extensions:
--with-EXTENSION=[shared[,PATH]] --with-EXTENSION=[shared[,PATH]]
NOTE: Not all extensions can be build as 'shared'. NOTE: Not all extensions can be build as 'shared'.
Example: --with-foobar=shared,/usr/local/foobar/ Example: --with-foobar=shared,/usr/local/foobar/
@ -1147,13 +1147,13 @@ if test "$PHP_PEAR" != "no"; then
dnl PEAR dependencies dnl PEAR dependencies
dnl dnl
if test "$PHP_XML" = "no"; then if test "$PHP_XML" = "no"; then
pear_error_msg="$pear_error_msg pear_error_msg="$pear_error_msg
PEAR requires XML to be enabled. Add --enable-xml to the configure line. (or --without-pear)" PEAR requires XML to be enabled. Add --enable-xml to the configure line. (or --without-pear)"
fi fi
dnl dnl
dnl if test "$PHP_XMLRPC" = "no"; then dnl if test "$PHP_XMLRPC" = "no"; then
dnl pear_error_msg="$pear_error_msg dnl pear_error_msg="$pear_error_msg
dnl PEAR requires XML-RPC to be enabled. Add --with-xmlrpc to the configure line. (or --without-pear)" dnl PEAR requires XML-RPC to be enabled. Add --with-xmlrpc to the configure line. (or --without-pear)"
dnl fi dnl fi
dnl dnl
@ -1266,7 +1266,7 @@ if test -z "$EXTENSION_DIR"; then
if test "$enable_maintainer_zts" = "yes"; then if test "$enable_maintainer_zts" = "yes"; then
extbasedir=$extbasedir-zts extbasedir=$extbasedir-zts
fi fi
if test "$PHP_DEBUG" = "1"; then if test "$PHP_DEBUG" = "1"; then
extbasedir=$extbasedir-debug extbasedir=$extbasedir-debug
fi fi

2
ext/bz2/config.m4
View file

@ -22,7 +22,7 @@ if test "$PHP_BZ2" != "no"; then
AC_MSG_ERROR(Please reinstall the BZip2 distribution) AC_MSG_ERROR(Please reinstall the BZip2 distribution)
fi fi
PHP_CHECK_LIBRARY(bz2, BZ2_bzerror, PHP_CHECK_LIBRARY(bz2, BZ2_bzerror,
[ [
PHP_ADD_INCLUDE($BZIP_DIR/include) PHP_ADD_INCLUDE($BZIP_DIR/include)
PHP_ADD_LIBRARY_WITH_PATH(bz2, $BZIP_DIR/$PHP_LIBDIR, BZ2_SHARED_LIBADD) PHP_ADD_LIBRARY_WITH_PATH(bz2, $BZIP_DIR/$PHP_LIBDIR, BZ2_SHARED_LIBADD)

16
ext/curl/config.m4
View file

@ -89,17 +89,17 @@ if test "$PHP_CURL" != "no"; then
PHP_EVAL_LIBLINE($CURL_LIBS, CURL_SHARED_LIBADD) PHP_EVAL_LIBLINE($CURL_LIBS, CURL_SHARED_LIBADD)
PHP_EVAL_INCLINE($CURL_INCL, CURL_SHARED_LIBADD) PHP_EVAL_INCLINE($CURL_INCL, CURL_SHARED_LIBADD)
AC_MSG_CHECKING([for SSL support in libcurl]) AC_MSG_CHECKING([for SSL support in libcurl])
if test -n "$CURL_SSL"; then if test -n "$CURL_SSL"; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
AC_DEFINE([HAVE_CURL_SSL], [1], [Have cURL with SSL support]) AC_DEFINE([HAVE_CURL_SSL], [1], [Have cURL with SSL support])
save_CFLAGS="$CFLAGS" save_CFLAGS="$CFLAGS"
CFLAGS=$CURL_INCL CFLAGS=$CURL_INCL
save_LDFLAGS="$LDFLAGS" save_LDFLAGS="$LDFLAGS"
LDFLAGS=$CURL_LIBS LDFLAGS=$CURL_LIBS
AC_PROG_CPP AC_PROG_CPP
AC_MSG_CHECKING([for openssl support in libcurl]) AC_MSG_CHECKING([for openssl support in libcurl])
AC_TRY_RUN([ AC_TRY_RUN([
@ -128,7 +128,7 @@ int main(int argc, char *argv[])
], [ ], [
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
]) ])
AC_MSG_CHECKING([for gnutls support in libcurl]) AC_MSG_CHECKING([for gnutls support in libcurl])
AC_TRY_RUN([ AC_TRY_RUN([
#include <strings.h> #include <strings.h>
@ -137,7 +137,7 @@ int main(int argc, char *argv[])
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
curl_version_info_data *data = curl_version_info(CURLVERSION_NOW); curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
if (data && data->ssl_version && *data->ssl_version) { if (data && data->ssl_version && *data->ssl_version) {
const char *ptr = data->ssl_version; const char *ptr = data->ssl_version;
@ -156,15 +156,15 @@ int main(int argc, char *argv[])
], [ ], [
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
]) ])
CFLAGS="$save_CFLAGS" CFLAGS="$save_CFLAGS"
LDFLAGS="$save_LDFLAGS" LDFLAGS="$save_LDFLAGS"
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi
PHP_CHECK_LIBRARY(curl,curl_easy_perform, PHP_CHECK_LIBRARY(curl,curl_easy_perform,
[ [
AC_DEFINE(HAVE_CURL,1,[ ]) AC_DEFINE(HAVE_CURL,1,[ ])
],[ ],[
AC_MSG_ERROR(There is something wrong. Please check config.log for more information.) AC_MSG_ERROR(There is something wrong. Please check config.log for more information.)

2
ext/date/config0.m4
View file

@ -4,7 +4,7 @@ sinclude(ext/date/lib/timelib.m4)
sinclude(lib/timelib.m4) sinclude(lib/timelib.m4)
PHP_DATE_CFLAGS="-I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1" PHP_DATE_CFLAGS="-I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c
lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c" lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c"
PHP_NEW_EXTENSION(date, php_date.c $timelib_sources, no,, $PHP_DATE_CFLAGS) PHP_NEW_EXTENSION(date, php_date.c $timelib_sources, no,, $PHP_DATE_CFLAGS)

18
ext/dba/config.m4
View file

@ -153,11 +153,11 @@ if test "$PHP_GDBM" != "no"; then
if test -n "$THIS_INCLUDE"; then if test -n "$THIS_INCLUDE"; then
PHP_CHECK_LIBRARY(gdbm, gdbm_open, [ PHP_CHECK_LIBRARY(gdbm, gdbm_open, [
AC_DEFINE_UNQUOTED(GDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) AC_DEFINE_UNQUOTED(GDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
AC_DEFINE(DBA_GDBM, 1, [ ]) AC_DEFINE(DBA_GDBM, 1, [ ])
THIS_LIBS=gdbm THIS_LIBS=gdbm
], [], [-L$THIS_PREFIX/$PHP_LIBDIR]) ], [], [-L$THIS_PREFIX/$PHP_LIBDIR])
fi fi
PHP_DBA_STD_ASSIGN PHP_DBA_STD_ASSIGN
PHP_DBA_STD_CHECK PHP_DBA_STD_CHECK
PHP_DBA_STD_ATTACH PHP_DBA_STD_ATTACH
@ -178,12 +178,12 @@ if test "$PHP_NDBM" != "no"; then
break break
fi fi
done done
if test -n "$THIS_INCLUDE"; then if test -n "$THIS_INCLUDE"; then
for LIB in ndbm db1 c; do for LIB in ndbm db1 c; do
PHP_CHECK_LIBRARY($LIB, dbm_open, [ PHP_CHECK_LIBRARY($LIB, dbm_open, [
AC_DEFINE_UNQUOTED(NDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) AC_DEFINE_UNQUOTED(NDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
AC_DEFINE(DBA_NDBM, 1, [ ]) AC_DEFINE(DBA_NDBM, 1, [ ])
THIS_LIBS=$LIB THIS_LIBS=$LIB
], [], [-L$THIS_PREFIX/$PHP_LIBDIR]) ], [], [-L$THIS_PREFIX/$PHP_LIBDIR])
if test -n "$THIS_LIBS"; then if test -n "$THIS_LIBS"; then
@ -323,7 +323,7 @@ AC_DEFUN([PHP_DBA_DB_CHECK],[
]) ])
fi fi
if test -n "$THIS_LIBS"; then if test -n "$THIS_LIBS"; then
AC_DEFINE(DBA_DB$1, 1, [ ]) AC_DEFINE(DBA_DB$1, 1, [ ])
if test -n "$THIS_INCLUDE"; then if test -n "$THIS_INCLUDE"; then
AC_DEFINE_UNQUOTED(DB$1_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) AC_DEFINE_UNQUOTED(DB$1_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
fi fi
@ -565,7 +565,7 @@ if test "$PHP_DBM" != "no"; then
AC_DEFINE_UNQUOTED(DBM_VERSION, "DBM", [ ]) AC_DEFINE_UNQUOTED(DBM_VERSION, "DBM", [ ])
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
fi fi
AC_DEFINE(DBA_DBM, 1, [ ]) AC_DEFINE(DBA_DBM, 1, [ ])
THIS_LIBS=$LIB THIS_LIBS=$LIB
], [], [-L$THIS_PREFIX/$PHP_LIBDIR]) ], [], [-L$THIS_PREFIX/$PHP_LIBDIR])
if test -n "$THIS_LIBS"; then if test -n "$THIS_LIBS"; then
@ -573,7 +573,7 @@ if test "$PHP_DBM" != "no"; then
fi fi
done done
fi fi
PHP_DBA_STD_ASSIGN PHP_DBA_STD_ASSIGN
PHP_DBA_STD_CHECK PHP_DBA_STD_CHECK
PHP_DBA_STD_ATTACH PHP_DBA_STD_ATTACH
@ -619,7 +619,7 @@ elif test "$PHP_CDB" != "no"; then
for LIB in cdb c; do for LIB in cdb c; do
PHP_CHECK_LIBRARY($LIB, cdb_read, [ PHP_CHECK_LIBRARY($LIB, cdb_read, [
AC_DEFINE_UNQUOTED(CDB_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) AC_DEFINE_UNQUOTED(CDB_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
AC_DEFINE(DBA_CDB, 1, [ ]) AC_DEFINE(DBA_CDB, 1, [ ])
THIS_LIBS=$LIB THIS_LIBS=$LIB
], [], [-L$THIS_PREFIX/$PHP_LIBDIR]) ], [], [-L$THIS_PREFIX/$PHP_LIBDIR])
if test -n "$THIS_LIBS"; then if test -n "$THIS_LIBS"; then
@ -652,7 +652,7 @@ PHP_DBA_STD_RESULT(FlatFile, FlatFile)
dnl dnl
dnl Extension setup dnl Extension setup
dnl dnl
AC_MSG_CHECKING([whether to enable DBA interface]) AC_MSG_CHECKING([whether to enable DBA interface])
if test "$HAVE_DBA" = "1"; then if test "$HAVE_DBA" = "1"; then
if test "$ext_shared" = "yes"; then if test "$ext_shared" = "yes"; then

4
ext/dom/config.m4
View file

@ -10,7 +10,7 @@ fi
if test "$PHP_DOM" != "no"; then if test "$PHP_DOM" != "no"; then
if test "$PHP_LIBXML" = "no"; then if test "$PHP_LIBXML" = "no"; then
AC_MSG_ERROR([DOM extension requires LIBXML extension, add --enable-libxml]) AC_MSG_ERROR([DOM extension requires LIBXML extension, add --enable-libxml])
fi fi
@ -25,7 +25,7 @@ if test "$PHP_DOM" != "no"; then
nodelist.c text.c comment.c domconfiguration.c \ nodelist.c text.c comment.c domconfiguration.c \
domimplementationsource.c entityreference.c \ domimplementationsource.c entityreference.c \
notation.c xpath.c dom_iterators.c \ notation.c xpath.c dom_iterators.c \
typeinfo.c domerror.c domlocator.c namednodemap.c userdatahandler.c], typeinfo.c domerror.c domlocator.c namednodemap.c userdatahandler.c],
$ext_shared) $ext_shared)
PHP_SUBST(DOM_SHARED_LIBADD) PHP_SUBST(DOM_SHARED_LIBADD)
PHP_INSTALL_HEADERS([ext/dom/xml_common.h]) PHP_INSTALL_HEADERS([ext/dom/xml_common.h])

2
ext/gd/config.m4
View file

@ -345,7 +345,7 @@ dnl
if test "$PHP_GD" != "no"; then if test "$PHP_GD" != "no"; then
PHP_NEW_EXTENSION(gd, gd.c $extra_sources, $ext_shared,, \\$(GDLIB_CFLAGS)) PHP_NEW_EXTENSION(gd, gd.c $extra_sources, $ext_shared,, \\$(GDLIB_CFLAGS))
if test "$GD_MODULE_TYPE" = "builtin"; then if test "$GD_MODULE_TYPE" = "builtin"; then
PHP_ADD_BUILD_DIR($ext_builddir/libgd) PHP_ADD_BUILD_DIR($ext_builddir/libgd)
GDLIB_CFLAGS="-I$ext_srcdir/libgd $GDLIB_CFLAGS" GDLIB_CFLAGS="-I$ext_srcdir/libgd $GDLIB_CFLAGS"
GD_HEADER_DIRS="ext/gd/ ext/gd/libgd/" GD_HEADER_DIRS="ext/gd/ ext/gd/libgd/"

4
ext/gettext/config.m4
View file

@ -14,7 +14,7 @@ if test "$PHP_GETTEXT" != "no"; then
GETTEXT_LIBDIR=$GETTEXT_DIR/$PHP_LIBDIR GETTEXT_LIBDIR=$GETTEXT_DIR/$PHP_LIBDIR
GETTEXT_INCDIR=$GETTEXT_DIR/include GETTEXT_INCDIR=$GETTEXT_DIR/include
O_LDFLAGS=$LDFLAGS O_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -L$GETTEXT_LIBDIR" LDFLAGS="$LDFLAGS -L$GETTEXT_LIBDIR"
AC_CHECK_LIB(intl, bindtextdomain, [ AC_CHECK_LIB(intl, bindtextdomain, [
@ -44,5 +44,5 @@ if test "$PHP_GETTEXT" != "no"; then
AC_CHECK_LIB($GETTEXT_CHECK_IN_LIB, dcngettext, [AC_DEFINE(HAVE_DCNGETTEXT, 1, [ ])]) AC_CHECK_LIB($GETTEXT_CHECK_IN_LIB, dcngettext, [AC_DEFINE(HAVE_DCNGETTEXT, 1, [ ])])
AC_CHECK_LIB($GETTEXT_CHECK_IN_LIB, bind_textdomain_codeset, [AC_DEFINE(HAVE_BIND_TEXTDOMAIN_CODESET, 1, [ ])]) AC_CHECK_LIB($GETTEXT_CHECK_IN_LIB, bind_textdomain_codeset, [AC_DEFINE(HAVE_BIND_TEXTDOMAIN_CODESET, 1, [ ])])
LDFLAGS=$O_LDFLAGS LDFLAGS=$O_LDFLAGS
fi fi

2
ext/gmp/config.m4
View file

@ -13,7 +13,7 @@ if test "$PHP_GMP" != "no"; then
if test -z "$GMP_DIR"; then if test -z "$GMP_DIR"; then
AC_MSG_ERROR(Unable to locate gmp.h) AC_MSG_ERROR(Unable to locate gmp.h)
fi fi
PHP_CHECK_LIBRARY(gmp, __gmpz_rootrem, PHP_CHECK_LIBRARY(gmp, __gmpz_rootrem,
[],[ [],[
AC_MSG_ERROR([GNU MP Library version 4.2 or greater required.]) AC_MSG_ERROR([GNU MP Library version 4.2 or greater required.])

26
ext/imap/config.m4
View file

@ -5,10 +5,10 @@ AC_DEFUN([IMAP_INC_CHK],[if test -r "$i$1/c-client.h"; then
IMAP_DIR=$i IMAP_DIR=$i
IMAP_INC_DIR=$i$1 IMAP_INC_DIR=$i$1
break break
elif test -r "$i$1/rfc822.h"; then elif test -r "$i$1/rfc822.h"; then
IMAP_DIR=$i; IMAP_DIR=$i;
IMAP_INC_DIR=$i$1 IMAP_INC_DIR=$i$1
break break
]) ])
AC_DEFUN([IMAP_LIB_CHK],[ AC_DEFUN([IMAP_LIB_CHK],[
@ -52,14 +52,14 @@ AC_DEFUN([PHP_IMAP_KRB_CHK], [
[ [
AC_DEFINE(HAVE_IMAP_KRB,1,[ ]) AC_DEFINE(HAVE_IMAP_KRB,1,[ ])
], [ ], [
AC_MSG_ERROR([Kerberos libraries not found. AC_MSG_ERROR([Kerberos libraries not found.
Check the path given to --with-kerberos (if no path is given, searches in /usr/kerberos, /usr/local and /usr ) Check the path given to --with-kerberos (if no path is given, searches in /usr/kerberos, /usr/local and /usr )
]) ])
]) ])
else else
AC_EGREP_HEADER(auth_gss, $IMAP_INC_DIR/linkage.h, [ AC_EGREP_HEADER(auth_gss, $IMAP_INC_DIR/linkage.h, [
AC_MSG_ERROR([This c-client library is built with Kerberos support. AC_MSG_ERROR([This c-client library is built with Kerberos support.
Add --with-kerberos to your configure line. Check config.log for details. Add --with-kerberos to your configure line. Check config.log for details.
]) ])
@ -76,14 +76,14 @@ AC_DEFUN([PHP_IMAP_SSL_CHK], [
[ [
AC_DEFINE(HAVE_IMAP_SSL,1,[ ]) AC_DEFINE(HAVE_IMAP_SSL,1,[ ])
], [ ], [
AC_MSG_ERROR([OpenSSL libraries not found. AC_MSG_ERROR([OpenSSL libraries not found.
Check the path given to --with-openssl-dir and output in config.log) Check the path given to --with-openssl-dir and output in config.log)
]) ])
]) ])
elif test -f "$IMAP_INC_DIR/linkage.c"; then elif test -f "$IMAP_INC_DIR/linkage.c"; then
AC_EGREP_HEADER(ssl_onceonlyinit, $IMAP_INC_DIR/linkage.c, [ AC_EGREP_HEADER(ssl_onceonlyinit, $IMAP_INC_DIR/linkage.c, [
AC_MSG_ERROR([This c-client library is built with SSL support. AC_MSG_ERROR([This c-client library is built with SSL support.
Add --with-imap-ssl to your configure line. Check config.log for details. Add --with-imap-ssl to your configure line. Check config.log for details.
]) ])
@ -102,7 +102,7 @@ PHP_ARG_WITH(imap-ssl,for IMAP SSL support,
[ --with-imap-ssl[=DIR] IMAP: Include SSL support. DIR is the OpenSSL install prefix], no, no) [ --with-imap-ssl[=DIR] IMAP: Include SSL support. DIR is the OpenSSL install prefix], no, no)
if test "$PHP_IMAP" != "no"; then if test "$PHP_IMAP" != "no"; then
PHP_SUBST(IMAP_SHARED_LIBADD) PHP_SUBST(IMAP_SHARED_LIBADD)
PHP_NEW_EXTENSION(imap, php_imap.c, $ext_shared) PHP_NEW_EXTENSION(imap, php_imap.c, $ext_shared)
AC_DEFINE(HAVE_IMAP,1,[ ]) AC_DEFINE(HAVE_IMAP,1,[ ])
@ -178,18 +178,18 @@ if test "$PHP_IMAP" != "no"; then
],[]) ],[])
CPPFLAGS=$old_CPPFLAGS CPPFLAGS=$old_CPPFLAGS
PHP_CHECK_LIBRARY(pam, pam_start, PHP_CHECK_LIBRARY(pam, pam_start,
[ [
PHP_ADD_LIBRARY(pam,, IMAP_SHARED_LIBADD) PHP_ADD_LIBRARY(pam,, IMAP_SHARED_LIBADD)
AC_DEFINE(HAVE_LIBPAM,1,[ ]) AC_DEFINE(HAVE_LIBPAM,1,[ ])
]) ])
PHP_CHECK_LIBRARY(crypt, crypt, PHP_CHECK_LIBRARY(crypt, crypt,
[ [
PHP_ADD_LIBRARY(crypt,, IMAP_SHARED_LIBADD) PHP_ADD_LIBRARY(crypt,, IMAP_SHARED_LIBADD)
AC_DEFINE(HAVE_LIBCRYPT,1,[ ]) AC_DEFINE(HAVE_LIBCRYPT,1,[ ])
]) ])
PHP_EXPAND_PATH($IMAP_DIR, IMAP_DIR) PHP_EXPAND_PATH($IMAP_DIR, IMAP_DIR)
if test -z "$IMAP_DIR"; then if test -z "$IMAP_DIR"; then

2
ext/interbase/config.m4
View file

@ -46,7 +46,7 @@ if test "$PHP_INTERBASE" != "no"; then
], [ ], [
-L$IBASE_LIBDIR -L$IBASE_LIBDIR
]) ])
PHP_ADD_LIBRARY_WITH_PATH($IBASE_LIBNAME, $IBASE_LIBDIR, INTERBASE_SHARED_LIBADD) PHP_ADD_LIBRARY_WITH_PATH($IBASE_LIBNAME, $IBASE_LIBDIR, INTERBASE_SHARED_LIBADD)
PHP_ADD_INCLUDE($IBASE_INCDIR) PHP_ADD_INCLUDE($IBASE_INCDIR)
fi fi

6
ext/mysqli/config.m4
View file

@ -29,11 +29,11 @@ AC_DEFUN([PHP_MYSQL_SOCKET_SEARCH], [
PHP_ARG_WITH(mysqli, for MySQLi support, PHP_ARG_WITH(mysqli, for MySQLi support,
[ --with-mysqli[=FILE] Include MySQLi support. FILE is the path [ --with-mysqli[=FILE] Include MySQLi support. FILE is the path
to mysql_config. If no value or mysqlnd is passed to mysql_config. If no value or mysqlnd is passed
as FILE, the MySQL native driver will be used]) as FILE, the MySQL native driver will be used])
PHP_ARG_ENABLE(embedded_mysqli, whether to enable embedded MySQLi support, PHP_ARG_ENABLE(embedded_mysqli, whether to enable embedded MySQLi support,
[ --enable-embedded-mysqli [ --enable-embedded-mysqli
MYSQLi: Enable embedded support MYSQLi: Enable embedded support
Note: Does not work with MySQL native driver!], no, no) Note: Does not work with MySQL native driver!], no, no)
@ -63,7 +63,7 @@ elif test "$PHP_MYSQLI" != "no"; then
else else
MYSQL_LIB_CFG='--libs' MYSQL_LIB_CFG='--libs'
fi fi
if test -x "$MYSQL_CONFIG" && $MYSQL_CONFIG $MYSQL_LIB_CFG > /dev/null 2>&1; then if test -x "$MYSQL_CONFIG" && $MYSQL_CONFIG $MYSQL_LIB_CFG > /dev/null 2>&1; then
MYSQLI_INCLINE=`$MYSQL_CONFIG --cflags | $SED -e "s/'//g"` MYSQLI_INCLINE=`$MYSQL_CONFIG --cflags | $SED -e "s/'//g"`
MYSQLI_LIBLINE=`$MYSQL_CONFIG $MYSQL_LIB_CFG | $SED -e "s/'//g"` MYSQLI_LIBLINE=`$MYSQL_CONFIG $MYSQL_LIB_CFG | $SED -e "s/'//g"`

14
ext/oci8/config.m4
View file

@ -66,8 +66,8 @@ AC_DEFUN([AC_OCI8_ORACLE_VERSION],[
OCI8_ORACLE_VERSION=8.1 OCI8_ORACLE_VERSION=8.1
elif test -f $OCI8_LCS_BASE.1.0; then elif test -f $OCI8_LCS_BASE.1.0; then
OCI8_ORACLE_VERSION=8.0 OCI8_ORACLE_VERSION=8.0
elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.a; then elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.a; then
if test -f $OCI8_DIR/$OCI8_LIB_DIR/libcore4.a; then if test -f $OCI8_DIR/$OCI8_LIB_DIR/libcore4.a; then
OCI8_ORACLE_VERSION=8.0 OCI8_ORACLE_VERSION=8.0
else else
OCI8_ORACLE_VERSION=8.1 OCI8_ORACLE_VERSION=8.1
@ -86,7 +86,7 @@ dnl support DTrace for extensions. Creating OCI8_INIT_DTRACE
dnl independently instead of using a refactored PHP_INIT_DTRACE allows dnl independently instead of using a refactored PHP_INIT_DTRACE allows
dnl OCI8 to be DTraced on versions of PHP where core PHP DTrace support dnl OCI8 to be DTraced on versions of PHP where core PHP DTrace support
dnl isn't available. dnl isn't available.
dnl dnl
AC_DEFUN([OCI8_INIT_DTRACE],[ AC_DEFUN([OCI8_INIT_DTRACE],[
ac_srcdir=[]PHP_EXT_SRCDIR([oci8])/ ac_srcdir=[]PHP_EXT_SRCDIR([oci8])/
ac_bdir=[]PHP_EXT_BUILDDIR([oci8])/ ac_bdir=[]PHP_EXT_BUILDDIR([oci8])/
@ -173,7 +173,7 @@ PHP_ARG_WITH(oci8, for Oracle Database OCI8 support,
Use --with-oci8=instantclient,/path/to/instant/client/lib Use --with-oci8=instantclient,/path/to/instant/client/lib
to use an Oracle Instant Client installation]) to use an Oracle Instant Client installation])
if test "$PHP_OCI8" != "no"; then if test "$PHP_OCI8" != "no"; then
if test -z "$PHP_OCI8"; then if test -z "$PHP_OCI8"; then
dnl --with-oci8=$ORACLE_HOME where ORACLE_HOME isn't set (or is mistyped) will match this case dnl --with-oci8=$ORACLE_HOME where ORACLE_HOME isn't set (or is mistyped) will match this case
@ -211,12 +211,12 @@ if test "$PHP_OCI8" != "no"; then
fi fi
dnl Check whether --enable-dtrace was set. dnl Check whether --enable-dtrace was set.
dnl To use DTrace with a PECL install, extract the OCI8 archive, phpize it, and set dnl To use DTrace with a PECL install, extract the OCI8 archive, phpize it, and set
dnl PHP_DTRACE=yes before running configure dnl PHP_DTRACE=yes before running configure
AC_MSG_CHECKING([OCI8 DTrace support]) AC_MSG_CHECKING([OCI8 DTrace support])
oci8_do_dtrace="`echo $PHP_OCI8 | cut -d, -f3`" oci8_do_dtrace="`echo $PHP_OCI8 | cut -d, -f3`"
if test "$PHP_DTRACE" = "yes" -o "$oci8_do_dtrace" = "dtrace" ; then if test "$PHP_DTRACE" = "yes" -o "$oci8_do_dtrace" = "dtrace" ; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
if test "$ext_shared" = "no"; then if test "$ext_shared" = "no"; then
AC_MSG_ERROR([For DTrace support OCI8 must be configured as a shared extension]) AC_MSG_ERROR([For DTrace support OCI8 must be configured as a shared extension])
else else
@ -242,7 +242,7 @@ if test "$PHP_OCI8" != "no"; then
AC_MSG_CHECKING([checking if we're on a 64-bit platform]) AC_MSG_CHECKING([checking if we're on a 64-bit platform])
if test "$ac_cv_sizeof_long_int" = "4"; then if test "$ac_cv_sizeof_long_int" = "4"; then
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
PHP_OCI8_OH_LIBDIR=lib32 PHP_OCI8_OH_LIBDIR=lib32
PHP_OCI8_IC_LIBDIR_SUFFIX="" PHP_OCI8_IC_LIBDIR_SUFFIX=""
else else
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])

18
ext/odbc/config.m4
View file

@ -10,28 +10,28 @@ dnl
dnl Figure out which library file to link with for the Solid support. dnl Figure out which library file to link with for the Solid support.
dnl dnl
AC_DEFUN([PHP_ODBC_FIND_SOLID_LIBS],[ AC_DEFUN([PHP_ODBC_FIND_SOLID_LIBS],[
AC_MSG_CHECKING([Solid library file]) AC_MSG_CHECKING([Solid library file])
ac_solid_uname_r=`uname -r 2>/dev/null` ac_solid_uname_r=`uname -r 2>/dev/null`
ac_solid_uname_s=`uname -s 2>/dev/null` ac_solid_uname_s=`uname -s 2>/dev/null`
case $ac_solid_uname_s in case $ac_solid_uname_s in
AIX) ac_solid_os=a3x;; # a4x for AIX4/ Solid 2.3/3.0 only AIX) ac_solid_os=a3x;; # a4x for AIX4/ Solid 2.3/3.0 only
HP-UX) ac_solid_os=h9x;; # h1x for hpux11, h0x for hpux10 HP-UX) ac_solid_os=h9x;; # h1x for hpux11, h0x for hpux10
IRIX) ac_solid_os=irx;; # Solid 2.3(?)/ 3.0 only IRIX) ac_solid_os=irx;; # Solid 2.3(?)/ 3.0 only
Linux) Linux)
if ldd -v /bin/sh | grep GLIBC > /dev/null; then if ldd -v /bin/sh | grep GLIBC > /dev/null; then
AC_DEFINE(SS_LINUX,1,[Needed in sqlunix.h ]) AC_DEFINE(SS_LINUX,1,[Needed in sqlunix.h ])
ac_solid_os=l2x ac_solid_os=l2x
else else
AC_DEFINE(SS_LINUX,1,[Needed in sqlunix.h ]) AC_DEFINE(SS_LINUX,1,[Needed in sqlunix.h ])
ac_solid_os=lux ac_solid_os=lux
fi;; fi;;
SunOS) SunOS)
ac_solid_os=ssx;; # should we deal with SunOS 4? ac_solid_os=ssx;; # should we deal with SunOS 4?
FreeBSD) FreeBSD)
if test `expr $ac_solid_uname_r : '\(.\)'` -gt "2"; then if test `expr $ac_solid_uname_r : '\(.\)'` -gt "2"; then
AC_DEFINE(SS_FBX,1,[Needed in sqlunix.h for wchar defs ]) AC_DEFINE(SS_FBX,1,[Needed in sqlunix.h for wchar defs ])
ac_solid_os=fex ac_solid_os=fex
else else
AC_DEFINE(SS_FBX,1,[Needed in sqlunix.h for wchar defs ]) AC_DEFINE(SS_FBX,1,[Needed in sqlunix.h for wchar defs ])
ac_solid_os=fbx ac_solid_os=fbx
fi;; fi;;
@ -287,7 +287,7 @@ if test -z "$ODBC_TYPE"; then
PHP_ARG_WITH(custom-odbc,, PHP_ARG_WITH(custom-odbc,,
[ --with-custom-odbc[=DIR] Include user defined ODBC support. DIR is ODBC install base [ --with-custom-odbc[=DIR] Include user defined ODBC support. DIR is ODBC install base
directory [/usr/local]. Make sure to define CUSTOM_ODBC_LIBS and directory [/usr/local]. Make sure to define CUSTOM_ODBC_LIBS and
have some odbc.h in your include dirs. f.e. you should define have some odbc.h in your include dirs. f.e. you should define
following for Sybase SQL Anywhere 5.5.00 on QNX, prior to following for Sybase SQL Anywhere 5.5.00 on QNX, prior to
running this configure script: running this configure script:
CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\" CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\"
@ -320,7 +320,7 @@ PHP_ARG_WITH(iodbc,,
if test "$PHP_IODBC" != "no"; then if test "$PHP_IODBC" != "no"; then
if test -z "$PKG_CONFIG"; then if test -z "$PKG_CONFIG"; then
AC_PATH_PROG(PKG_CONFIG, pkg-config, no) AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
fi fi
if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libiodbc ; then if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libiodbc ; then
PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR) PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
ODBC_TYPE=iodbc ODBC_TYPE=iodbc
@ -466,7 +466,7 @@ if test -n "$ODBC_TYPE"; then
AC_DEFINE(HAVE_SQLDATASOURCES,1,[ ]) AC_DEFINE(HAVE_SQLDATASOURCES,1,[ ])
fi fi
fi fi
AC_DEFINE(HAVE_UODBC,1,[ ]) AC_DEFINE(HAVE_UODBC,1,[ ])
PHP_SUBST(ODBC_SHARED_LIBADD) PHP_SUBST(ODBC_SHARED_LIBADD)
PHP_SUBST(ODBC_INCDIR) PHP_SUBST(ODBC_INCDIR)

10
ext/opcache/config.m4
View file

@ -346,12 +346,12 @@ AC_MSG_CHECKING("whether flock struct is linux ordered")
AC_TRY_RUN([ AC_TRY_RUN([
#include <fcntl.h> #include <fcntl.h>
struct flock lock = { 1, 2, 3, 4, 5 }; struct flock lock = { 1, 2, 3, 4, 5 };
int main() { int main() {
if(lock.l_type == 1 && lock.l_whence == 2 && lock.l_start == 3 && lock.l_len == 4) { if(lock.l_type == 1 && lock.l_whence == 2 && lock.l_start == 3 && lock.l_len == 4) {
return 0; return 0;
} }
return 1; return 1;
} }
], [ ], [
flock_type=linux flock_type=linux
AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type])
@ -362,15 +362,15 @@ AC_MSG_CHECKING("whether flock struct is BSD ordered")
AC_TRY_RUN([ AC_TRY_RUN([
#include <fcntl.h> #include <fcntl.h>
struct flock lock = { 1, 2, 3, 4, 5 }; struct flock lock = { 1, 2, 3, 4, 5 };
int main() { int main() {
if(lock.l_start == 1 && lock.l_len == 2 && lock.l_type == 4 && lock.l_whence == 5) { if(lock.l_start == 1 && lock.l_len == 2 && lock.l_type == 4 && lock.l_whence == 5) {
return 0; return 0;
} }
return 1; return 1;
} }
], [ ], [
flock_type=bsd flock_type=bsd
AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type]) AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type])
AC_MSG_RESULT("yes") AC_MSG_RESULT("yes")
], AC_MSG_RESULT("no") ) ], AC_MSG_RESULT("no") )

2
ext/openssl/config0.m4
View file

@ -19,7 +19,7 @@ if test "$PHP_OPENSSL" != "no"; then
AC_CHECK_FUNCS([RAND_egd]) AC_CHECK_FUNCS([RAND_egd])
PHP_SETUP_OPENSSL(OPENSSL_SHARED_LIBADD, PHP_SETUP_OPENSSL(OPENSSL_SHARED_LIBADD,
[ [
AC_DEFINE(HAVE_OPENSSL_EXT,1,[ ]) AC_DEFINE(HAVE_OPENSSL_EXT,1,[ ])
], [ ], [

2
ext/pcre/config0.m4
View file

@ -54,7 +54,7 @@ PHP_ARG_WITH(pcre-jit,,[ --with-pcre-jit Enable PCRE JIT functionality
],[ ],[
$PCRE2_LIB $PCRE2_LIB
]) ])
PHP_EVAL_INCLINE($PCRE2_INC) PHP_EVAL_INCLINE($PCRE2_INC)
PHP_EVAL_LIBLINE($PCRE2_LIB) PHP_EVAL_LIBLINE($PCRE2_LIB)
AC_DEFINE(HAVE_PCRE, 1, [ ]) AC_DEFINE(HAVE_PCRE, 1, [ ])

2
ext/pdo/config.m4
View file

@ -41,7 +41,7 @@ if test "$PHP_PDO" != "no"; then
[ [
PHP_ADD_EXTENSION_DEP(pdo, spl, true) PHP_ADD_EXTENSION_DEP(pdo, spl, true)
]) ])
ifdef([PHP_INSTALL_HEADERS], ifdef([PHP_INSTALL_HEADERS],
[ [
dnl Sadly, this is a complete NOP for pecl extensions dnl Sadly, this is a complete NOP for pecl extensions

2
ext/pdo_dblib/config.m4
View file

@ -38,7 +38,7 @@ if test "$PHP_PDO_DBLIB" != "no"; then
else else
AC_MSG_ERROR(Directory $PHP_PDO_DBLIB is not a FreeTDS installation directory) AC_MSG_ERROR(Directory $PHP_PDO_DBLIB is not a FreeTDS installation directory)
fi fi
fi fi
if test "x$PHP_LIBDIR" = "x" ; then if test "x$PHP_LIBDIR" = "x" ; then
PHP_LIBDIR=lib PHP_LIBDIR=lib

2
ext/pdo_firebird/config.m4
View file

@ -55,7 +55,7 @@ if test "$PHP_PDO_FIREBIRD" != "no"; then
PHP_ADD_LIBRARY_WITH_PATH($FIREBIRD_LIBNAME, $FIREBIRD_LIBDIR, PDO_FIREBIRD_SHARED_LIBADD) PHP_ADD_LIBRARY_WITH_PATH($FIREBIRD_LIBNAME, $FIREBIRD_LIBDIR, PDO_FIREBIRD_SHARED_LIBADD)
PHP_ADD_INCLUDE($FIREBIRD_INCDIR) PHP_ADD_INCLUDE($FIREBIRD_INCDIR)
fi fi
PHP_CHECK_PDO_INCLUDES PHP_CHECK_PDO_INCLUDES
AC_DEFINE(HAVE_PDO_FIREBIRD,1,[ ]) AC_DEFINE(HAVE_PDO_FIREBIRD,1,[ ])

8
ext/pdo_mysql/config.m4
View file

@ -52,7 +52,7 @@ if test "$PHP_PDO_MYSQL" != "no"; then
fi fi
fi fi
fi fi
if test "$PHP_PDO_MYSQL" = "yes" || test "$PHP_PDO_MYSQL" = "mysqlnd"; then if test "$PHP_PDO_MYSQL" = "yes" || test "$PHP_PDO_MYSQL" = "mysqlnd"; then
dnl enables build of mysqnd library dnl enables build of mysqnd library
PHP_MYSQLND_ENABLED=yes PHP_MYSQLND_ENABLED=yes
@ -112,8 +112,8 @@ if test "$PHP_PDO_MYSQL" != "no"; then
PHP_CHECK_LIBRARY($PDO_MYSQL_LIBNAME, mysql_commit, [], [ PHP_CHECK_LIBRARY($PDO_MYSQL_LIBNAME, mysql_commit, [], [
AC_MSG_ERROR([PDO_MYSQL configure failed, MySQL 4.1 needed. Please check config.log for more information.]) AC_MSG_ERROR([PDO_MYSQL configure failed, MySQL 4.1 needed. Please check config.log for more information.])
], [ ], [
-L$PHP_ZLIB_DIR/$PHP_LIBDIR -L$PDO_MYSQL_LIB_DIR -L$PHP_ZLIB_DIR/$PHP_LIBDIR -L$PDO_MYSQL_LIB_DIR
]) ])
PDO_MYSQL_LIBS="$PDO_MYSQL_LIBS -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz" PDO_MYSQL_LIBS="$PDO_MYSQL_LIBS -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz"
else else
PHP_ADD_LIBRARY(z,, PDO_MYSQL_SHARED_LIBADD) PHP_ADD_LIBRARY(z,, PDO_MYSQL_SHARED_LIBADD)
@ -121,7 +121,7 @@ if test "$PHP_PDO_MYSQL" != "no"; then
AC_MSG_ERROR([Try adding --with-zlib-dir=<DIR>. Please check config.log for more information.]) AC_MSG_ERROR([Try adding --with-zlib-dir=<DIR>. Please check config.log for more information.])
], [ ], [
-L$PDO_MYSQL_LIB_DIR -L$PDO_MYSQL_LIB_DIR
]) ])
PDO_MYSQL_LIBS="$PDO_MYSQL_LIBS -lz" PDO_MYSQL_LIBS="$PDO_MYSQL_LIBS -lz"
fi fi

8
ext/pdo_oci/config.m4
View file

@ -56,7 +56,7 @@ AC_DEFUN([AC_PDO_OCI_CHECK_LIB_DIR],[
PHP_ARG_WITH(pdo-oci, Oracle OCI support for PDO, PHP_ARG_WITH(pdo-oci, Oracle OCI support for PDO,
[ --with-pdo-oci[=DIR] PDO: Oracle OCI support. DIR defaults to [$]ORACLE_HOME. [ --with-pdo-oci[=DIR] PDO: Oracle OCI support. DIR defaults to [$]ORACLE_HOME.
Use --with-pdo-oci=instantclient,/path/to/instant/client/lib Use --with-pdo-oci=instantclient,/path/to/instant/client/lib
for an Oracle Instant Client installation.]) for an Oracle Instant Client installation.])
if test "$PHP_PDO_OCI" != "no"; then if test "$PHP_PDO_OCI" != "no"; then
@ -96,11 +96,11 @@ if test "$PHP_PDO_OCI" != "no"; then
dnl Header directory for manual installation dnl Header directory for manual installation
OCISDKMANINC=`echo "$PDO_OCI_LIB_DIR" | $PHP_PDO_OCI_SED -e 's!^\(.*\)/lib[/]*$!\1/include!'` OCISDKMANINC=`echo "$PDO_OCI_LIB_DIR" | $PHP_PDO_OCI_SED -e 's!^\(.*\)/lib[/]*$!\1/include!'`
dnl Header directory for Instant Client SDK zip file install dnl Header directory for Instant Client SDK zip file install
OCISDKZIPINC=$PDO_OCI_LIB_DIR/sdk/include OCISDKZIPINC=$PDO_OCI_LIB_DIR/sdk/include
if test -f "$OCISDKRPMINC/oci.h" ; then if test -f "$OCISDKRPMINC/oci.h" ; then
PHP_ADD_INCLUDE($OCISDKRPMINC) PHP_ADD_INCLUDE($OCISDKRPMINC)
AC_MSG_RESULT($OCISDKRPMINC) AC_MSG_RESULT($OCISDKRPMINC)
@ -169,7 +169,7 @@ if test "$PHP_PDO_OCI" != "no"; then
]) ])
dnl dnl
dnl Check if we need to add -locijdbc8 dnl Check if we need to add -locijdbc8
dnl dnl
PHP_CHECK_LIBRARY(clntsh, OCILobIsTemporary, PHP_CHECK_LIBRARY(clntsh, OCILobIsTemporary,
[ [

10
ext/pdo_odbc/config.m4
View file

@ -5,13 +5,13 @@ define([PDO_ODBC_HELP_TEXT],[[
include and lib dirs are looked for under 'dir'. include and lib dirs are looked for under 'dir'.
'flavour' can be one of: ibm-db2, iODBC, unixODBC, generic 'flavour' can be one of: ibm-db2, iODBC, unixODBC, generic
If ',dir' part is omitted, default for the flavour If ',dir' part is omitted, default for the flavour
you have selected will be used. e.g.: you have selected will be used. e.g.:
--with-pdo-odbc=unixODBC --with-pdo-odbc=unixODBC
will check for unixODBC under /usr/local. You may attempt will check for unixODBC under /usr/local. You may attempt
to use an otherwise unsupported driver using the \"generic\" to use an otherwise unsupported driver using the \"generic\"
flavour. The syntax for generic ODBC support is: flavour. The syntax for generic ODBC support is:
--with-pdo-odbc=generic,dir,libname,ldflags,cflags --with-pdo-odbc=generic,dir,libname,ldflags,cflags
@ -33,7 +33,7 @@ AC_DEFUN([PDO_ODBC_CHECK_HEADER],[
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
fi fi
]) ])
if test "$PHP_PDO_ODBC" != "no"; then if test "$PHP_PDO_ODBC" != "no"; then
if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
@ -110,7 +110,7 @@ if test "$PHP_PDO_ODBC" != "no"; then
PDO_ODBC_INCDIR="$pdo_odbc_def_incdir" PDO_ODBC_INCDIR="$pdo_odbc_def_incdir"
PDO_ODBC_LIBDIR="$pdo_odbc_def_libdir" PDO_ODBC_LIBDIR="$pdo_odbc_def_libdir"
fi fi
AC_MSG_RESULT([$pdo_odbc_flavour AC_MSG_RESULT([$pdo_odbc_flavour
libs $PDO_ODBC_LIBDIR, libs $PDO_ODBC_LIBDIR,
headers $PDO_ODBC_INCDIR]) headers $PDO_ODBC_INCDIR])

4
ext/pgsql/config.m4
View file

@ -29,7 +29,7 @@ if test "$PHP_PGSQL" != "no"; then
else else
PGSQL_SEARCH_PATHS=$PHP_PGSQL PGSQL_SEARCH_PATHS=$PHP_PGSQL
fi fi
for i in $PGSQL_SEARCH_PATHS; do for i in $PGSQL_SEARCH_PATHS; do
for j in include include/pgsql include/postgres include/postgresql ""; do for j in include include/pgsql include/postgres include/postgresql ""; do
if test -r "$i/$j/libpq-fe.h"; then if test -r "$i/$j/libpq-fe.h"; then
@ -42,7 +42,7 @@ if test "$PHP_PGSQL" != "no"; then
done done
for j in lib $PHP_LIBDIR/pgsql $PHP_LIBDIR/postgres $PHP_LIBDIR/postgresql ""; do for j in lib $PHP_LIBDIR/pgsql $PHP_LIBDIR/postgres $PHP_LIBDIR/postgresql ""; do
if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then
PGSQL_LIBDIR=$i/$j PGSQL_LIBDIR=$i/$j
fi fi
done done

6
ext/readline/config.m4
View file

@ -1,6 +1,6 @@
dnl config.m4 for extension readline dnl config.m4 for extension readline
PHP_ARG_WITH(libedit,for libedit readline replacement, PHP_ARG_WITH(libedit,for libedit readline replacement,
[ --with-libedit[=DIR] Include libedit readline replacement (CLI/CGI only)]) [ --with-libedit[=DIR] Include libedit readline replacement (CLI/CGI only)])
if test "$PHP_LIBEDIT" = "no"; then if test "$PHP_LIBEDIT" = "no"; then
@ -91,11 +91,11 @@ elif test "$PHP_LIBEDIT" != "no"; then
PHP_CHECK_LIBRARY(edit, readline, PHP_CHECK_LIBRARY(edit, readline,
[ [
PHP_ADD_LIBRARY_WITH_PATH(edit, $LIBEDIT_DIR/$PHP_LIBDIR, READLINE_SHARED_LIBADD) PHP_ADD_LIBRARY_WITH_PATH(edit, $LIBEDIT_DIR/$PHP_LIBDIR, READLINE_SHARED_LIBADD)
], [ ], [
AC_MSG_ERROR(edit library required by readline not found) AC_MSG_ERROR(edit library required by readline not found)
], [ ], [
-L$READLINE_DIR/$PHP_LIBDIR -L$READLINE_DIR/$PHP_LIBDIR
]) ])
PHP_CHECK_LIBRARY(edit, rl_callback_read_char, PHP_CHECK_LIBRARY(edit, rl_callback_read_char,

2
ext/shmop/config.m4
View file

@ -1,6 +1,6 @@
dnl config.m4 for extension shmop dnl config.m4 for extension shmop
PHP_ARG_ENABLE(shmop, whether to enable shmop support, PHP_ARG_ENABLE(shmop, whether to enable shmop support,
[ --enable-shmop Enable shmop support]) [ --enable-shmop Enable shmop support])
if test "$PHP_SHMOP" != "no"; then if test "$PHP_SHMOP" != "no"; then

4
ext/simplexml/config.m4
View file

@ -10,8 +10,8 @@ fi
if test "$PHP_SIMPLEXML" != "no"; then if test "$PHP_SIMPLEXML" != "no"; then
if test "$PHP_LIBXML" = "no"; then if test "$PHP_LIBXML" = "no"; then
AC_MSG_ERROR([SimpleXML extension requires LIBXML extension, add --enable-libxml]) AC_MSG_ERROR([SimpleXML extension requires LIBXML extension, add --enable-libxml])
fi fi
PHP_SETUP_LIBXML(SIMPLEXML_SHARED_LIBADD, [ PHP_SETUP_LIBXML(SIMPLEXML_SHARED_LIBADD, [

2
ext/snmp/config.m4
View file

@ -35,7 +35,7 @@ if test "$PHP_SNMP" != "no"; then
else else
AC_MSG_ERROR([Net-SNMP version 5.3 or greater reqired (detected $snmp_full_version).]) AC_MSG_ERROR([Net-SNMP version 5.3 or greater reqired (detected $snmp_full_version).])
fi fi
else else
AC_MSG_ERROR([Could not find net-snmp-config binary. Please check your net-snmp installation.]) AC_MSG_ERROR([Could not find net-snmp-config binary. Please check your net-snmp installation.])
fi fi

4
ext/soap/config.m4
View file

@ -10,8 +10,8 @@ fi
if test "$PHP_SOAP" != "no"; then if test "$PHP_SOAP" != "no"; then
if test "$PHP_LIBXML" = "no"; then if test "$PHP_LIBXML" = "no"; then
AC_MSG_ERROR([SOAP extension requires LIBXML extension, add --enable-libxml]) AC_MSG_ERROR([SOAP extension requires LIBXML extension, add --enable-libxml])
fi fi
PHP_SETUP_LIBXML(SOAP_SHARED_LIBADD, [ PHP_SETUP_LIBXML(SOAP_SHARED_LIBADD, [

2
ext/spl/config.m4
View file

@ -1,6 +1,6 @@
dnl config.m4 for extension SPL dnl config.m4 for extension SPL
AC_DEFINE(HAVE_SPL, 1, [Whether you want SPL (Standard PHP Library) support]) AC_DEFINE(HAVE_SPL, 1, [Whether you want SPL (Standard PHP Library) support])
PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c, no,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c, no,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
PHP_INSTALL_HEADERS([ext/spl], [php_spl.h spl_array.h spl_directory.h spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h spl_dllist.h spl_heap.h spl_fixedarray.h]) PHP_INSTALL_HEADERS([ext/spl], [php_spl.h spl_array.h spl_directory.h spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h spl_dllist.h spl_heap.h spl_fixedarray.h])
PHP_ADD_EXTENSION_DEP(spl, pcre, true) PHP_ADD_EXTENSION_DEP(spl, pcre, true)

4
ext/xml/config.m4
View file

@ -13,7 +13,7 @@ PHP_ARG_WITH(libexpat-dir, libexpat install dir,
if test "$PHP_XML" != "no"; then if test "$PHP_XML" != "no"; then
dnl dnl
dnl Default to libxml2 if --with-libexpat-dir is not used. dnl Default to libxml2 if --with-libexpat-dir is not used.
dnl dnl
if test "$PHP_LIBEXPAT_DIR" = "no"; then if test "$PHP_LIBEXPAT_DIR" = "no"; then
@ -29,7 +29,7 @@ if test "$PHP_XML" != "no"; then
AC_MSG_ERROR([libxml2 not found. Use --with-libxml-dir=<DIR>]) AC_MSG_ERROR([libxml2 not found. Use --with-libxml-dir=<DIR>])
]) ])
fi fi
dnl dnl
dnl Check for expat only if --with-libexpat-dir is used. dnl Check for expat only if --with-libexpat-dir is used.
dnl dnl

4
ext/xmlrpc/config.m4
View file

@ -65,11 +65,11 @@ if test "$PHP_XMLRPC" != "no"; then
if test "$PHP_ICONV_DIR" != "no"; then if test "$PHP_ICONV_DIR" != "no"; then
PHP_ICONV=$PHP_ICONV_DIR PHP_ICONV=$PHP_ICONV_DIR
fi fi
if test -z "$PHP_ICONV" || test "$PHP_ICONV" = "no"; then if test -z "$PHP_ICONV" || test "$PHP_ICONV" = "no"; then
PHP_ICONV=yes PHP_ICONV=yes
fi fi
PHP_SETUP_ICONV(XMLRPC_SHARED_LIBADD, [], [ PHP_SETUP_ICONV(XMLRPC_SHARED_LIBADD, [], [
AC_MSG_ERROR([iconv not found, in order to build xmlrpc you need the iconv library]) AC_MSG_ERROR([iconv not found, in order to build xmlrpc you need the iconv library])
]) ])

12
ext/xsl/config.m4
View file

@ -9,7 +9,7 @@ if test "$PHP_XSL" != "no"; then
if test "$PHP_LIBXML" = "no"; then if test "$PHP_LIBXML" = "no"; then
AC_MSG_ERROR([XSL extension requires LIBXML extension, add --enable-libxml]) AC_MSG_ERROR([XSL extension requires LIBXML extension, add --enable-libxml])
fi fi
if test "$PHP_DOM" = "no"; then if test "$PHP_DOM" = "no"; then
AC_MSG_ERROR([XSL extension requires DOM extension, add --enable-dom]) AC_MSG_ERROR([XSL extension requires DOM extension, add --enable-dom])
fi fi
@ -35,7 +35,7 @@ if test "$PHP_XSL" != "no"; then
XSL_INCS=`$XSLT_CONFIG --cflags` XSL_INCS=`$XSLT_CONFIG --cflags`
PHP_EVAL_LIBLINE($XSL_LIBS, XSL_SHARED_LIBADD) PHP_EVAL_LIBLINE($XSL_LIBS, XSL_SHARED_LIBADD)
PHP_EVAL_INCLINE($XSL_INCS) PHP_EVAL_INCLINE($XSL_INCS)
AC_MSG_CHECKING([for EXSLT support]) AC_MSG_CHECKING([for EXSLT support])
for i in $PHP_XSL /usr/local /usr; do for i in $PHP_XSL /usr/local /usr; do
if test -r "$i/include/libexslt/exslt.h"; then if test -r "$i/include/libexslt/exslt.h"; then
@ -45,7 +45,7 @@ if test "$PHP_XSL" != "no"; then
done done
if test -z "$PHP_XSL_EXSL_DIR"; then if test -z "$PHP_XSL_EXSL_DIR"; then
AC_MSG_RESULT(not found) AC_MSG_RESULT(not found)
else else
AC_MSG_RESULT(found) AC_MSG_RESULT(found)
PHP_ADD_LIBRARY_WITH_PATH(exslt, $PHP_XSL_EXSL_DIR/$PHP_LIBDIR, XSL_SHARED_LIBADD) PHP_ADD_LIBRARY_WITH_PATH(exslt, $PHP_XSL_EXSL_DIR/$PHP_LIBDIR, XSL_SHARED_LIBADD)
PHP_ADD_INCLUDE($PHP_XSL_EXSL_DIR/include) PHP_ADD_INCLUDE($PHP_XSL_EXSL_DIR/include)
@ -54,10 +54,10 @@ if test "$PHP_XSL" != "no"; then
else else
AC_MSG_ERROR([libxslt version 1.1.0 or greater required.]) AC_MSG_ERROR([libxslt version 1.1.0 or greater required.])
fi fi
fi fi
AC_DEFINE(HAVE_XSL,1,[ ]) AC_DEFINE(HAVE_XSL,1,[ ])
PHP_NEW_EXTENSION(xsl, php_xsl.c xsltprocessor.c, $ext_shared) PHP_NEW_EXTENSION(xsl, php_xsl.c xsltprocessor.c, $ext_shared)
PHP_SUBST(XSL_SHARED_LIBADD) PHP_SUBST(XSL_SHARED_LIBADD)

12
ext/zlib/config0.m4
View file

@ -9,8 +9,8 @@ PHP_ARG_WITH(zlib-dir,if the location of ZLIB install directory is defined,
if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then
PHP_NEW_EXTENSION(zlib, zlib.c zlib_fopen_wrapper.c zlib_filter.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) PHP_NEW_EXTENSION(zlib, zlib.c zlib_fopen_wrapper.c zlib_filter.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
PHP_SUBST(ZLIB_SHARED_LIBADD) PHP_SUBST(ZLIB_SHARED_LIBADD)
if test "$PHP_ZLIB" != "yes" -a "$PHP_ZLIB" != "no"; then if test "$PHP_ZLIB" != "yes" -a "$PHP_ZLIB" != "no"; then
if test -f $PHP_ZLIB/include/zlib/zlib.h; then if test -f $PHP_ZLIB/include/zlib/zlib.h; then
ZLIB_DIR=$PHP_ZLIB ZLIB_DIR=$PHP_ZLIB
ZLIB_INCDIR=$ZLIB_DIR/include/zlib ZLIB_INCDIR=$ZLIB_DIR/include/zlib
@ -18,7 +18,7 @@ if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then
ZLIB_DIR=$PHP_ZLIB ZLIB_DIR=$PHP_ZLIB
ZLIB_INCDIR=$ZLIB_DIR/include ZLIB_INCDIR=$ZLIB_DIR/include
fi fi
else else
for i in /usr/local /usr $PHP_ZLIB_DIR; do for i in /usr/local /usr $PHP_ZLIB_DIR; do
if test -f $i/include/zlib/zlib.h; then if test -f $i/include/zlib/zlib.h; then
ZLIB_DIR=$i ZLIB_DIR=$i
@ -29,13 +29,13 @@ if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then
fi fi
done done
fi fi
if test -z "$ZLIB_DIR"; then if test -z "$ZLIB_DIR"; then
AC_MSG_ERROR(Cannot find libz) AC_MSG_ERROR(Cannot find libz)
fi fi
case $ZLIB_DIR in case $ZLIB_DIR in
/usr) ac_extra= ;; /usr) ac_extra= ;;
*) ac_extra=-L$ZLIB_DIR/$PHP_LIBDIR ;; *) ac_extra=-L$ZLIB_DIR/$PHP_LIBDIR ;;
esac esac
@ -47,7 +47,7 @@ if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then
fi fi
PHP_CHECK_LIBRARY(z, gzgets, [ PHP_CHECK_LIBRARY(z, gzgets, [
AC_DEFINE(HAVE_ZLIB,1,[ ]) AC_DEFINE(HAVE_ZLIB,1,[ ])
],[ ],[
AC_MSG_ERROR(ZLIB extension requires gzgets in zlib) AC_MSG_ERROR(ZLIB extension requires gzgets in zlib)
],[ ],[

8
sapi/apache2handler/config.m4
View file

@ -21,7 +21,7 @@ if test "$PHP_APXS2" != "no"; then
if test "$?" != "0"; then if test "$?" != "0"; then
AC_MSG_RESULT() AC_MSG_RESULT()
AC_MSG_RESULT() AC_MSG_RESULT()
AC_MSG_RESULT([Sorry, I cannot run apxs. Possible reasons follow:]) AC_MSG_RESULT([Sorry, I cannot run apxs. Possible reasons follow:])
AC_MSG_RESULT() AC_MSG_RESULT()
AC_MSG_RESULT([1. Perl is not installed]) AC_MSG_RESULT([1. Perl is not installed])
AC_MSG_RESULT([2. apxs was not found. Try to pass the path using --with-apxs2=/path/to/apxs]) AC_MSG_RESULT([2. apxs was not found. Try to pass the path using --with-apxs2=/path/to/apxs])
@ -30,7 +30,7 @@ if test "$PHP_APXS2" != "no"; then
AC_MSG_RESULT([The output of $APXS follows:]) AC_MSG_RESULT([The output of $APXS follows:])
$APXS -q CFLAGS $APXS -q CFLAGS
AC_MSG_ERROR([Aborting]) AC_MSG_ERROR([Aborting])
fi fi
APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR` APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR`
APXS_BINDIR=`$APXS -q BINDIR` APXS_BINDIR=`$APXS -q BINDIR`
@ -82,7 +82,7 @@ if test "$PHP_APXS2" != "no"; then
*aix*) *aix*)
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp"
PHP_SELECT_SAPI(apache2handler, shared, mod_php7.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) PHP_SELECT_SAPI(apache2handler, shared, mod_php7.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS)
INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
;; ;;
*darwin*) *darwin*)
dnl When using bundles on Darwin, we must resolve all symbols. However, dnl When using bundles on Darwin, we must resolve all symbols. However,
@ -102,7 +102,7 @@ if test "$PHP_APXS2" != "no"; then
INSTALL_IT="$INSTALL_IT $SAPI_SHARED" INSTALL_IT="$INSTALL_IT $SAPI_SHARED"
;; ;;
*) *)
PHP_SELECT_SAPI(apache2handler, shared, mod_php7.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) PHP_SELECT_SAPI(apache2handler, shared, mod_php7.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS)
INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
;; ;;
esac esac

36
sapi/fpm/config.m4
View file

@ -233,7 +233,7 @@ AC_DEFUN([AC_FPM_TRACE],
if test -n "$proc_mem_file" ; then if test -n "$proc_mem_file" ; then
AC_MSG_CHECKING([for proc mem file]) AC_MSG_CHECKING([for proc mem file])
AC_TRY_RUN([ AC_TRY_RUN([
#define _GNU_SOURCE #define _GNU_SOURCE
#define _FILE_OFFSET_BITS 64 #define _FILE_OFFSET_BITS 64
@ -269,26 +269,26 @@ AC_DEFUN([AC_FPM_TRACE],
AC_MSG_RESULT([skipped (cross compiling)]) AC_MSG_RESULT([skipped (cross compiling)])
]) ])
fi fi
if test -n "$proc_mem_file"; then if test -n "$proc_mem_file"; then
AC_DEFINE_UNQUOTED([PROC_MEM_FILE], "$proc_mem_file", [/proc/pid/mem interface]) AC_DEFINE_UNQUOTED([PROC_MEM_FILE], "$proc_mem_file", [/proc/pid/mem interface])
fi fi
fpm_trace_type="" fpm_trace_type=""
if test "$have_ptrace" = "yes"; then if test "$have_ptrace" = "yes"; then
fpm_trace_type=ptrace fpm_trace_type=ptrace
elif test -n "$proc_mem_file"; then elif test -n "$proc_mem_file"; then
fpm_trace_type=pread fpm_trace_type=pread
elif test "$have_mach_vm_read" = "yes" ; then elif test "$have_mach_vm_read" = "yes" ; then
fpm_trace_type=mach fpm_trace_type=mach
else else
AC_MSG_WARN([FPM Trace - ptrace, pread, or mach: could not be found]) AC_MSG_WARN([FPM Trace - ptrace, pread, or mach: could not be found])
fi fi
]) ])
AC_DEFUN([AC_FPM_BUILTIN_ATOMIC], AC_DEFUN([AC_FPM_BUILTIN_ATOMIC],
@ -374,7 +374,7 @@ AC_DEFUN([AC_FPM_KQUEUE],
AC_MSG_CHECKING([for kqueue]) AC_MSG_CHECKING([for kqueue])
AC_TRY_COMPILE( AC_TRY_COMPILE(
[ [
#include <sys/types.h> #include <sys/types.h>
#include <sys/event.h> #include <sys/event.h>
#include <sys/time.h> #include <sys/time.h>
@ -398,7 +398,7 @@ AC_DEFUN([AC_FPM_PORT],
AC_MSG_CHECKING([for port framework]) AC_MSG_CHECKING([for port framework])
AC_TRY_COMPILE( AC_TRY_COMPILE(
[ [
#include <port.h> #include <port.h>
], [ ], [
int port; int port;
@ -421,7 +421,7 @@ AC_DEFUN([AC_FPM_DEVPOLL],
AC_MSG_CHECKING([for /dev/poll]) AC_MSG_CHECKING([for /dev/poll])
AC_TRY_COMPILE( AC_TRY_COMPILE(
[ [
#include <stdio.h> #include <stdio.h>
#include <sys/devpoll.h> #include <sys/devpoll.h>
], [ ], [
@ -446,7 +446,7 @@ AC_DEFUN([AC_FPM_EPOLL],
AC_MSG_CHECKING([for epoll]) AC_MSG_CHECKING([for epoll])
AC_TRY_COMPILE( AC_TRY_COMPILE(
[ [
#include <sys/epoll.h> #include <sys/epoll.h>
], [ ], [
int epollfd; int epollfd;
@ -482,7 +482,7 @@ AC_DEFUN([AC_FPM_POLL],
AC_MSG_CHECKING([for poll]) AC_MSG_CHECKING([for poll])
AC_TRY_COMPILE( AC_TRY_COMPILE(
[ [
#include <poll.h> #include <poll.h>
], [ ], [
struct pollfd fds[2]; struct pollfd fds[2];
@ -508,7 +508,7 @@ AC_DEFUN([AC_FPM_SELECT],
AC_MSG_CHECKING([for select]) AC_MSG_CHECKING([for select])
AC_TRY_COMPILE( AC_TRY_COMPILE(
[ [
/* According to POSIX.1-2001 */ /* According to POSIX.1-2001 */
#include <sys/select.h> #include <sys/select.h>
@ -575,7 +575,7 @@ if test "$PHP_FPM" != "no"; then
[ --with-fpm-user[=USER] Set the user for php-fpm to run as. (default: nobody)], nobody, no) [ --with-fpm-user[=USER] Set the user for php-fpm to run as. (default: nobody)], nobody, no)
PHP_ARG_WITH(fpm-group,, PHP_ARG_WITH(fpm-group,,
[ --with-fpm-group[=GRP] Set the group for php-fpm to run as. For a system user, this [ --with-fpm-group[=GRP] Set the group for php-fpm to run as. For a system user, this
should usually be set to match the fpm username (default: nobody)], nobody, no) should usually be set to match the fpm username (default: nobody)], nobody, no)
PHP_ARG_WITH(fpm-systemd,, PHP_ARG_WITH(fpm-systemd,,
@ -674,13 +674,13 @@ if test "$PHP_FPM" != "no"; then
PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/fpm/Makefile.frag]) PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/fpm/Makefile.frag])
SAPI_FPM_PATH=sapi/fpm/php-fpm SAPI_FPM_PATH=sapi/fpm/php-fpm
if test "$fpm_trace_type" && test -f "$abs_srcdir/sapi/fpm/fpm/fpm_trace_$fpm_trace_type.c"; then 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" PHP_FPM_TRACE_FILES="fpm/fpm_trace.c fpm/fpm_trace_$fpm_trace_type.c"
fi fi
PHP_FPM_CFLAGS="-I$abs_srcdir/sapi/fpm" PHP_FPM_CFLAGS="-I$abs_srcdir/sapi/fpm"
PHP_FPM_FILES="fpm/fpm.c \ PHP_FPM_FILES="fpm/fpm.c \
fpm/fpm_children.c \ fpm/fpm_children.c \
fpm/fpm_cleanup.c \ fpm/fpm_cleanup.c \

2
sapi/litespeed/config.m4
View file

@ -8,7 +8,7 @@ PHP_ARG_WITH(litespeed,,
if test "$PHP_LITESPEED" != "no"; then if test "$PHP_LITESPEED" != "no"; then
PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/litespeed/Makefile.frag,$abs_srcdir/sapi/litespeed,sapi/litespeed) PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/litespeed/Makefile.frag,$abs_srcdir/sapi/litespeed,sapi/litespeed)
SAPI_LITESPEED_PATH=sapi/litespeed/php SAPI_LITESPEED_PATH=sapi/litespeed/php
PHP_SELECT_SAPI(litespeed, program, lsapi_main.c lsapilib.c, "", '$(SAPI_LITESPEED_PATH)') PHP_SELECT_SAPI(litespeed, program, lsapi_main.c lsapilib.c, "", '$(SAPI_LITESPEED_PATH)')
case $host_alias in case $host_alias in
*darwin*) *darwin*)
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)" 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)"

6
sapi/phpdbg/config.m4
View file

@ -26,17 +26,17 @@ if test "$BUILD_PHPDBG" = "" && test "$PHP_PHPDBG" != "no"; then
if test "$PHP_READLINE" != "no" -o "$PHP_LIBEDIT" != "no"; then if test "$PHP_READLINE" != "no" -o "$PHP_LIBEDIT" != "no"; then
PHPDBG_EXTRA_LIBS="$PHP_READLINE_LIBS" PHPDBG_EXTRA_LIBS="$PHP_READLINE_LIBS"
fi fi
PHP_SUBST(PHP_PHPDBG_CFLAGS) PHP_SUBST(PHP_PHPDBG_CFLAGS)
PHP_SUBST(PHP_PHPDBG_FILES) PHP_SUBST(PHP_PHPDBG_FILES)
PHP_SUBST(PHPDBG_EXTRA_LIBS) PHP_SUBST(PHPDBG_EXTRA_LIBS)
PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/phpdbg/Makefile.frag], [$abs_srcdir/sapi/phpdbg], [$abs_builddir/sapi/phpdbg]) PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/phpdbg/Makefile.frag], [$abs_srcdir/sapi/phpdbg], [$abs_builddir/sapi/phpdbg])
PHP_SELECT_SAPI(phpdbg, program, $PHP_PHPDBG_FILES, $PHP_PHPDBG_CFLAGS, [$(SAPI_PHPDBG_PATH)]) PHP_SELECT_SAPI(phpdbg, program, $PHP_PHPDBG_FILES, $PHP_PHPDBG_CFLAGS, [$(SAPI_PHPDBG_PATH)])
BUILD_BINARY="sapi/phpdbg/phpdbg" BUILD_BINARY="sapi/phpdbg/phpdbg"
BUILD_SHARED="sapi/phpdbg/libphpdbg.la" BUILD_SHARED="sapi/phpdbg/libphpdbg.la"
BUILD_PHPDBG="\$(LIBTOOL) --mode=link \ BUILD_PHPDBG="\$(LIBTOOL) --mode=link \
\$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \ \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \
\$(PHP_GLOBAL_OBJS) \ \$(PHP_GLOBAL_OBJS) \

4
scripts/phpize.m4
View file

@ -6,7 +6,7 @@ ifdef([AC_PRESERVE_HELP_ORDER], [AC_PRESERVE_HELP_ORDER], [])
PHP_CONFIG_NICE(config.nice) PHP_CONFIG_NICE(config.nice)
dnl dnl
AC_DEFUN([PHP_EXT_BUILDDIR],[.])dnl AC_DEFUN([PHP_EXT_BUILDDIR],[.])dnl
AC_DEFUN([PHP_EXT_DIR],[""])dnl AC_DEFUN([PHP_EXT_DIR],[""])dnl
AC_DEFUN([PHP_EXT_SRCDIR],[$abs_srcdir])dnl AC_DEFUN([PHP_EXT_SRCDIR],[$abs_srcdir])dnl
@ -45,7 +45,7 @@ phpincludedir=`$PHP_CONFIG --include-dir 2>/dev/null`
INCLUDES=`$PHP_CONFIG --includes 2>/dev/null` INCLUDES=`$PHP_CONFIG --includes 2>/dev/null`
EXTENSION_DIR=`$PHP_CONFIG --extension-dir 2>/dev/null` EXTENSION_DIR=`$PHP_CONFIG --extension-dir 2>/dev/null`
PHP_EXECUTABLE=`$PHP_CONFIG --php-binary 2>/dev/null` PHP_EXECUTABLE=`$PHP_CONFIG --php-binary 2>/dev/null`
if test -z "$prefix"; then if test -z "$prefix"; then
AC_MSG_ERROR([Cannot find php-config. Please use --with-php-config=PATH]) AC_MSG_ERROR([Cannot find php-config. Please use --with-php-config=PATH])
fi fi