sniper Wed Dec 21 21:44:13 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/ext/ming config.m4
Log:
MFH:- Fixed bug #35461 (Ming extension fails to compile with ming 0.3beta1)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.311&r2=1.2027.2.312&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.311 php-src/NEWS:1.2027.2.312
--- php-src/NEWS:1.2027.2.311 Wed Dec 21 10:21:31 2005
+++ php-src/NEWS Wed Dec 21 21:44:13 2005
@@ -72,6 +72,7 @@
- Fixed bug #35496 (Crash in mcrypt_generic()/mdecrypt_generic() without
proper init). (Ilia)
- Fixed bug #35490 (socket_sendto() unable to handle IPv6 addresses). (Tony)
+- Fixed bug #35461 (Ming extension fails to compile with ming 0.3beta1). (Jani)
- Fixed bug #35437 (Segfault or Invalid Opcode 137/1/4). (Dmitry)
- Fixed bug #35470 (Assigning global using variable name from array doesn't
function). (Dmitry)
http://cvs.php.net/viewcvs.cgi/php-src/ext/ming/config.m4?r1=1.22.2.5&r2=1.22.2.6&diff_format=u
Index: php-src/ext/ming/config.m4
diff -u php-src/ext/ming/config.m4:1.22.2.5 php-src/ext/ming/config.m4:1.22.2.6
--- php-src/ext/ming/config.m4:1.22.2.5 Tue Nov 29 18:35:24 2005
+++ php-src/ext/ming/config.m4 Wed Dec 21 21:44:13 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.22.2.5 2005/11/29 18:35:24 tony2001 Exp $
+dnl $Id: config.m4,v 1.22.2.6 2005/12/21 21:44:13 sniper Exp $
dnl
PHP_ARG_WITH(ming, for MING support,
@@ -40,6 +40,10 @@
PHP_ADD_INCLUDE($MING_INC_DIR)
PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/$PHP_LIBDIR, MING_SHARED_LIBADD)
+ PHP_CHECK_LIBRARY(ming, SWFPrebuiltClip, [ AC_DEFINE(HAVE_SWFPREBUILTCLIP,
1, [ ]) ], [], [])
+
+ old_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS=-I$MING_INC_DIR
AC_MSG_CHECKING([for destroySWFBlock])
AC_TRY_RUN([
#include "ming.h"
@@ -58,11 +62,7 @@
AC_MSG_RESULT([unknown])
])
- PHP_CHECK_LIBRARY(ming, SWFPrebuiltClip, [ AC_DEFINE(HAVE_SWFPREBUILTCLIP,
1, [ ]) ], [], [])
-
dnl Check Ming version (FIXME: if/when ming has some better way to detect the
version..)
- old_CPPFLAGS=$CPPFLAGS
- CPPFLAGS=-I$MING_INC_DIR
AC_EGREP_CPP(yes, [
#include <ming.h>
#ifdef SWF_SOUND_COMPRESSION
@@ -72,14 +72,16 @@
AC_DEFINE(HAVE_NEW_MING, 1, [ ])
dnl FIXME: This is now unconditional..better check coming later.
AC_DEFINE(HAVE_MING_ZLIB, 1, [ ])
-
- AC_TRY_COMPILE([#include <ming.h>],
- [
-int main(int,void) { SWFMovie_output(NULL, NULL, NULL, 0); return 0; }
- ], [
- AC_DEFINE(HAVE_MING_MOVIE_LEVEL, 1, [ ])
- ], [])
])
+
+ dnl Check if SWFMovie_output() accepts the 4th parameter
+ AC_TRY_COMPILE([
+#include <ming.h>
+ ], [
+int main(void) { SWFMovie_output(NULL, NULL, NULL, 0); return 0; }
+ ], [
+ AC_DEFINE(HAVE_MING_MOVIE_LEVEL, 1, [ ])
+ ], [])
CPPFLAGS=$old_CPPFLAGS
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
