From: Dan Kalowsky <kalowsky@php.net>
Date: Wed, 14 Aug 2002 16:39:26 +0000 (+0000)
Subject: Fix for Bug #18794, and probably various others with nsapi
X-Git-Tag: php-4.3.0dev_zend2_alpha3~56
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=398288f236e43127b1b75f5588d0c5b91fbaeb5b;p=php

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

diff --git a/sapi/nsapi/config.m4 b/sapi/nsapi/config.m4
index f09ef1dd09..666d067a78 100644
--- 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)