helly Fri Nov 3 18:57:49 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/ming config.m4 ming.c
Log:
- MFH: Include new headers only if present
http://cvs.php.net/viewvc.cgi/php-src/ext/ming/config.m4?r1=1.22.2.6&r2=1.22.2.6.2.1&diff_format=u
Index: php-src/ext/ming/config.m4
diff -u php-src/ext/ming/config.m4:1.22.2.6
php-src/ext/ming/config.m4:1.22.2.6.2.1
--- php-src/ext/ming/config.m4:1.22.2.6 Wed Dec 21 21:44:13 2005
+++ php-src/ext/ming/config.m4 Fri Nov 3 18:57:49 2006
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.22.2.6 2005/12/21 21:44:13 sniper Exp $
+dnl $Id: config.m4,v 1.22.2.6.2.1 2006/11/03 18:57:49 helly Exp $
dnl
PHP_ARG_WITH(ming, for MING support,
@@ -84,6 +84,9 @@
], [])
CPPFLAGS=$old_CPPFLAGS
+ AC_CHECK_HEADERS([ming/displaylist.h])
+ AC_CHECK_HEADERS([ming/movie.h])
+
PHP_NEW_EXTENSION(ming, ming.c, $ext_shared)
PHP_SUBST(MING_SHARED_LIBADD)
fi
http://cvs.php.net/viewvc.cgi/php-src/ext/ming/ming.c?r1=1.79.2.4.2.2&r2=1.79.2.4.2.3&diff_format=u
Index: php-src/ext/ming/ming.c
diff -u php-src/ext/ming/ming.c:1.79.2.4.2.2
php-src/ext/ming/ming.c:1.79.2.4.2.3
--- php-src/ext/ming/ming.c:1.79.2.4.2.2 Fri Nov 3 14:06:58 2006
+++ php-src/ext/ming/ming.c Fri Nov 3 18:57:49 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ming.c,v 1.79.2.4.2.2 2006/11/03 14:06:58 bjori Exp $ */
+/* $Id: ming.c,v 1.79.2.4.2.3 2006/11/03 18:57:49 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -36,8 +36,12 @@
#include <stdio.h>
#include <math.h>
#include <ming.h>
-#include <ming/displaylist.h>
-#include <ming/movie.h>
+#ifdef HAVE_MING_DISPLAYLIST_H
+# include <ming/displaylist.h>
+#endif
+#ifdef HAVE_MING_MOVIE_H
+# include <ming/movie.h>
+#endif
#define FLOAT_Z_DVAL_PP(x) ((float)Z_DVAL_PP(x))
#define BYTE_Z_LVAL_PP(x) ((byte)Z_LVAL_PP(x))
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
