diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 887 |
1 files changed, 390 insertions, 497 deletions
diff --git a/configure.ac b/configure.ac index 3129fce0a0..2d4ce30825 100644 --- a/configure.ac +++ b/configure.ac @@ -1,22 +1,33 @@ -## -*- autoconf -*- -dnl ## Process this file with autoconf to produce a configure script. - -dnl include Zend specific macro definitions first -dnl ------------------------------------------------------------------------- -sinclude(Zend/acinclude.m4) - -dnl Basic autoconf + automake initialization, generation of config.nice. -dnl ------------------------------------------------------------------------- +dnl Process this file with autoconf to produce a configure script. + +dnl Include external macro definitions before the AC_INIT to also remove +dnl comments starting with # and empty newlines from the included files. +dnl ---------------------------------------------------------------------------- +m4_include([build/ax_check_compile_flag.m4]) +m4_include([build/ax_func_which_gethostbyname_r.m4]) +m4_include([build/ax_gcc_func_attribute.m4]) +m4_include([build/libtool.m4]) +m4_include([build/php_cxx_compile_stdcxx.m4]) +m4_include([build/php.m4]) +m4_include([build/pkg.m4]) +m4_include([TSRM/threads.m4]) +m4_include([TSRM/tsrm.m4]) + +dnl Basic autoconf initialization, generation of config.nice. +dnl ---------------------------------------------------------------------------- AC_PREREQ([2.68]) -AC_INIT(README.GIT-RULES) -ifdef([AC_PRESERVE_HELP_ORDER], [AC_PRESERVE_HELP_ORDER], []) +AC_INIT([PHP],[7.4.11-dev],[https://bugs.php.net],[php],[https://www.php.net]) +AC_CONFIG_SRCDIR([main/php_version.h]) +AC_CONFIG_AUX_DIR([build]) +AC_PRESERVE_HELP_ORDER PHP_CONFIG_NICE(config.nice) PHP_CANONICAL_HOST_TARGET AC_CONFIG_HEADERS([main/php_config.h]) + AH_TOP([ #ifndef PHP_CONFIG_H #define PHP_CONFIG_H @@ -30,16 +41,11 @@ AH_TOP([ #endif #define ZEND_DLIMPORT - -#undef uint -#undef ulong ]) AH_BOTTOM([ #ifndef ZEND_ACCONFIG_H_NO_C_PROTOS -#ifdef HAVE_STDLIB_H -# include <stdlib.h> -#endif +#include <stdlib.h> #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> @@ -53,22 +59,20 @@ AH_BOTTOM([ # include <ieeefp.h> #endif -#ifdef HAVE_STRING_H -# include <string.h> -#else -# include <strings.h> -#endif +#include <string.h> -#if ZEND_BROKEN_SPRINTF -int zend_sprintf(char *buffer, const char *format, ...); +#if defined(__cplusplus) && __cplusplus >= 201103L +extern "C++" { +#include <cmath> +#define zend_isnan std::isnan +#define zend_isinf std::isinf +#define zend_finite std::isfinite +} #else -# define zend_sprintf sprintf -#endif - #include <math.h> #ifndef zend_isnan -#if HAVE_DECL_ISNAN && (!defined(__cplusplus) || __cplusplus < 201103L) +#if HAVE_DECL_ISNAN #define zend_isnan(a) isnan(a) #elif defined(HAVE_FPCLASS) #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN)) @@ -77,7 +81,7 @@ int zend_sprintf(char *buffer, const char *format, ...); #endif #endif -#if HAVE_DECL_ISINF && (!defined(__cplusplus) || __cplusplus < 201103L) +#if HAVE_DECL_ISINF #define zend_isinf(a) isinf(a) #elif defined(INFINITY) /* Might not work, but is required by ISO C99 */ @@ -88,7 +92,7 @@ int zend_sprintf(char *buffer, const char *format, ...); #define zend_isinf(a) 0 #endif -#if HAVE_DECL_ISFINITE && (!defined(__cplusplus) || __cplusplus < 201103L) +#if HAVE_DECL_ISFINITE #define zend_finite(a) isfinite(a) #elif defined(HAVE_FINITE) #define zend_finite(a) finite(a) @@ -98,34 +102,36 @@ int zend_sprintf(char *buffer, const char *format, ...); #define zend_finite(a) (zend_isnan(a) ? 0 : zend_isinf(a) ? 0 : 1) #endif +#endif #endif /* ifndef ZEND_ACCONFIG_H_NO_C_PROTOS */ -#undef PTHREADS - #endif /* PHP_CONFIG_H */ ]) -PHP_MAJOR_VERSION=7 -PHP_MINOR_VERSION=3 -PHP_RELEASE_VERSION=24 -PHP_EXTRA_VERSION="-dev" +ac_IFS=$IFS; IFS="." +set $(echo AC_PACKAGE_VERSION | "${SED}" 's/\([[0-9\.]]*\)\(.*\)/\1\.\2/') +IFS=$ac_IFS +PHP_MAJOR_VERSION=[$]1 +PHP_MINOR_VERSION=[$]2 +PHP_RELEASE_VERSION=[$]3 +PHP_EXTRA_VERSION=[$]4 PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` -dnl Allow version values to be used in Makefile +dnl Allow version values to be used in Makefile. PHP_SUBST(PHP_MAJOR_VERSION) PHP_SUBST(PHP_MINOR_VERSION) PHP_SUBST(PHP_RELEASE_VERSION) PHP_SUBST(PHP_EXTRA_VERSION) -dnl Define where extension directories are located in the configure context +dnl Define where extension directories are located in the configure context. AC_DEFUN([PHP_EXT_BUILDDIR],[$config_m4_dir])dnl AC_DEFUN([PHP_EXT_DIR],[$config_m4_dir])dnl AC_DEFUN([PHP_EXT_SRCDIR],[$abs_srcdir/$config_m4_dir])dnl AC_DEFUN([PHP_ALWAYS_SHARED],[])dnl dnl Setting up the PHP version based on the information above. -dnl ------------------------------------------------------------------------- +dnl ---------------------------------------------------------------------------- echo "/* automatically generated by configure */" > php_version.h.new echo "/* edit configure.ac to change version number */" >> php_version.h.new @@ -144,9 +150,7 @@ else fi dnl Settings we want to make before the checks. -dnl ------------------------------------------------------------------------- - -cwd=`pwd` +dnl ---------------------------------------------------------------------------- php_shtool=$srcdir/build/shtool T_MD=`$php_shtool echo -n -e %B` @@ -160,57 +164,53 @@ test -z "$CFLAGS" && auto_cflags=1 abs_srcdir=`(cd $srcdir; pwd)` abs_builddir=`pwd` -php_abs_top_srcdir=$abs_srcdir -php_abs_top_builddir=$abs_builddir - -dnl Because ``make install'' is often performed by the superuser, -dnl we create the libs subdirectory as the user who configures PHP. -dnl Otherwise, the current user will not be able to delete libs -dnl or the contents of libs. +dnl Because `make install` is often performed by the superuser, we create the +dnl libs subdirectory as the user who configures PHP. Otherwise, the current +dnl user will not be able to delete libs or the contents of libs. $php_shtool mkdir -p libs rm -f libs/* dnl Checks for programs. -dnl ------------------------------------------------------------------------- +dnl ---------------------------------------------------------------------------- +PKG_PROG_PKG_CONFIG AC_PROG_CC([cc gcc]) PHP_DETECT_ICC PHP_DETECT_SUNCC -AC_PROG_CC_C_O -dnl Change to AC_PROG_CC_STDC when we start requiring a post-2.13 autoconf -dnl AC_PROG_CC_STDC AC_PROG_CPP AC_USE_SYSTEM_EXTENSIONS AC_PROG_LN_S -dnl Support systems with system libraries in e.g. /usr/lib64 -PHP_ARG_WITH(libdir, for system library directory, -[ --with-libdir=NAME Look for libraries in .../NAME rather than .../lib],lib,no) - -PHP_ARG_ENABLE(rpath, whether to enable runpaths, -[ --disable-rpath Disable passing additional runtime library - search paths], yes, no) - -dnl check for -R, etc. switch +dnl Support systems with system libraries in e.g. /usr/lib64. +PHP_ARG_WITH([libdir], + [for system library directory], + [AS_HELP_STRING([--with-libdir=NAME], + [Look for libraries in .../NAME rather than .../lib])], + [lib], + [no]) + +PHP_ARG_ENABLE([rpath], + [whether to enable runpaths], + [AS_HELP_STRING([--disable-rpath], + [Disable passing additional runtime library search paths])], + [yes], + [no]) + +dnl Check for -R, etc. switch. PHP_RUNPATH_SWITCH -dnl Checks for some support/generator progs +dnl Checks for some support/generator progs. PHP_PROG_AWK -PHP_PROG_BISON -PHP_PROG_RE2C - -dnl Check if bison generated files exist when bison does not.. -case $php_cv_bison_version in - ""|invalid[)] - if ! test -f "$abs_srcdir/Zend/zend_language_parser.h" || ! test -f "$abs_srcdir/Zend/zend_language_parser.c" ; then - AC_MSG_ERROR([bison is required to build PHP/Zend when building a GIT checkout!]) - fi - ;; -esac +PHP_PROG_BISON([3.0.0]) +PHP_PROG_RE2C([0.13.4]) -PHP_ARG_ENABLE(re2c-cgoto, whether to enable computed goto gcc extension with re2c, -[ --enable-re2c-cgoto Enable -g flag to re2c to use computed goto gcc extension], no, no) +PHP_ARG_ENABLE([re2c-cgoto], + [whether to enable computed goto gcc extension with re2c], + [AS_HELP_STRING([--enable-re2c-cgoto], + [Enable -g flag to re2c to use computed goto gcc extension])], + [no], + [no]) if test "$PHP_RE2C_CGOTO" = "no"; then RE2C_FLAGS="" @@ -238,7 +238,7 @@ fi PHP_SUBST(RE2C_FLAGS) dnl Platform-specific compile settings. -dnl ------------------------------------------------------------------------- +dnl ---------------------------------------------------------------------------- dnl See bug #28605 case $host_cpu in @@ -271,18 +271,13 @@ case $host_alias in *dgux*) CPPFLAGS="$CPPFLAGS -D_BSD_TIMEOFDAY_FLAVOR" ;; - *darwin*|*rhapsody*) + *darwin*) if test -n "$GCC"; then PHP_CHECK_GCC_ARG(-no-cpp-precomp, gcc_no_cpp_precomp=yes) if test "$gcc_no_cpp_precomp" = "yes"; then CPPFLAGS="$CPPFLAGS -no-cpp-precomp" fi fi - php_multiple_shlib_versions_ok=yes - ;; - *beos*) - beos_threads=1 - LIBS="$LIBS -lbe -lroot" ;; *mips*) CPPFLAGS="$CPPFLAGS -D_XPG_IV" @@ -294,8 +289,8 @@ case $host_alias in ;; esac -# Disable PIC mode by default where it is known to be safe to do so, -# to avoid the performance hit from the lost register +dnl Disable PIC mode by default where it is known to be safe to do so, to avoid +dnl the performance hit from the lost register. AC_MSG_CHECKING([whether to force non-PIC code in shared modules]) case $host_alias in i?86-*-linux*|i?86-*-freebsd*) @@ -311,16 +306,12 @@ case $host_alias in ;; esac - -dnl Include Zend and TSRM configurations. -dnl ------------------------------------------------------------------------- +dnl Include Zend configurations. +dnl ---------------------------------------------------------------------------- sinclude(Zend/Zend.m4) -sinclude(TSRM/threads.m4) -sinclude(TSRM/tsrm.m4) -dnl . -dnl ------------------------------------------------------------------------- +dnl ---------------------------------------------------------------------------- PTHREADS_CHECK PHP_HELP_SEPARATOR([SAPI modules:]) @@ -328,11 +319,10 @@ PHP_SHLIB_SUFFIX_NAMES PHP_BUILD_PROGRAM PHP_SAPI=none - dnl SAPI configuration. -dnl ------------------------------------------------------------------------- +dnl ---------------------------------------------------------------------------- -dnl paths to the targets are relative to the build directory +dnl Paths to the targets are relative to the build directory. SAPI_SHARED=libs/libphp[]$PHP_MAJOR_VERSION[.]$SHLIB_DL_SUFFIX_NAME SAPI_STATIC=libs/libphp[]$PHP_MAJOR_VERSION[.a] SAPI_LIBTOOL=libphp[]$PHP_MAJOR_VERSION[.la] @@ -341,11 +331,11 @@ PHP_CONFIGURE_PART(Configuring SAPI modules) esyscmd(./build/config-stubs sapi) -dnl Show which main SAPI was selected +dnl Show which main SAPI was selected. AC_MSG_CHECKING([for chosen SAPI module]) AC_MSG_RESULT([$PHP_SAPI]) -dnl Show which binaries were selected +dnl Show which binaries were selected. AC_MSG_CHECKING([for executable SAPI binaries]) if test "$PHP_BINARIES"; then AC_MSG_RESULT([$PHP_BINARIES]) @@ -353,81 +343,80 @@ else AC_MSG_RESULT([none]) fi -dnl Exit early +dnl Exit early. if test -z "$PHP_INSTALLED_SAPIS"; then AC_MSG_ERROR([Nothing to build.]) fi -dnl force ZTS +dnl Force ZTS. if test "$enable_maintainer_zts" = "yes"; then - PTHREADS_ASSIGN_VARS + dnl Add pthreads linker and compiler flags. + if test -n "$ac_cv_pthreads_lib"; then + LIBS="$LIBS -l$ac_cv_pthreads_lib" + fi + if test -n "$ac_cv_pthreads_cflags"; then + CFLAGS="$CFLAGS $ac_cv_pthreads_cflags" + fi + PTHREADS_FLAGS fi dnl Starting system checks. -dnl ------------------------------------------------------------------------- +dnl ---------------------------------------------------------------------------- PHP_CONFIGURE_PART(Running system checks) -dnl Find sendmail binary +dnl Find sendmail binary. PHP_PROG_SENDMAIL -dnl Check whether the system uses EBCDIC (not ASCII) as its native codeset +dnl Check whether the system uses EBCDIC (not ASCII) as its native codeset. PHP_EBCDIC -dnl Check whether the system byte ordering is bigendian +dnl Check whether the system byte ordering is bigendian. PHP_C_BIGENDIAN -dnl Check whether writing to stdout works +dnl Check whether writing to stdout works. PHP_TEST_WRITE_STDOUT -dnl Check for /usr/pkg/{lib,include} which is where NetBSD puts binary -dnl and source packages. This should be harmless on other OSs. +dnl Check for /usr/pkg/{lib,include} which is where NetBSD puts binary and +dnl source packages. This should be harmless on other OSs. if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then CPPFLAGS="$CPPFLAGS -I/usr/pkg/include" LDFLAGS="$LDFLAGS -L/usr/pkg/lib" fi test -d /usr/ucblib && PHP_ADD_LIBPATH(/usr/ucblib) - dnl First, library checks. -dnl ------------------------------------------------------------------------- +dnl ---------------------------------------------------------------------------- -dnl Some systems (OpenServer 5) dislike -lsocket -lnsl, so we try -dnl to avoid -lnsl checks, if we already have the functions which -dnl are usually in libnsl -dnl Also, uClibc will bark at linking with glibc's libnsl. +dnl Some systems (OpenServer 5) dislike -lsocket -lnsl, so we try to avoid -lnsl +dnl checks, if we already have the functions which are usually in libnsl. Also, +dnl uClibc will bark at linking with glibc's libnsl. PHP_CHECK_FUNC(socket, socket) PHP_CHECK_FUNC(socketpair, socket) PHP_CHECK_FUNC(htonl, socket) PHP_CHECK_FUNC(gethostname, nsl) PHP_CHECK_FUNC(gethostbyaddr, nsl) -PHP_CHECK_FUNC(yp_get_default_domain, nsl) - PHP_CHECK_FUNC(dlopen, dl) +PHP_CHECK_FUNC(dlsym, dl) if test "$ac_cv_func_dlopen" = "yes"; then AC_DEFINE(HAVE_LIBDL, 1, [ ]) fi AC_CHECK_LIB(m, sin) -dnl Check for inet_aton -dnl in -lc, -lbind and -lresolv +dnl Check for inet_aton in -lc, -lbind and -lresolv. PHP_CHECK_FUNC(inet_aton, resolv, bind) dnl Then headers. -dnl ------------------------------------------------------------------------- - -dnl Checks for header files. -AC_HEADER_STDC -AC_HEADER_DIRENT +dnl ---------------------------------------------------------------------------- -dnl QNX requires unix.h to allow functions in libunix to work properly +dnl QNX requires unix.h to allow functions in libunix to work properly. +dnl locale.h is checked for supporting old code in extensions such as imagick. AC_CHECK_HEADERS([ \ inttypes.h \ stdint.h \ dirent.h \ -ApplicationServices/ApplicationServices.h \ sys/param.h \ sys/types.h \ sys/time.h \ @@ -435,26 +424,23 @@ netinet/in.h \ alloca.h \ arpa/inet.h \ arpa/nameser.h \ -assert.h \ crypt.h \ dns.h \ fcntl.h \ grp.h \ ieeefp.h \ langinfo.h \ -limits.h \ locale.h \ +malloc.h \ monetary.h \ netdb.h \ poll.h \ pwd.h \ resolv.h \ -signal.h \ -stdarg.h \ -stdlib.h \ -string.h \ +strings.h \ syslog.h \ sysexits.h \ +sys/auxv.h \ sys/ioctl.h \ sys/file.h \ sys/mman.h \ @@ -468,7 +454,7 @@ sys/statfs.h \ sys/statvfs.h \ sys/vfs.h \ sys/sysexits.h \ -sys/varargs.h \ +sys/uio.h \ sys/wait.h \ sys/loadavg.h \ termios.h \ @@ -478,7 +464,6 @@ utime.h \ sys/utsname.h \ sys/ipc.h \ dlfcn.h \ -assert.h \ tmmintrin.h \ nmmintrin.h \ immintrin.h @@ -502,36 +487,34 @@ immintrin.h PHP_FOPENCOOKIE PHP_BROKEN_GETCWD -PHP_BROKEN_GLIBC_FOPEN_APPEND if test "$GCC" = "yes"; then PHP_BROKEN_GCC_STRLEN_OPT fi dnl Checks for typedefs, structures, and compiler characteristics. -dnl ------------------------------------------------------------------------- +dnl ---------------------------------------------------------------------------- -AC_STRUCT_TM AC_STRUCT_TIMEZONE PHP_MISSING_TIME_R_DECL PHP_MISSING_FCLOSE_DECL - -PHP_TM_GMTOFF PHP_STRUCT_FLOCK -PHP_SOCKLEN_T -AC_CHECK_SIZEOF(size_t, 8) -AC_CHECK_SIZEOF(long long, 8) -AC_CHECK_SIZEOF(long long int, 8) -AC_CHECK_SIZEOF(long, 8) -AC_CHECK_SIZEOF(int, 4) +AC_CHECK_TYPES(socklen_t, [], [], [ + #ifdef HAVE_SYS_TYPES_H + # include <sys/types.h> + #endif + #ifdef HAVE_SYS_SOCKET_H + # include <sys/socket.h> + #endif +]) -dnl These are defined elsewhere than stdio.h +dnl These are defined elsewhere than stdio.h. PHP_CHECK_SIZEOF(intmax_t, 0) PHP_CHECK_SIZEOF(ssize_t, 8) PHP_CHECK_SIZEOF(ptrdiff_t, 8) -dnl Check stdint types (must be after header check) +dnl Check stdint types (must be after header check). PHP_CHECK_STDINT_TYPES dnl Check __builtin_expect @@ -559,50 +542,29 @@ PHP_CHECK_BUILTIN_CPU_INIT dnl Check __builtin_cpu_supports PHP_CHECK_BUILTIN_CPU_SUPPORTS -dnl Check instructions +dnl Check instructions. PHP_CHECK_CPU_SUPPORTS([ssse3]) PHP_CHECK_CPU_SUPPORTS([sse4.2]) PHP_CHECK_CPU_SUPPORTS([avx]) PHP_CHECK_CPU_SUPPORTS([avx2]) -dnl The ABI of php_addslashes in PHP 7.3 is dependent on __SSE4_2__, -dnl which depends on target attributes. Use this check to make sure that -dnl SSE 4.2 availability during the PHP compilation is used, independently -dnl of whether extensions are compiled with SSE 4.2 support. -AC_MSG_CHECKING([whether __SSE4_2__ is defined]) -AC_RUN_IFELSE([AC_LANG_SOURCE([[ -int main() { -#if defined(__SSE4_2__) - return 0; -#else - return 1; -#endif -} -]])], [ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_SSE4_2_DEF, 1, [Define if __SSE4_2__ has been defined]) -], [AC_MSG_RESULT([no])], [AC_MSG_RESULT([no])]) - -dnl Check for members of the stat structure +dnl Check for structure members. +AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[#include <time.h>]) AC_CHECK_MEMBERS([struct stat.st_blksize, struct stat.st_rdev]) -dnl AC_STRUCT_ST_BLOCKS will screw QNX because fileblocks.o does not exist -dnl The WARNING_LEVEL required because cc in QNX hates -w option without an argument +dnl AC_STRUCT_ST_BLOCKS will screw QNX because fileblocks.o does not exist. if test "`uname -s 2>/dev/null`" != "QNX"; then AC_STRUCT_ST_BLOCKS -else - AC_MSG_WARN([warnings level for cc set to 0]) - WARNING_LEVEL=0 fi -dnl Checks for types +dnl Checks for types. AC_TYPE_SIZE_T AC_TYPE_UID_T -dnl Checks for sockaddr_storage and sockaddr.sa_len +dnl Checks for sockaddr_storage and sockaddr.sa_len. PHP_SOCKADDR_CHECKS dnl Checks for GCC function attributes on all systems except ones without glibc -dnl Fix for these systems is already included in GCC 7, but not on GCC 6 +dnl Fix for these systems is already included in GCC 7, but not on GCC 6. dnl dnl At least some versions of FreeBSD seem to have buggy ifunc support, see dnl bug #77284. Conservatively don't use ifuncs on FreeBSD. @@ -611,7 +573,7 @@ AS_CASE([$host_alias], [*-*-*android*|*-*-*uclibc*|*-*-*musl*|*freebsd*], [true] AX_GCC_FUNC_ATTRIBUTE([target]) ]) -dnl Check for IPv6 support +dnl Check for IPv6 support. AC_CACHE_CHECK([for IPv6 support], ac_cv_ipv6_support, [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> #include <sys/socket.h> @@ -619,100 +581,84 @@ AC_CACHE_CHECK([for IPv6 support], ac_cv_ipv6_support, [ac_cv_ipv6_support=yes], [ac_cv_ipv6_support=no])]) dnl Checks for library functions. -dnl ------------------------------------------------------------------------- +dnl ---------------------------------------------------------------------------- -AC_FUNC_VPRINTF AC_CHECK_FUNCS( alphasort \ asctime_r \ chroot \ ctime_r \ -cuserid \ crypt \ explicit_memset \ flock \ +fpclass \ ftok \ funopen \ gai_strerror \ -gcvt \ +getcwd \ getloadavg \ getlogin \ getprotobyname \ getprotobynumber \ getservbyname \ getservbyport \ -gethostname \ getrusage \ gettimeofday \ gmtime_r \ getpwnam_r \ getgrnam_r \ getpwuid_r \ +getwd \ +glob \ grantpt \ inet_ntoa \ inet_ntop \ inet_pton \ -isascii \ -link \ localtime_r \ -lockf \ lchown \ -lrand48 \ -memcpy \ +mbrlen \ memmove \ mkstemp \ mmap \ +nice \ nl_langinfo \ -perror \ poll \ ptsname \ putenv \ realpath \ -random \ rand_r \ scandir \ setitimer \ -setlocale \ -localeconv \ setenv \ -setpgid \ -setsockopt \ -setvbuf \ shutdown \ -sin \ -snprintf \ -srand48 \ -srandom \ +sigprocmask \ statfs \ statvfs \ std_syslog \ strcasecmp \ -strcoll \ -strdup \ -strerror \ -strftime \ +strfmon \ strnlen \ strptime \ -strstr \ strtok_r \ symlink \ -tempnam \ tzset \ unlockpt \ unsetenv \ usleep \ utime \ -vsnprintf \ vasprintf \ asprintf \ nanosleep \ +memmem \ ) -dnl Some systems (like OpenSolaris) do not have nanosleep in libc +AX_FUNC_WHICH_GETHOSTBYNAME_R + +dnl Some systems (like OpenSolaris) do not have nanosleep in libc. PHP_CHECK_FUNC_LIB(nanosleep, rt) -dnl Check for getaddrinfo, should be a better way, but... -dnl Also check for working getaddrinfo +dnl Check for getaddrinfo, should be a better way, but... Also check for working +dnl getaddrinfo. AC_CACHE_CHECK([for getaddrinfo], ac_cv_func_getaddrinfo, [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <netdb.h>]], [[struct addrinfo *g,h;g=&h;getaddrinfo("","",g,&g);]])],[AC_RUN_IFELSE([AC_LANG_SOURCE([[ @@ -758,7 +704,7 @@ if test "$ac_cv_func_getaddrinfo" = yes; then AC_DEFINE(HAVE_GETADDRINFO,1,[Define if you have the getaddrinfo function]) fi -dnl Check for the __sync_fetch_and_add builtin +dnl Check for the __sync_fetch_and_add builtin. AC_CACHE_CHECK([for __sync_fetch_and_add], ac_cv_func_sync_fetch_and_add, [AC_LINK_IFELSE([AC_LANG_PROGRAM([], [[int x;__sync_fetch_and_add(&x,1);]])],[ac_cv_func_sync_fetch_and_add=yes],[ac_cv_func_sync_fetch_and_add=no])]) if test "$ac_cv_func_sync_fetch_and_add" = yes; then @@ -766,13 +712,8 @@ if test "$ac_cv_func_sync_fetch_and_add" = yes; then fi AC_REPLACE_FUNCS(strlcat strlcpy explicit_bzero getopt) -AC_FUNC_UTIME_NULL AC_FUNC_ALLOCA -dnl PHP_AC_BROKEN_SPRINTF -dnl PHP_AC_BROKEN_SNPRINTF -PHP_DECLARED_TIMEZONE PHP_TIME_R_TYPE -PHP_READDIR_R_TYPE PHP_CHECK_IN_ADDR_T AC_CHECK_FUNCS(crypt_r, [ php_crypt_r="1" ], [ php_crypt_r="0" ]) @@ -780,11 +721,21 @@ if test "x$php_crypt_r" = "x1"; then PHP_CRYPT_R_STYLE fi -dnl Check for asm goto support +AC_CACHE_CHECK([for aarch64 CRC32 API], ac_cv_func___crc32d, +[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <arm_acle.h>]],[[__crc32d(0, 0);]])],[ac_cv_func___crc32d=yes],[ac_cv_func___crc32d="no"])]) +if test "$ac_cv_func___crc32d" = "yes"; then + AC_DEFINE([HAVE_AARCH64_CRC32], [1], [Define when aarch64 CRC32 API is available.]) +fi + +dnl Check for asm goto support. AC_CACHE_CHECK([for asm goto], ac_cv__asm_goto, [AC_RUN_IFELSE([AC_LANG_SOURCE([[ int main(void) { +#if defined(__x86_64__) || defined(__i386__) __asm__ goto("jmp %l0\n" :::: end); +#elif defined(__aarch64__) + __asm__ goto("b %l0\n" :::: end); +#endif end: return 0; } @@ -794,58 +745,39 @@ if test "$ac_cv__asm_goto" = yes; then AC_DEFINE(HAVE_ASM_GOTO,1,[Define if asm goto support]) fi -dnl Check for variable length array support -AC_CACHE_CHECK([whether compiler supports VLA], ac_cv__compiler_c99_vla, -[AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include <stdlib.h> - int main(void) { - int i[rand()%10]; - return 0; - } - ]])],[ac_cv__compiler_c99_vla=yes], [ac_cv__compiler_c99_vla=no], [ac_cv__compiler_c99_vla=no])]) - -if test "$ac_cv__compiler_c99_vla" = yes; then - AC_DEFINE(HAVE_COMPILER_C99_VLA, 1, [Compiler supports VLA]) -fi - -dnl Check valgrind support -PHP_ARG_WITH(valgrind, [whether to enable valgrind support], -[ --with-valgrind=DIR Enable valgrind support], yes, no) +dnl Check valgrind support. +PHP_ARG_WITH([valgrind], + [whether to enable valgrind support], + [AS_HELP_STRING([--with-valgrind], + [Enable valgrind support])], + [yes], + [no]) if test "$PHP_VALGRIND" != "no"; then + PKG_CHECK_MODULES([VALGRIND], [valgrind], [have_valgrind="yes"], [have_valgrind="no"]) - AC_MSG_CHECKING([for valgrind header]) - - if test "$PHP_VALGRIND" = "yes"; then - SEARCH_PATH="/usr/local /usr" + if test "$have_valgrind" = "yes"; then + PHP_EVAL_INCLINE($VALGRIND_CFLAGS) + AC_DEFINE(HAVE_VALGRIND, 1, [ ]) else - SEARCH_PATH="$PHP_VALGRIND" - fi - - SEARCH_FOR="/include/valgrind/valgrind.h" - for i in $SEARCH_PATH ; do - if test -r $i/$SEARCH_FOR; then - VALGRIND_DIR=$i + if test "$with_valgrind" = "yes"; then + AC_MSG_ERROR([Valgrind not found. Please install Valgrind.]) fi - done - - if test -z "$VALGRIND_DIR"; then - AC_MSG_RESULT([not found]) - else - AC_MSG_RESULT(found in $VALGRIND_DIR) - AC_DEFINE(HAVE_VALGRIND, 1, [ ]) fi - fi dnl General settings. -dnl ------------------------------------------------------------------------- +dnl ---------------------------------------------------------------------------- PHP_CONFIGURE_PART(General settings) PHP_HELP_SEPARATOR([General settings:]) -PHP_ARG_ENABLE(gcov, whether to include gcov symbols, -[ --enable-gcov Enable GCOV code coverage (requires LTP) - FOR DEVELOPERS ONLY!!], no, no) +PHP_ARG_ENABLE([gcov], + [whether to include gcov symbols], + [AS_HELP_STRING([--enable-gcov], + [Enable GCOV code coverage - FOR DEVELOPERS ONLY!!])], + [no], + [no]) if test "$PHP_GCOV" = "yes"; then @@ -853,7 +785,7 @@ if test "$PHP_GCOV" = "yes"; then AC_MSG_ERROR([GCC is required for --enable-gcov]) fi - dnl Check if ccache is being used + dnl Check if ccache is being used. case `$php_shtool path $CC` in *ccache*[)] gcc_ccache=yes;; *[)] gcc_ccache=no;; @@ -863,79 +795,35 @@ if test "$PHP_GCOV" = "yes"; 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.]) fi - dnl min: 1.5 (i.e. 105, major * 100 + minor for easier comparison) - ltp_version_min="105" - dnl non-working versions, e.g. "1.8 1.18"; - dnl remove "none" when introducing the first incompatible LTP version and - dnl separate any following additions by spaces - ltp_version_exclude="1.8" - - AC_CHECK_PROG(LTP, lcov, lcov) - AC_CHECK_PROG(LTP_GENHTML, genhtml, genhtml) - PHP_SUBST(LTP) - PHP_SUBST(LTP_GENHTML) - - if test "$LTP"; then - AC_CACHE_CHECK([for ltp version], php_cv_ltp_version, [ - php_cv_ltp_version=invalid - ltp_version_vars=`$LTP -v 2>/dev/null | $SED -e 's/^.* //' -e 's/\./ /g' | tr -d a-z` - if test -n "$ltp_version_vars"; then - set $ltp_version_vars - ltp_version="${1}.${2}" - ltp_version_num="`expr ${1} \* 100 + ${2}`" - if test $ltp_version_num -ge $ltp_version_min; then - php_cv_ltp_version="$ltp_version (ok)" - for ltp_check_version in $ltp_version_exclude; do - if test "$ltp_version" = "$ltp_check_version"; then - php_cv_ltp_version=invalid - break - fi - done - fi - fi - ]) - else - ltp_msg="To enable code coverage reporting you must have LTP installed" - AC_MSG_ERROR([$ltp_msg]) - fi - - case $php_cv_ltp_version in - ""|invalid[)] - ltp_msg="This LTP version is not supported (found: $ltp_version, min: $ltp_version_min, excluded: $ltp_version_exclude)." - AC_MSG_ERROR([$ltp_msg]) - LTP="exit 0;" - ;; - esac - - if test -z "$LTP_GENHTML"; then - AC_MSG_ERROR([Could not find genhtml from the LTP package]) - fi - AC_DEFINE(HAVE_GCOV, 1, [Whether you have gcov]) - PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/Makefile.gcov, $abs_srcdir) + PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/build/Makefile.gcov, $abs_srcdir) - dnl Remove all optimization flags from CFLAGS + dnl Remove all optimization flags from CFLAGS. changequote({,}) - CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9s]*//g'` - CXXFLAGS=`echo "$CXXFLAGS" | $SED -e 's/-O[0-9s]*//g'` + CFLAGS=`echo "$CFLAGS" | "${SED}" -e 's/-O[0-9s]*//g'` + CXXFLAGS=`echo "$CXXFLAGS" | "${SED}" -e 's/-O[0-9s]*//g'` changequote([,]) - dnl Add the special gcc flags + dnl Add the special gcc flags. CFLAGS="$CFLAGS -O0 -fprofile-arcs -ftest-coverage" CXXFLAGS="$CXXFLAGS -O0 -fprofile-arcs -ftest-coverage" fi -PHP_ARG_ENABLE(debug, whether to include debugging symbols, -[ --enable-debug Compile with debugging symbols], no, no) +PHP_ARG_ENABLE([debug], + [whether to include debugging symbols], + [AS_HELP_STRING([--enable-debug], + [Compile with debugging symbols])], + [no], + [no]) if test "$PHP_DEBUG" = "yes"; then PHP_DEBUG=1 ZEND_DEBUG=yes changequote({,}) - CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9s]*//g'` - CXXFLAGS=`echo "$CXXFLAGS" | $SED -e 's/-O[0-9s]*//g'` + CFLAGS=`echo "$CFLAGS" | "${SED}" -e 's/-O[0-9s]*//g'` + CXXFLAGS=`echo "$CXXFLAGS" | "${SED}" -e 's/-O[0-9s]*//g'` changequote([,]) - dnl add -O0 only if GCC or ICC is used + dnl Add -O0 only if GCC or ICC is used. if test "$GCC" = "yes" || test "$ICC" = "yes"; then CFLAGS="$CFLAGS -O0" CXXFLAGS="$CXXFLAGS -g -O0" @@ -954,9 +842,23 @@ else ZEND_DEBUG=no fi -PHP_ARG_WITH(layout, layout of installed files, -[ --with-layout=TYPE Set how installed files will be laid out. Type can - be either PHP or GNU @<:@PHP@:>@], PHP, no) +PHP_ARG_ENABLE([rtld-now], + [whether to dlopen extensions with RTLD_NOW instead of RTLD_LAZY], + [AS_HELP_STRING([--enable-rtld-now], + [Use dlopen with RTLD_NOW instead of RTLD_LAZY])], + [no], + [no]) + +if test "$PHP_RTLD_NOW" = "yes"; then + AC_DEFINE(PHP_USE_RTLD_NOW, 1, [ Use dlopen with RTLD_NOW instead of RTLD_LAZY ]) +fi + +PHP_ARG_WITH([layout], + [layout of installed files], + [AS_HELP_STRING([--with-layout=TYPE], + [Set how installed files will be laid out. Type can be either PHP or GNU [PHP]])], + [PHP], + [no]) case $PHP_LAYOUT in GNU) @@ -967,9 +869,12 @@ case $PHP_LAYOUT in ;; esac -PHP_ARG_WITH(config-file-path, path to configuration file, -[ --with-config-file-path=PATH - Set the path in which to look for php.ini @<:@PREFIX/lib@:>@], DEFAULT, no) +PHP_ARG_WITH([config-file-path], + [path to configuration file], + [AS_HELP_STRING([--with-config-file-path=PATH], + [Set the path in which to look for php.ini [PREFIX/lib]])], + [DEFAULT], + [no]) if test "$PHP_CONFIG_FILE_PATH" = "DEFAULT"; then case $PHP_LAYOUT in @@ -983,9 +888,12 @@ if test "$PHP_CONFIG_FILE_PATH" = "DEFAULT"; then fi AC_MSG_CHECKING([where to scan for configuration files]) -PHP_ARG_WITH(config-file-scan-dir,, -[ --with-config-file-scan-dir=PATH - Set the path where to scan for configuration files], DEFAULT, no) +PHP_ARG_WITH([config-file-scan-dir],, + [AS_HELP_STRING([--with-config-file-scan-dir=PATH], + [Set the path where to scan for configuration files])], + [DEFAULT], + [no]) + if test "$PHP_CONFIG_FILE_SCAN_DIR" = "DEFAULT"; then PHP_CONFIG_FILE_SCAN_DIR= fi @@ -993,8 +901,12 @@ AC_MSG_RESULT([$PHP_CONFIG_FILE_SCAN_DIR]) test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS" -PHP_ARG_ENABLE(sigchild, whether to enable PHP's own SIGCHLD handler, -[ --enable-sigchild Enable PHP's own SIGCHLD handler], no, no) +PHP_ARG_ENABLE([sigchild], + [whether to enable PHP's own SIGCHLD handler], + [AS_HELP_STRING([--enable-sigchild], + [Enable PHP's own SIGCHLD handler])], + [no], + [no]) if test "$PHP_SIGCHILD" = "yes"; then AC_DEFINE(PHP_SIGCHILD, 1, [ ]) @@ -1002,8 +914,12 @@ else AC_DEFINE(PHP_SIGCHILD, 0, [ ]) fi -PHP_ARG_ENABLE(libgcc, whether to explicitly link against libgcc, -[ --enable-libgcc Enable explicitly linking against libgcc], no, no) +PHP_ARG_ENABLE([libgcc], + [whether to explicitly link against libgcc], + [AS_HELP_STRING([--enable-libgcc], + [Enable explicitly linking against libgcc])], + [no], + [no]) if test "$PHP_LIBGCC" = "yes"; then PHP_LIBGCC_LIBPATH(gcc) @@ -1014,8 +930,12 @@ if test "$PHP_LIBGCC" = "yes"; then PHP_ADD_LIBRARY(gcc, yes) fi -PHP_ARG_ENABLE(short-tags, whether to enable short tags by default, -[ --disable-short-tags Disable the short-form <? start tag by default], yes, no) +PHP_ARG_ENABLE([short-tags], + [whether to enable short tags by default], + [AS_HELP_STRING([--disable-short-tags], + [Disable the short-form <? start tag by default])], + [yes], + [no]) if test "$PHP_SHORT_TAGS" = "yes"; then AC_DEFINE(DEFAULT_SHORT_OPEN_TAG, "1", [ ]) @@ -1023,8 +943,12 @@ else AC_DEFINE(DEFAULT_SHORT_OPEN_TAG, "0", [ ]) fi -PHP_ARG_ENABLE(dmalloc, whether to enable dmalloc, -[ --enable-dmalloc Enable dmalloc], no, no) +PHP_ARG_ENABLE([dmalloc], + [whether to enable dmalloc], + [AS_HELP_STRING([--enable-dmalloc], + [Enable dmalloc])], + [no], + [no]) if test "$PHP_DMALLOC" = "yes"; then AC_CHECK_LIB(dmalloc, dmalloc_error, [ @@ -1036,19 +960,24 @@ if test "$PHP_DMALLOC" = "yes"; then ]) fi -PHP_ARG_ENABLE(ipv6, whether to enable IPv6 support, -[ --disable-ipv6 Disable IPv6 support], yes, no) +PHP_ARG_ENABLE([ipv6], + [whether to enable IPv6 support], + [AS_HELP_STRING([--disable-ipv6], + [Disable IPv6 support])], + [yes], + [no]) if test "$PHP_IPV6" != "no" && test "$ac_cv_ipv6_support" = yes; then AC_DEFINE(HAVE_IPV6, 1, [Whether to enable IPv6 support]) fi -dnl ## -dnl ## DTRACE CHECKS -dnl ## Note: this has to be done after SAPI configuration! -dnl ## -PHP_ARG_ENABLE(dtrace, whether to enable DTrace support, -[ --enable-dtrace Enable DTrace support], no, no) +dnl DTRACE checks. Note: this has to be done after SAPI configuration. +PHP_ARG_ENABLE([dtrace], + [whether to enable DTrace support], + [AS_HELP_STRING([--enable-dtrace], + [Enable DTrace support])], + [no], + [no]) if test "$PHP_DTRACE" = "yes"; then AC_CHECK_HEADERS([sys/sdt.h], [ @@ -1063,8 +992,11 @@ if test "$PHP_DTRACE" = "yes"; then fi AC_MSG_CHECKING([how big to make fd sets]) -PHP_ARG_ENABLE(fd-setsize,, -[ --enable-fd-setsize Set size of descriptor sets], no, no) +PHP_ARG_ENABLE([fd-setsize],, + [AS_HELP_STRING([--enable-fd-setsize], + [Set size of descriptor sets])], + [no], + [no]) if test "$PHP_FD_SETSIZE" != "no"; then if test "0$PHP_FD_SETSIZE" -gt 0 2>/dev/null; then @@ -1077,8 +1009,14 @@ else AC_MSG_RESULT([using system default]) fi +PHP_ARG_ENABLE([werror],, + [AS_HELP_STRING([--enable-werror], + [Enable -Werror])], + [no], + [no]) + dnl Extension configuration. -dnl ------------------------------------------------------------------------- +dnl ---------------------------------------------------------------------------- PHP_HELP_SEPARATOR([Extensions: @@ -1094,21 +1032,53 @@ PHP_HELP_SEPARATOR([Extensions: PHP_CONFIGURE_PART(Configuring extensions) -dnl -dnl Check if all enabled by default extensions should be disabled -dnl - -AC_ARG_ENABLE(all, -[ --disable-all Disable all extensions which are enabled by default -], [ - PHP_ENABLE_ALL=$enableval -]) +dnl Check if all enabled by default extensions should be disabled. +AC_ARG_ENABLE([all], + [AS_HELP_STRING([--disable-all], + [Disable all extensions which are enabled by default])], + [PHP_ENABLE_ALL=$enableval]) -# reading config stubs +dnl Reading config stubs. esyscmd(./build/config-stubs ext) -dnl Extensions post-config -dnl ------------------------------------------------------------------------- +dnl Extensions post-config. +dnl ---------------------------------------------------------------------------- + +dnl Align segments on huge page boundary +case $host_alias in + i[[3456]]86-*-linux-* | x86_64-*-linux-*) + AC_MSG_CHECKING(linker support for -zcommon-page-size=2097152) + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -Wl,-zcommon-page-size=2097152 -Wl,-zmax-page-size=2097152" + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[int main() {return 0;}]])], + [ac_cv_common_page_size=yes], + [ac_cv_common_page_size=no], + [ac_cv_common_page_size=no]) + LDFLAGS=$save_LDFLAGS + if test "$ac_cv_common_page_size" = "yes"; then + AC_MSG_RESULT([yes]) + EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM -Wl,-zcommon-page-size=2097152 -Wl,-zmax-page-size=2097152" + else + AC_MSG_RESULT([no]) + AC_MSG_CHECKING(linker support for -zmax-page-size=2097152) + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -Wl,-zmax-page-size=2097152" + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[int main() {return 0;}]])], + [ac_cv_max_page_size=yes], + [ac_cv_max_page_size=no], + [ac_cv_max_page_size=no]) + LDFLAGS=$save_LDFLAGS + if test "$ac_cv_max_page_size" = "yes"; then + AC_MSG_RESULT([yes]) + EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM -Wl,-zmax-page-size=2097152" + else + AC_MSG_RESULT([no]) + fi + fi + ;; +esac enable_shared=yes enable_static=yes @@ -1136,8 +1106,8 @@ esac EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS" -dnl this has to be here to prevent the openssl crypt() from -dnl overriding the system provided crypt(). +dnl This has to be here to prevent the openssl crypt() from overriding the +dnl system provided crypt(). if test "$ac_cv_lib_crypt_crypt" = "yes"; then EXTRA_LIBS="-lcrypt $EXTRA_LIBS -lcrypt" fi @@ -1145,30 +1115,31 @@ fi unset LIBS LDFLAGS dnl PEAR -dnl ------------------------------------------------------------------------- +dnl ---------------------------------------------------------------------------- PHP_HELP_SEPARATOR([PEAR:]) PHP_CONFIGURE_PART(Configuring PEAR) -# compatibility +dnl Compatibility if test -z "$with_pear" && test "$enable_pear" = "no"; then with_pear=no fi -# If CLI is disabled -> disable PEAR +dnl If CLI is disabled disable PEAR. if test "$PHP_CLI" = "no"; then with_pear=no fi -PHP_ARG_WITH(pear, [whether to install PEAR], -[ --with-pear=DIR Install PEAR in DIR @<:@PREFIX/lib/php@:>@ - --without-pear Do not install PEAR], DEFAULT, yes) +PHP_ARG_WITH([pear], + [whether to install PEAR], + [AS_HELP_STRING([[--with-pear[=DIR]]], + [Install PEAR in DIR [PREFIX/lib/php]])], + [no], + [yes]) if test "$PHP_PEAR" != "no"; then - dnl - dnl PEAR dependencies - dnl + dnl PEAR dependencies. if test "$PHP_XML" = "no"; then pear_error_msg="$pear_error_msg PEAR requires XML to be enabled. Add --enable-xml to the configure line. (or --without-pear)" @@ -1178,10 +1149,12 @@ if test "$PHP_PEAR" != "no"; then AC_MSG_ERROR([$pear_error_msg]) fi + AC_MSG_WARN([The --with-pear option is deprecated]) + install_pear="install-pear" PEAR_INSTALLDIR=$PHP_PEAR - if test "$PHP_PEAR" = "DEFAULT" || test "$PHP_PEAR" = "yes"; then + if test "$PHP_PEAR" = "yes"; then case $PHP_LAYOUT in GNU) PEAR_INSTALLDIR=$datadir/pear;; *) PEAR_INSTALLDIR=$libdir/php;; @@ -1191,9 +1164,8 @@ if test "$PHP_PEAR" != "no"; then PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/pear/Makefile.frag,$abs_srcdir/pear,pear) fi - dnl Configuring Zend and TSRM. -dnl ------------------------------------------------------------------------- +dnl ---------------------------------------------------------------------------- PHP_HELP_SEPARATOR([Zend:]) PHP_CONFIGURE_PART(Configuring Zend) @@ -1222,7 +1194,6 @@ unset LIBS LDFLAGS PHP_HELP_SEPARATOR([TSRM:]) PHP_CONFIGURE_PART(Configuring TSRM) -TSRM_BASIC_CHECKS if test "$PHP_THREAD_SAFETY" = "yes"; then TSRM_THREADS_CHECKS fi @@ -1232,6 +1203,8 @@ EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $LDFLAGS" EXTRA_LIBS="$EXTRA_LIBS $LIBS" unset LIBS LDFLAGS +AC_ARG_PROGRAM + test "$prefix" = "NONE" && prefix=/usr/local test "$exec_prefix" = "NONE" && exec_prefix='${prefix}' test "$program_prefix" = "NONE" && program_prefix= @@ -1259,9 +1232,8 @@ exec_prefix=`eval echo $exec_prefix` libdir=`eval echo $libdir` datadir=`eval eval echo $datadir` -dnl Build extension directory path - -ZEND_MODULE_API_NO=`$EGREP '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modules.h|$SED 's/#define ZEND_MODULE_API_NO //'` +dnl Build extension directory path. +ZEND_MODULE_API_NO=`$EGREP '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modules.h|"${SED}" 's/#define ZEND_MODULE_API_NO //'` if test -z "$EXTENSION_DIR"; then extbasedir=$ZEND_MODULE_API_NO @@ -1299,7 +1271,7 @@ case $PHP_LAYOUT in ;; esac -dnl Expand all directory names for use in macros/constants +dnl Expand all directory names for use in macros/constants. EXPANDED_PEAR_INSTALLDIR=`eval echo $PEAR_INSTALLDIR` EXPANDED_EXTENSION_DIR=`eval echo $EXTENSION_DIR` EXPANDED_LOCALSTATEDIR=`eval echo $localstatedir` @@ -1344,22 +1316,22 @@ fi EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS" EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS" -# SOURCE_DATE_EPOCH for reproducible builds https://reproducible-builds.org/specs/source-date-epoch/ +dnl SOURCE_DATE_EPOCH for reproducible builds +dnl https://reproducible-builds.org/specs/source-date-epoch/ PHP_BUILD_DATE=`date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y-%m-%d 2>/dev/null` if test $? -ne 0 ; then PHP_BUILD_DATE=`date -u +%Y-%m-%d` fi AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date]) -PHP_UNAME=`uname -a | xargs` +UNAME=`uname -a | xargs` +PHP_UNAME=${PHP_UNAME:-$UNAME} AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output]) PHP_OS=`uname | xargs` AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output]) PHP_SUBST_OLD(PHP_INSTALLED_SAPIS) -PHP_SUBST(PHP_EXECUTABLE) - PHP_SUBST(PHP_FASTCGI_OBJS) PHP_SUBST(PHP_SAPI_OBJS) PHP_SUBST(PHP_BINARY_OBJS) @@ -1373,8 +1345,6 @@ PHP_SUBST(EXT_LIBS) PHP_SUBST_OLD(abs_builddir) PHP_SUBST_OLD(abs_srcdir) -PHP_SUBST_OLD(php_abs_top_builddir) -PHP_SUBST_OLD(php_abs_top_srcdir) PHP_SUBST(bindir) PHP_SUBST(sbindir) @@ -1426,7 +1396,6 @@ PHP_SUBST_OLD(PHP_VERSION) PHP_SUBST_OLD(PHP_VERSION_ID) PHP_SUBST(SHELL) PHP_SUBST(SHARED_LIBTOOL) -PHP_SUBST(WARNING_LEVEL) PHP_SUBST(PHP_FRAMEWORKS) PHP_SUBST(PHP_FRAMEWORKPATH) PHP_SUBST(INSTALL_HEADERS) @@ -1439,34 +1408,25 @@ if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then CPPFLAGS="$CPPFLAGS $ac_cv_pthreads_cflags" fi -dnl This will go away, if we have a facility to run per-extension code -dnl after the thread_safety decision was done -if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then - CPPFLAGS="$CPPFLAGS -DTHREAD=1" +if test "$PHP_WERROR" = "yes"; then + CFLAGS="$CFLAGS -Werror" + CPPFLAGS="$CPPFLAGS -Werror" fi -ZEND_EXT_TYPE="zend_extension" -PHP_SUBST(ZEND_EXT_TYPE) - dnl -dnl Libtool creation +dnl Libtool creation. dnl PHP_HELP_SEPARATOR([Libtool:]) PHP_CONFIGURE_PART(Configuring libtool) -LDFLAGS="$LDFLAGS $PHP_AIX_LDFLAGS" +dnl Silence warning: `ar: 'u' modifier ignored since 'D' is the default` +dnl See https://github.com/php/php-src/pull/3017 +AC_SUBST(AR_FLAGS, [cr]) -dnl Autoconf 2.13's libtool checks go slightly nuts on Mac OS X 10.5 and 10.6. -dnl This hack works around it. Ugly. -case $host_alias in -*darwin9*|*darwin10*) - ac_cv_exeext= - ;; -esac - -dnl Only allow AC_PROG_CXX and AC_PROG_CXXCPP if they are explicitly called (by PHP_REQUIRE_CXX). -dnl Otherwise AC_PROG_LIBTOOL fails if there is no working C++ compiler. +dnl Only allow AC_PROG_CXX and AC_PROG_CXXCPP if they are explicitly called (by +dnl PHP_REQUIRE_CXX). Otherwise AC_PROG_LIBTOOL fails if there is no working C++ +dnl compiler. AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [], [ undefine([AC_PROG_CXX]) AC_DEFUN([AC_PROG_CXX], []) @@ -1511,9 +1471,9 @@ PHP_SUBST(install_binary_targets) PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/]) -PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) +PHP_ADD_SOURCES(TSRM, TSRM.c, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) -PHP_ADD_SOURCES(main, main.c snprintf.c spprintf.c php_sprintf.c \ +PHP_ADD_SOURCES(main, main.c snprintf.c spprintf.c \ fopen_wrappers.c alloca.c php_scandir.c \ php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \ strlcat.c explicit_bzero.c mergesort.c reentrancy.c php_variables.c php_ticks.c \ @@ -1536,16 +1496,16 @@ PHP_ADD_SOURCES(Zend, \ zend_execute_API.c zend_highlight.c zend_llist.c \ zend_vm_opcodes.c zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \ zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \ - zend_list.c zend_builtin_functions.c zend_sprintf.c \ + zend_list.c zend_builtin_functions.c \ zend_ini.c zend_sort.c zend_multibyte.c zend_ts_hash.c zend_stream.c \ zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c zend_gc.c \ - zend_closures.c zend_float.c zend_string.c zend_signal.c zend_generators.c \ + zend_closures.c zend_weakrefs.c zend_float.c zend_string.c zend_signal.c zend_generators.c \ zend_virtual_cwd.c zend_ast.c zend_objects.c zend_object_handlers.c zend_objects_API.c \ zend_default_classes.c zend_inheritance.c zend_smart_str.c zend_cpuinfo.c, \ -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) -dnl Selectively disable optimization due to high RAM usage during -dnl compiling the executor. +dnl Selectively disable optimization due to high RAM usage during compiling the +dnl executor. if test -n "$GCC" && test "$ZEND_INLINE_OPTIMIZATION" != "yes"; then flag=-O0 else @@ -1559,7 +1519,6 @@ PHP_ADD_BUILD_DIR(TSRM) PHP_ADD_BUILD_DIR(Zend) PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/scripts/Makefile.frag,$abs_srcdir/scripts,scripts) -PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/Makefile.frag,$abs_srcdir/Zend,Zend) PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/Zend/Makefile.frag,$abs_srcdir/Zend,Zend) PHP_GEN_BUILD_DIRS @@ -1567,83 +1526,57 @@ PHP_GEN_GLOBAL_MAKEFILE AC_DEFINE([HAVE_BUILD_DEFS_H], 1, [ ]) -$php_shtool mkdir -p pear/scripts +dnl Make directories when building in a separate build directory. +$php_shtool mkdir -p pear $php_shtool mkdir -p scripts $php_shtool mkdir -p scripts/man1 -ALL_OUTPUT_FILES="php7.spec main/build-defs.h \ +ALL_OUTPUT_FILES="main/build-defs.h \ scripts/phpize scripts/man1/phpize.1 \ scripts/php-config scripts/man1/php-config.1 \ $PHP_OUTPUT_FILES" -dnl -dnl Check for unknown configure options -dnl -PHP_CHECK_CONFIGURE_OPTIONS - -dnl -dnl Generate build files -dnl +dnl Generate build files. AC_CONFIG_FILES([$ALL_OUTPUT_FILES]) -AC_CONFIG_COMMANDS([default],[],[ + +AC_CONFIG_COMMANDS_PRE([PHP_PATCH_CONFIG_HEADERS([main/php_config.h.in])]) + +AC_CONFIG_COMMANDS([default],[ +cat <<X + ++--------------------------------------------------------------------+ +| License: | +| This software is subject to the PHP License, available in this | +| distribution in the file LICENSE. By continuing this installation | +| process, you are bound by the terms of this license agreement. | +| If you do not agree with the terms of this license, you must abort | +| the installation process at this point. | ++--------------------------------------------------------------------+ + +Thank you for using PHP. + +X +],[ if test "\$CONFIG_FILES" = "$ALL_OUTPUT_FILES" || test "\$CONFIG_FILES" = " $ALL_OUTPUT_FILES" || test -z "\$CONFIG_FILES"; then REDO_ALL=yes fi -################################################################ -# Create configuration headers -# - -test -d TSRM || $php_shtool mkdir TSRM -echo '#include <../main/php_config.h>' > TSRM/tsrm_config.h - +dnl Create configuration headers. +dnl ---------------------------------------------------------------------------- test -d Zend || $php_shtool mkdir Zend cat >Zend/zend_config.h <<FEO #include <../main/php_config.h> -#if defined(APACHE) && defined(PHP_API_VERSION) -#undef HAVE_DLFCN_H -#endif FEO -# run this only when generating all the files? +dnl Run this only when generating all the files. if test -n "\$REDO_ALL"; then - # Hacking while airborne considered harmful. - # echo "creating main/internal_functions.c" - extensions="$EXT_STATIC" -dnl mv -f main/internal_functions.c main/internal_functions.c.old 2>/dev/null - sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in $srcdir "$EXTRA_MODULE_PTRS" $AWK \$extensions > main/internal_functions.c + AWK="$AWK" sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_STATIC" > main/internal_functions.c echo "creating main/internal_functions_cli.c" - cli_extensions="$EXT_CLI_STATIC" - sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in $srcdir "$EXTRA_MODULE_PTRS" $AWK \$cli_extensions > main/internal_functions_cli.c - - if test -n "$PHP_APXS_BROKEN"; then - echo "+--------------------------------------------------------------------+" - echo "| WARNING: Your $APXS script is most likely broken." - echo "| |" - echo "| Please go read http://www.php.net/faq.build#faq.build.apxs |" - echo "| and make the changes described there and try again. |" - fi - - if test -n "$DEBUG_LOG"; then - rm -f config.cache -cat <<X -+--------------------------------------------------------------------+ -| *** ATTENTION *** | -| | -| Something is likely to be messed up here, because the configure | -| script was not able to detect a simple feature on your platform. | -| This is often caused by incorrect configuration parameters. Please | -| see the file debug.log for error messages. | -| | -| If you are unable to fix this, send the file debug.log to the | -| php-install@lists.php.net mailing list and include appropriate | -| information about your setup. | -X - fi + AWK="$AWK" sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_CLI_STATIC" > main/internal_functions_cli.c if test "$PHP_SAPI" = "apache2handler"; then if test "$APACHE_VERSION" -ge 2004001; then @@ -1660,21 +1593,8 @@ X fi fi - # Warn about linking Apache with libpthread if oci8 extension is enabled on linux. + dnl Warn about Apache if oci8 extension is enabled on Linux. if test "$PHP_OCI8" != "no"; then - if test "$PHP_SAPI" = "apache"; then - if test `uname` = "Linux"; then -cat <<X -+--------------------------------------------------------------------+ -| *** WARNING *** | -| | -| Please check that your Apache (httpd) is linked with libpthread. | -| If not, you have to recompile Apache with pthread. For more | -| details, see this page: http://www.php.net/manual/ref.oci8.php | -X - fi - fi - if test "$PHP_SIGCHILD" != "yes"; then if test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then cat <<X @@ -1691,33 +1611,6 @@ X fi fi -cat <<X -+--------------------------------------------------------------------+ -| License: | -| This software is subject to the PHP License, available in this | -| distribution in the file LICENSE. By continuing this installation | -| process, you are bound by the terms of this license agreement. | -| If you do not agree with the terms of this license, you must abort | -| the installation process at this point. | -+--------------------------------------------------------------------+ - -Thank you for using PHP. - -X - - # Output unknown configure options - if test "$PHP_UNKNOWN_CONFIGURE_OPTIONS"; then - echo "Notice: Following unknown configure options were used: -$PHP_UNKNOWN_CONFIGURE_OPTIONS - -Check '[$]0 --help' for available options -" - fi - fi ]) AC_OUTPUT - -dnl ## Local Variables: -dnl ## tab-width: 4 -dnl ## End: |