Fix for Bug #18794, and probably various others with nsapi

diff --git a/sapi/nsapi/config.m4 b/sapi/nsapi/config.m4
index f09ef1dd09de244d1efc304e0548858622f977e8..666d067a78b91a29cf7e1d0c0d47b2e5df07f7dc 100644 (file)
--- a/sapi/nsapi/config.m4
+++ b/sapi/nsapi/config.m4
@@ -20,11 +20,13 @@ if test "$PHP_NSAPI" != "no"; then
     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)