cvs: php-src / configure.in

hyanantha Wed Jul 27 07:48:15 2005 EDT Modified files: /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.575&r2=1.576&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.575 php-src/configure.in:1.576 --- php-src/configure.in:1.575 Thu Jul 14 10:00:57 2005 +++ php-src/configure.in Wed Jul 27 07:48:14 2005 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.575 2005/07/14 14:00:57 andi Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.576 2005/07/27 11:48:14 hyanantha Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -178,14 +178,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) ;; @@ -1047,11 +1044,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_INSTALL_CLI_TARGET="install-cli"