- Fixed all buildconf warnings + cross-compiling issues

diff --git a/acinclude.m4 b/acinclude.m4
index 0001967d7da241c76c84ad01f62a2a3a09be5c00..314f3cb420ef5ce2ef7ba3c9adeb15d95a051865 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -763,8 +763,8 @@ dnl PHP_REQUIRE_CXX
 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 @@ main() {
     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 @@ main() {
   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 It could be useful for those external libs, that have different precompiled
 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])

diff --git a/configure.in b/configure.in
index 04a03db48e398ec030dd8ac652e87d3f686d8d8e..755cfa6ecbb5227586b6e0c8f37a6d928f25de25 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -159,8 +159,12 @@ case $host_alias in
     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 @@ if test "$ac_cv_sockaddr_storage" = yes; then
 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 @@ int main(void) {
   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])

diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4
index fd455e4544c6c5bab9bd3db0d5f3631a4e06dcee..a47bc382e9655554290ff6cfca8fac1861c7a1b0 100644 (file)
--- a/ext/iconv/config.m4
+++ b/ext/iconv/config.m4
@@ -115,6 +115,10 @@ int main() {
       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])