From: Stig Bakken <ssb@php.net>
Date: Tue, 5 Dec 2000 12:15:18 +0000 (+0000)
Subject: * applied patch by Stig-Ørjan Smelror <Stig.Orjan.Smelror@lincom.no>
X-Git-Tag: php-4.0.5RC1~1011
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2b846ec7e5fdb35a248ea38395d6581abe66be5c;p=php

* applied patch by Stig-Ørjan Smelror <Stig.Orjan.Smelror@lincom.no>
---

diff --git a/ext/mcal/config.m4 b/ext/mcal/config.m4
index 7e2301505a..5aebe9009c 100644
--- a/ext/mcal/config.m4
+++ b/ext/mcal/config.m4
@@ -11,13 +11,13 @@ if test "$PHP_MCAL" != "no"; then
     AC_EXPAND_PATH($PHP_MCAL, MCAL_DIR)
   fi
 
-  for i in $MCAL_DIR $MCAL_DIR/mcal $MCAL_DIR/mcal/include $MCAL_DIR/include; do
+  for i in $MCAL_DIR $MCAL_DIR/mcal $MCAL_DIR/mcal/include $MCAL_DIR/include/mcal $MCAL_DIR/include; do
     if test -r "$i/mcal.h"; then
       MCAL_INCLUDE=$i
     fi
   done
 
-  for i in $MCAL_DIR $MCAL_DIR/mcal $MCAL_DIR/mcal/lib $MCAL_DIR/lib; do
+  for i in $MCAL_DIR $MCAL_DIR/mcal $MCAL_DIR/mcal/lib $MCAL_DIR/lib/mcal $MCAL_DIR/lib; do
     if test -r "$i/libmcal.a"; then
       MCAL_LIBRARY=$i
     fi