sniper Thu Feb 24 14:27:10 2005 EDT
Modified files:
/php-src acinclude.m4 configure.in
/php-src/ext/iconv config.m4
Log:
- Fixed all buildconf warnings + cross-compiling issues
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.292&r2=1.293&ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.292 php-src/acinclude.m4:1.293
--- php-src/acinclude.m4:1.292 Thu Feb 24 13:11:35 2005
+++ php-src/acinclude.m4 Thu Feb 24 14:27:10 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: acinclude.m4,v 1.292 2005/02/24 18:11:35 sniper Exp $
+dnl $Id: acinclude.m4,v 1.293 2005/02/24 19:27:10 sniper Exp $
dnl
dnl This file contains local autoconf functions.
dnl
@@ -763,8 +763,8 @@
dnl
AC_DEFUN([PHP_REQUIRE_CXX],[
if test -z "$php_cxx_done"; then
- AC_PROG_CXX
- AC_PROG_CXXCPP
+ AC_REQUIRE([AC_PROG_CXX])
+ AC_REQUIRE([AC_PROG_CXXCPP])
php_cxx_done=yes
fi
])
@@ -1048,6 +1048,8 @@
ac_cv_time_r_type=irix
],[
ac_cv_time_r_type=POSIX
+ ],[
+ ac_cv_time_r_type=POSIX
])
],[
ac_cv_time_r_type=POSIX
@@ -1631,7 +1633,13 @@
exit(1);
}
-], [cookie_io_functions_use_off64_t=yes], [])
+], [
+ cookie_io_functions_use_off64_t=yes
+], [
+ cookie_io_functions_use_off64_t=no
+], [
+ cookie_io_functions_use_off64_t=no
+])
else
@@ -1831,7 +1839,7 @@
dnl versions in different directories.
dnl
AC_DEFUN([PHP_CHECK_64BIT],[
- AC_CHECK_SIZEOF(long int)
+ AC_CHECK_SIZEOF(long int, 4)
AC_MSG_CHECKING([checking if we're at 64-bit platform])
if test "$ac_cv_sizeof_long_int" = "4" ; then
AC_MSG_RESULT([no])
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.541&r2=1.542&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.541 php-src/configure.in:1.542
--- php-src/configure.in:1.541 Thu Feb 24 13:11:35 2005
+++ php-src/configure.in Thu Feb 24 14:27:10 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.541 2005/02/24 18:11:35 sniper Exp $ -*- autoconf
-*-
+dnl ## $Id: configure.in,v 1.542 2005/02/24 19:27:10 sniper Exp $ -*- autoconf
-*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -159,8 +159,12 @@
CPPFLAGS="$CPPFLAGS -D_XPG_IV";;
*hpux*)
if test "$GCC" = "yes"; then
- CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
- fi
+ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
+ fi
+ ;;
+*netware*)
+ PHP_BUILD_PROGRAM
+ PHP_ADD_SOURCES(win32, sendmail.c, -I$CFLAGS,php)
;;
esac
@@ -428,13 +432,14 @@
fi
dnl Check if sockaddr data structure includes an "sa_len" member
-
AC_TRY_COMPILE([
#include <sys/types.h>
#include <sys/socket.h>
-], [static struct sockaddr sa; int n = (int) sa.sa_len; return n],
-[AC_DEFINE(HAVE_SOCKADDR_LEN,1,[Whether sockaddr struct has sa_len])],
-[])
+], [
+ static struct sockaddr sa; int n = (int) sa.sa_len; return n
+], [
+ AC_DEFINE(HAVE_SOCKADDR_LEN,1,[Whether sockaddr struct has sa_len])
+], [])
dnl Check for IPv6 support
AC_CACHE_CHECK([for IPv6 support], ac_cv_ipv6_support,
@@ -565,7 +570,7 @@
freeaddrinfo(ai);
exit(0);
}
- ],ac_cv_func_getaddrinfo=yes, ac_cv_func_getaddrinfo=no),
+ ],ac_cv_func_getaddrinfo=yes, ac_cv_func_getaddrinfo=no,
ac_cv_func_getaddrinfo=no),
ac_cv_func_getaddrinfo=no)])
if test "$ac_cv_func_getaddrinfo" = yes; then
AC_DEFINE(HAVE_GETADDRINFO,1,[Define if you have the getaddrinfo function])
http://cvs.php.net/diff.php/php-src/ext/iconv/config.m4?r1=1.30&r2=1.31&ty=u
Index: php-src/ext/iconv/config.m4
diff -u php-src/ext/iconv/config.m4:1.30 php-src/ext/iconv/config.m4:1.31
--- php-src/ext/iconv/config.m4:1.30 Mon Jan 10 16:37:17 2005
+++ php-src/ext/iconv/config.m4 Thu Feb 24 14:27:10 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.30 2005/01/10 21:37:17 tony2001 Exp $
+dnl $Id: config.m4,v 1.31 2005/02/24 19:27:10 sniper Exp $
dnl
PHP_ARG_WITH(iconv, for iconv support,
@@ -115,6 +115,10 @@
AC_MSG_RESULT(no)
PHP_DEFINE([ICONV_SUPPORTS_ERRNO],0,[ext/iconv])
AC_DEFINE([ICONV_SUPPORTS_ERRNO],0,[Whether iconv supports error no or
not])
+ ],[
+ AC_MSG_RESULT(no, cross-compiling)
+ PHP_DEFINE([ICONV_SUPPORTS_ERRNO],0,[ext/iconv])
+ AC_DEFINE([ICONV_SUPPORTS_ERRNO],0,[Whether iconv supports error no or
not])
])
AC_MSG_CHECKING([if your cpp allows macro usage in include lines])
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
