thetaphi Fri Oct 27 07:23:44 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/nsapi config.m4
Log:
Fix build in Sun Webserver 7 (should be in 5.2.0, it's not critical but does
not break mainstream sapis!!!)
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/config.m4?r1=1.17&r2=1.17.6.1&diff_format=u
Index: php-src/sapi/nsapi/config.m4
diff -u php-src/sapi/nsapi/config.m4:1.17 php-src/sapi/nsapi/config.m4:1.17.6.1
--- php-src/sapi/nsapi/config.m4:1.17 Sun Jun 1 21:45:04 2003
+++ php-src/sapi/nsapi/config.m4 Fri Oct 27 07:23:44 2006
@@ -1,10 +1,10 @@
dnl
-dnl $Id: config.m4,v 1.17 2003/06/01 21:45:04 thetaphi Exp $
+dnl $Id: config.m4,v 1.17.6.1 2006/10/27 07:23:44 thetaphi Exp $
dnl
AC_MSG_CHECKING(for NSAPI support)
AC_ARG_WITH(nsapi,
-[ --with-nsapi=DIR Build PHP as NSAPI module for
Netscape/iPlanet/SunONE],[
+[ --with-nsapi=DIR Build PHP as NSAPI module for Netscape/iPlanet/Sun
Webserver],[
PHP_NSAPI=$withval
],[
PHP_NSAPI=no
@@ -13,20 +13,20 @@
if test "$PHP_NSAPI" != "no"; then
if test ! -d $PHP_NSAPI/bin ; then
- AC_MSG_ERROR(Please specify the path to the root of your
Netscape/iPlanet/SunONE server using --with-nsapi=DIR)
+ AC_MSG_ERROR(Please specify the path to the root of your
Netscape/iPlanet/Sun Webserver using --with-nsapi=DIR)
fi
AC_MSG_CHECKING(for NSAPI include files)
if test -d $PHP_NSAPI/include ; then
- NSAPI_INCLUDE=$PHP_NSAPI/include
- AC_MSG_RESULT(Netscape-Enterprise 3.x style)
- AC_CHECK_HEADERS([$NSAPI_INCLUDE/nsapi.h])
+ NSAPI_INC_DIR="$PHP_NSAPI/include"
+ AC_MSG_RESULT(Netscape 3.x / Sun 7.x style)
+ AC_CHECK_HEADERS([$NSAPI_INC_DIR/nsapi.h])
+ NSAPI_INCLUDE="-I$NSAPI_INC_DIR"
fi
if test -d $PHP_NSAPI/plugins/include ; then
- test -n "$NSAPI_INCLUDE" && NSAPI_INC_DIR="-I$NSAPI_INCLUDE"
- NSAPI_INCLUDE="$PHP_NSAPI/plugins/include"
- AC_MSG_RESULT(iPlanet 4.x / SunONE 6.x style)
- AC_CHECK_HEADERS([$NSAPI_INCLUDE/nsapi.h])
- NSAPI_INCLUDE="$NSAPI_INC_DIR -I$NSAPI_INCLUDE"
+ NSAPI_INC_DIR="$PHP_NSAPI/plugins/include"
+ AC_MSG_RESULT(iPlanet 4.x / Sun 6.x style)
+ AC_CHECK_HEADERS([$NSAPI_INC_DIR/nsapi.h])
+ NSAPI_INCLUDE="$NSAPI_INCLUDE -I$NSAPI_INC_DIR"
fi
if test "$NSAPI_INCLUDE" = ""; then
AC_MSG_ERROR(Please check you have nsapi.h in either $PHP_NSAPI/include or
$PHP_NSAPI/plugins/include)
@@ -34,7 +34,7 @@
PHP_EVAL_INCLINE($NSAPI_INCLUDE)
PHP_BUILD_THREAD_SAFE
- AC_DEFINE(HAVE_NSAPI,1,[Whether you have a Netscape/iPlanet/SunONE Server])
+ AC_DEFINE(HAVE_NSAPI,1,[Whether you have a Netscape/iPlanet/Sun Webserver])
PHP_SELECT_SAPI(nsapi, shared, nsapi.c)
INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PHP_NSAPI/bin/"
fi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
