MFH

3 files changed, 23 insertions, 15 deletions

diff --git a/configure.in b/configure.in
index 3a0ca03283..6572761ea6 100644
--- a/configure.in
+++ b/configure.in
@@ -107,7 +107,8 @@ case "$host_alias" in
 *bsdi*)
     BSD_MAKEFILE=yes;;
 *beos*)
-	LIBS="$LIBS -lbe -lroot"
+	beos_threads=1
+	LIBS="$LIBS -lbe -lroot";;
 esac
 
 AM_PROG_CC_STDC
@@ -249,11 +250,13 @@ dnl The sin may be in a library which need not be specifed
 dnl as well as res_search resides in libsocket
 AC_CHECK_LIB(m, sin)
 
-AC_CHECK_LIB(bind, inet_aton, [
-  AC_ADD_LIBRARY(bind)
-  AC_DEFINE(HAVE_LIBBIND,1,[Whether you have bind]) ], [
-    AC_CHECK_LIB(resolv, inet_aton)
-  ]) 
+dnl Only include libbind if inet_aton is not found in 
+dnl libresolv.
+AC_CHECK_LIB(resolv, inet_aton. [], [
+  AC_CHECK_LIB(bind, inet_aton, [], [
+    AC_CHECK_LIB(bind, __inet_aton)
+  ])
+])
 
 dnl The res_search may be in libsocket as well, and if it is
 dnl make sure to check for dn_skipname in libresolv, or if res_search
diff --git a/ext/ming/config.m4 b/ext/ming/config.m4
index 234931d622..d8d0ad2937 100644
--- a/ext/ming/config.m4
+++ b/ext/ming/config.m4
@@ -1,15 +1,12 @@
 dnl $Id$
 dnl config.m4 for extension libming
-dnl don't forget to call PHP_EXTENSION(ming)
-dnl This file is a modified version of config.m4
-dnl in php4/ext/mcrypt
 
-PHP_ARG_WITH(ming, for ming support,
+PHP_ARG_WITH(ming, whether to include ming support,
 [  --with-ming[=DIR]        Include ming support])
 
 if test "$PHP_MING" != "no"; then
-  for i in /usr/lib /usr/local /usr $PHP_MING; do
-    if test -r $i/libming.so; then
+  for i in $PHP_MING /usr/local /usr; do
+    if test -r $i/lib/libming.so; then
       MING_DIR=$i
     fi
   done
@@ -18,11 +15,16 @@ if test "$PHP_MING" != "no"; then
     AC_MSG_ERROR(Please reinstall libming.so - I cannot find libming.so)
   fi
 
-  AC_ADD_INCLUDE($MING_DIR)
+  AC_ADD_INCLUDE($MING_DIR/include)
 
   PHP_SUBST(MING_SHARED_LIBADD)
-  AC_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR, MING_SHARED_LIBADD)
-  AC_DEFINE(HAVE_MING,1,[ ])
+  AC_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib, MING_SHARED_LIBADD)
+
+  AC_CHECK_LIB(ming, Ming_setScale, [
+    AC_DEFINE(HAVE_MING,1,[ ])
+  ],[
+    AC_MSG_ERROR(Ming library 0.1.0 or greater required.)
+  ])
 
   PHP_EXTENSION(ming, $ext_shared)
 fi
diff --git a/ext/ming/ming.c b/ext/ming/ming.c
index e9b41d6e8b..f2203c2e59 100644
--- a/ext/ming/ming.c
+++ b/ext/ming/ming.c
@@ -23,6 +23,7 @@
 
 #if HAVE_MING
 #include "ext/standard/info.h"
+#include "ext/standard/file.h"
 #include "php_ming.h"
 
 static zend_function_entry ming_functions[] = {
@@ -2955,7 +2956,9 @@ PHP_MINIT_FUNCTION(ming)
   CONSTANT("SWFTEXTFIELD_WORDWRAP",       SWFTEXTFIELD_WORDWRAP);
   CONSTANT("SWFTEXTFIELD_DRAWBOX",        SWFTEXTFIELD_DRAWBOX);
   CONSTANT("SWFTEXTFIELD_NOSELECT",       SWFTEXTFIELD_NOSELECT);
+#ifdef SWFTEXTFIELD_HTML
   CONSTANT("SWFTEXTFIELD_HTML",           SWFTEXTFIELD_HTML);
+#endif
 
   /* flags for SWFTextField_align */
   CONSTANT("SWFTEXTFIELD_ALIGN_LEFT",     SWFTEXTFIELD_ALIGN_LEFT);