diff options
Diffstat (limited to 'build/php.m4')
| -rw-r--r-- | build/php.m4 | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/build/php.m4 b/build/php.m4 index e91ef9887c..f5351ad4eb 100644 --- a/build/php.m4 +++ b/build/php.m4 @@ -745,7 +745,7 @@ dnl dnl PHP_BUILD_THREAD_SAFE dnl AC_DEFUN([PHP_BUILD_THREAD_SAFE],[ - enable_maintainer_zts=yes + enable_zts=yes if test "$pthreads_working" != "yes"; then AC_MSG_ERROR([ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads.]) fi @@ -768,7 +768,7 @@ dnl PHP_BUILD_SHARED dnl AC_DEFUN([PHP_BUILD_SHARED],[ PHP_BUILD_PROGRAM - OVERALL_TARGET=libphp[]$PHP_MAJOR_VERSION[.la] + OVERALL_TARGET=libphp.la php_sapi_module=shared php_c_pre=$shared_c_pre @@ -785,7 +785,7 @@ dnl PHP_BUILD_STATIC dnl AC_DEFUN([PHP_BUILD_STATIC],[ PHP_BUILD_PROGRAM - OVERALL_TARGET=libphp[]$PHP_MAJOR_VERSION[.la] + OVERALL_TARGET=libphp.la php_sapi_module=static ]) @@ -794,7 +794,7 @@ dnl PHP_BUILD_BUNDLE dnl AC_DEFUN([PHP_BUILD_BUNDLE],[ PHP_BUILD_PROGRAM - OVERALL_TARGET=libs/libphp[]$PHP_MAJOR_VERSION[.bundle] + OVERALL_TARGET=libs/libphp.bundle php_sapi_module=static ]) @@ -851,7 +851,7 @@ AC_DEFUN([PHP_SHARED_MODULE],[ \$(LIBTOOL) --mode=install cp $3/$1.$suffix \$(phplibdir) $3/$1.$suffix: \$($2) \$(translit($1,a-z_-,A-Z__)_SHARED_DEPENDENCIES) - \$(LIBTOOL) --mode=link ifelse($4,,[\$(CC)],[\$(CXX)]) \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o [\$]@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$($2) \$(translit($1,a-z_-,A-Z__)_SHARED_LIBADD) + \$(LIBTOOL) --mode=link --tag=disable-static ifelse($4,,[\$(CC)],[\$(CXX)]) \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o [\$]@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$($2) \$(translit($1,a-z_-,A-Z__)_SHARED_LIBADD) EOF ]) @@ -1120,7 +1120,7 @@ AC_CACHE_CHECK(for type of reentrant time-related functions, ac_cv_time_r_type,[ AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include <time.h> -main() { +int main() { char buf[27]; struct tm t; time_t old = 0; @@ -1136,7 +1136,7 @@ return (1); ],[ AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include <time.h> -main() { +int main() { struct tm t, *s; time_t old = 0; char buf[27], *p; @@ -1175,8 +1175,9 @@ AC_DEFUN([PHP_DOES_PWRITE_WORK],[ #include <fcntl.h> #include <unistd.h> #include <errno.h> +#include <stdlib.h> $1 - main() { + int main() { int fd = open("conftest_in", O_WRONLY|O_CREAT, 0600); if (fd < 0) exit(1); @@ -1208,8 +1209,9 @@ AC_DEFUN([PHP_DOES_PREAD_WORK],[ #include <fcntl.h> #include <unistd.h> #include <errno.h> +#include <stdlib.h> $1 - main() { + int main() { char buf[3]; int fd = open("conftest_in", O_RDONLY); if (fd < 0) exit(1); @@ -1462,6 +1464,7 @@ dnl Even newer glibcs have a different seeker definition. AC_RUN_IFELSE([AC_LANG_SOURCE([[ #define _GNU_SOURCE #include <stdio.h> +#include <stdlib.h> struct cookiedata { __off64_t pos; @@ -1478,7 +1481,7 @@ int seeker(void *cookie, __off64_t *position, int whence) cookie_io_functions_t funcs = {reader, writer, seeker, closer}; -main() { +int main() { struct cookiedata g = { 0 }; FILE *fp = fopencookie(&g, "r", funcs); @@ -1597,7 +1600,7 @@ AC_DEFUN([PHP_CHECK_FUNC_LIB],[ if test "$found" = "yes"; then ac_libs=$LIBS LIBS="$LIBS -l$2" - AC_RUN_IFELSE([AC_LANG_SOURCE([[main() { return (0); }]])],[found=yes],[found=no],[found=no]) + AC_RUN_IFELSE([AC_LANG_SOURCE([[int main() { return (0); }]])],[found=yes],[found=no],[found=no]) LIBS=$ac_libs fi @@ -2283,7 +2286,7 @@ AC_DEFUN([PHP_TEST_WRITE_STDOUT],[ #define TEXT "This is the test message -- " -main() +int main() { int n; |