cvs: php4 /sapi/nsapi config.m4
| From: | Dan Kalowsky | Date: | Wed, 14 Aug 2002 16:39:27 +0000 |
| Subject: | cvs: php4 /sapi/nsapi config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-13358@lists.php.net to get a copy of this message | ||
kalowsky Wed Aug 14 12:39:27 2002 EDT
Modified files:
/php4/sapi/nsapi config.m4
Log:
Fix for Bug #18794, and probably various others with nsapi
Index: php4/sapi/nsapi/config.m4
diff -u php4/sapi/nsapi/config.m4:1.12 php4/sapi/nsapi/config.m4:1.13
--- php4/sapi/nsapi/config.m4:1.12 Thu Aug 8 01:52:15 2002
+++ php4/sapi/nsapi/config.m4 Wed Aug 14 12:39:26 2002
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.12 2002/08/08 05:52:15 kalowsky Exp $
+dnl $Id: config.m4,v 1.13 2002/08/14 16:39:26 kalowsky Exp $
dnl
AC_MSG_CHECKING(for NSAPI support)
@@ -20,11 +20,13 @@
NSAPI_INCLUDE=$PHP_NSAPI/include
AC_MSG_RESULT(Netscape-Enterprise/3.x style)
AC_CHECK_HEADERS([$NSAPI_INCLUDE/nsapi.h])
- elif test -d $PHP_NSAPI/plugins/include ; then
- NSAPI_INCLUDE=$PHP_NSAPI/plugins/include
+ fi
+ if test -d $PHP_NSAPI/plugins/include ; then
+ NSAPI_INCLUDE="$NSAPI_INCLUDE $PHP_NSAPI/plugins/include"
AC_MSG_RESULT(iPlanet/4.x style)
AC_CHECK_HEADERS([$NSAPI_INCLUDE/nsapi.h])
- else
+ 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)
fi
PHP_ADD_INCLUDE($NSAPI_INCLUDE)