diff options
| author | Uwe Schindler <thetaphi@php.net> | 2006-10-27 07:23:44 +0000 |
|---|---|---|
| committer | Uwe Schindler <thetaphi@php.net> | 2006-10-27 07:23:44 +0000 |
| commit | 841bac014a918b9b90c4b466c01ab8b8aa7d67b2 (patch) | |
| tree | 8a489040e088af0b86a6304d35fef7da6edfd8a8 | |
| parent | a2f8b5f2ee779408ea678cd04a58c2c04eb4abd0 (diff) | |
| download | php-git-841bac014a918b9b90c4b466c01ab8b8aa7d67b2.tar.gz | |
Fix build in Sun Webserver 7 (should be in 5.2.0, it's not critical but does not break mainstream sapis!!!)
| -rw-r--r-- | sapi/nsapi/config.m4 | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sapi/nsapi/config.m4 b/sapi/nsapi/config.m4 index d23060b029..ce8cc96ae8 100644 --- a/sapi/nsapi/config.m4 +++ b/sapi/nsapi/config.m4 @@ -4,7 +4,7 @@ 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 @@ AC_MSG_RESULT($PHP_NSAPI) 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 @@ if test "$PHP_NSAPI" != "no"; then 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 |