cvs: php-src / configure.in

sniper Wed Jul 27 11:24:42 2005 EDT Modified files: /php-src configure.in Log: ws http://cvs.php.net/diff.php/php-src/configure.in?r1=1.576&r2=1.577&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.576 php-src/configure.in:1.577 --- php-src/configure.in:1.576 Wed Jul 27 07:48:14 2005 +++ php-src/configure.in Wed Jul 27 11:24:36 2005 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.576 2005/07/27 11:48:14 hyanantha Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.577 2005/07/27 15:24:36 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -640,7 +640,7 @@ PHP_ARG_WITH(config-file-scan-dir,[directory to be scanned for configuration files], [ --with-config-file-scan-dir=PATH ], DEFAULT, no) if test "$PHP_CONFIG_FILE_SCAN_DIR" = "DEFAULT"; then - PHP_CONFIG_FILE_SCAN_DIR="" + PHP_CONFIG_FILE_SCAN_DIR= fi test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS" @@ -1044,20 +1044,22 @@ PHP_BUILD_DATE=date '+%Y-%m-%d' AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date]) + 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_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]) - ;; + 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"