rasmus Mon Oct 7 20:15:11 2002 EDT
Modified files:
/php4/ext/ming config.m4
Log:
FreeBSD ming port sticks ming.h in /usr/local/include/ming/ming.h and
we weren't finding it there.
Index: php4/ext/ming/config.m4
diff -u php4/ext/ming/config.m4:1.16 php4/ext/ming/config.m4:1.17
--- php4/ext/ming/config.m4:1.16 Mon Apr 29 14:08:15 2002
+++ php4/ext/ming/config.m4 Mon Oct 7 20:15:09 2002
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.16 2002/04/29 18:08:15 sniper Exp $
+dnl $Id: config.m4,v 1.17 2002/10/08 00:15:09 rasmus Exp $
dnl
PHP_ARG_WITH(ming, for MING support,
@@ -18,6 +18,22 @@
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 @@
-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)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
