hyanantha Wed Jul 27 07:44:09 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src configure.in
Log:
configure.in
moved the PHP_OS and PHP_UNAME definitions near the place other oses define
them currently it is ggeting redined to build machine values when ./configure
script is generated using autoconf version 2.13 but works fine with autoconf
2.51.
Defining the default EXTENSION_DIR for NetWare
--Kamesh
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.514.2.54&r2=1.514.2.55&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.514.2.54 php-src/configure.in:1.514.2.55
--- php-src/configure.in:1.514.2.54 Mon Jun 20 07:48:23 2005
+++ php-src/configure.in Wed Jul 27 07:44:08 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.514.2.54 2005/06/20 11:48:23 sniper Exp $ -*- sh
-*-
+dnl ## $Id: configure.in,v 1.514.2.55 2005/07/27 11:44:08 hyanantha Exp $ -*-
sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -215,14 +215,11 @@
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(/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)
;;
@@ -1117,10 +1114,20 @@
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)"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
