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

diff --git a/ext/mcal/config.m4 b/ext/mcal/config.m4
index 7e2301505aacc9d3baa871f8cc0c24cabfdb1049..5aebe9009c08c617a4871414cd85bcb5a2692ce1 100644 (file)
--- 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