sniper Wed Mar 28 15:19:45 2001 EDT
Modified files: (Branch: PHP_4_0_5)
/php4 configure.in
/php4/ext/ming ming.c config.m4
Log:
MFH
Index: php4/configure.in
diff -u php4/configure.in:1.221.4.5 php4/configure.in:1.221.4.6
--- php4/configure.in:1.221.4.5 Wed Mar 28 05:36:51 2001
+++ php4/configure.in Wed Mar 28 15:19:44 2001
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.221.4.5 2001/03/28 13:36:51 zeev Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.221.4.6 2001/03/28 23:19:44 sniper Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -107,7 +107,8 @@
*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 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
Index: php4/ext/ming/ming.c
diff -u php4/ext/ming/ming.c:1.3 php4/ext/ming/ming.c:1.3.2.1
--- php4/ext/ming/ming.c:1.3 Mon Mar 12 17:57:38 2001
+++ php4/ext/ming/ming.c Wed Mar 28 15:19:44 2001
@@ -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 @@
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);
Index: php4/ext/ming/config.m4
diff -u php4/ext/ming/config.m4:1.2 php4/ext/ming/config.m4:1.2.2.1
--- php4/ext/ming/config.m4:1.2 Sat Jan 27 02:05:29 2001
+++ php4/ext/ming/config.m4 Wed Mar 28 15:19:44 2001
@@ -1,15 +1,12 @@
-dnl $Id: config.m4,v 1.2 2001/01/27 10:05:29 sas Exp $
+dnl $Id: config.m4,v 1.2.2.1 2001/03/28 23:19:44 sniper Exp $
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 @@
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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
