FreeBSD ming port sticks ming.h in /usr/local/include/ming/ming.h and

we weren't finding it there.

diff --git a/ext/ming/config.m4 b/ext/ming/config.m4
index cb4d0351ff70446790cbc749de0aac4549d1bda5..fb9579948f8500e33827a54a84321bd27409299d 100644 (file)
--- a/ext/ming/config.m4
+++ b/ext/ming/config.m4
@@ -18,6 +18,22 @@ if test "$PHP_MING" != "no"; then
     AC_MSG_ERROR(Please reinstall ming distribution. libming.(a|so) not found.)
   fi
 
+  for i in /usr/local /usr; do
+    if test -f $i/lib/libming.$SHLIB_SUFFIX_NAME -o -f $i/lib/libming.a; then
+      MING_DIR=$i
+    fi
+  done
+
+  for i in $MING_DIR/include $MING_DIR/include/ming $MING_DIR/ming/include; do
+    if test -f $i/ming.h; then
+      MING_INC_DIR=$i
+    fi
+  done
+
+  if test -z "$MING_INC_DIR"; then
+    AC_MSG_ERROR(Please reinstall ming distribution. ming.h not found.)
+  fi
+
   PHP_CHECK_LIBRARY(ming, Ming_useSWFVersion, [
     AC_DEFINE(HAVE_MING,1,[ ])
   ],[
@@ -26,7 +42,7 @@ if test "$PHP_MING" != "no"; then
     -L$MING_DIR/lib
   ])
 
-  PHP_ADD_INCLUDE($MING_DIR/include)
+  PHP_ADD_INCLUDE($MING_INC_DIR)
   PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib, MING_SHARED_LIBADD)
 
   PHP_NEW_EXTENSION(ming, ming.c, $ext_shared)