Imported Upstream version 5.0.5upstream/5.0.5

1 files changed, 48 insertions, 15 deletions

diff --git a/configure.in b/configure.in
index 6db4128c1..f3d754c05 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.514.2.46 2005/03/30 21:43:12 zeev Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.514.2.58 2005/09/05 10:41:12 zeev Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -40,7 +40,7 @@ AC_CONFIG_HEADER(main/php_config.h)
 
 MAJOR_VERSION=5
 MINOR_VERSION=0
-RELEASE_VERSION=4
+RELEASE_VERSION=5
 EXTRA_VERSION=""
 VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"
 
@@ -180,6 +180,17 @@ PHP_C_BIGENDIAN
 dnl Platform-specific compile settings.
 dnl -------------------------------------------------------------------------
 
+dnl See bug #28605
+case $host_cpu in
+alpha*)
+    if test "$GCC" = "yes"; then
+      CFLAGS="$CFLAGS -mieee"
+    else
+      CFLAGS="$CFLAGS -ieee"
+    fi
+    ;;
+esac
+
 case $host_alias in
 *solaris*)
     CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"
@@ -204,12 +215,13 @@ case $host_alias in
     fi
     ;;
 *netware*)
-    PHP_OS="NetWare"
-    PHP_UNAME="NetWare"
-    AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[hardcode for each of the cross compiler host])
-    AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[hardcode for each of the cross compiler host])
     PHP_BUILD_PROGRAM
-    PHP_ADD_SOURCES(win32, sendmail.c, -I$CFLAGS,php)
+    PHP_ADD_SOURCES(/main, internal_functions.c,,PHP_GLOBAL_OBJS)
+    PHP_ADD_SOURCES(win32, sendmail.c, -I$CFLAGS, PHP_GLOBAL_OBJS)
+    PHP5LIB_SHARED_LIBADD=\$\(EXTRA_LIBS\)
+    EXTENSION_DIR=sys:/php$MAJOR_VERSION/ext
+    PHP_SUBST(PHP5LIB_SHARED_LIBADD)
+    PHP_SHARED_MODULE(php5lib, PHP_GLOBAL_OBJS, netware)
     ;;
 esac
 
@@ -402,8 +414,7 @@ unix.h \
 utime.h \
 sys/utsname.h \
 sys/ipc.h \
-dlfcn.h \
-inttypes.h
+dlfcn.h
 ],[],[],[
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
@@ -1103,10 +1114,20 @@ EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS"
 
 PHP_BUILD_DATE=`date '+%Y-%m-%d'`
 AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date])
-PHP_UNAME=`uname -a | xargs`
-AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output])
-PHP_OS=`uname | xargs`
-AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output])
+case $host_alias in
+*netware*)
+    PHP_OS="NetWare"
+    PHP_UNAME="NetWare"
+    AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[hardcode for each of the cross compiler host])
+    AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[hardcode for each of the cross compiler host])
+    ;;
+*)
+    PHP_UNAME=`uname -a | xargs`
+    AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output])
+    PHP_OS=`uname | xargs`
+    AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output])
+    ;;
+esac
 
 if test "$PHP_SAPI_CLI" != "no"; then
   PHP_CLI_TARGET="\$(SAPI_CLI_PATH)"
@@ -1143,6 +1164,7 @@ PHP_SUBST(datadir)
 PHP_SUBST(sysconfdir)
 
 PHP_SUBST(AWK)
+PHP_SUBST(EXEEXT)
 PHP_SUBST(CC)
 PHP_SUBST(CFLAGS)
 PHP_SUBST(CFLAGS_CLEAN)
@@ -1268,7 +1290,16 @@ PHP_ADD_SOURCES(main/streams, streams.c cast.c memory.c filter.c \
        plain_wrapper.c userspace.c transports.c xp_socket.c mmap.c)
 
 PHP_ADD_SOURCES(/main, internal_functions.c,, sapi)
-PHP_ADD_SOURCES(/main, internal_functions_cli.c,, cli)
+
+case $host_alias in
+*netware*)
+  PHP_ADD_BUILD_DIR(win32)
+  PHP_ADD_BUILD_DIR(netware)
+  ;;
+*)
+  PHP_ADD_SOURCES(/main, internal_functions_cli.c,, cli)
+  ;;
+esac
 
 PHP_ADD_SOURCES(/Zend, zend_language_parser.c zend_language_scanner.c \
     zend_ini_parser.c zend_ini_scanner.c)
@@ -1313,9 +1344,11 @@ AC_DEFINE([HAVE_BUILD_DEFS_H], 1, [ ])
 
 $php_shtool mkdir -p pear/scripts
 $php_shtool mkdir -p scripts
+$php_shtool mkdir -p scripts/man1
 
 ALL_OUTPUT_FILES="php5.spec main/build-defs.h \
-scripts/phpize scripts/php-config \
+scripts/phpize scripts/man1/phpize.1 \
+scripts/php-config scripts/man1/php-config.1 \
 $PHP_OUTPUT_FILES"
 
 AC_OUTPUT($ALL_OUTPUT_FILES, [], [