- MFH: Include new headers only if present

diff --git a/ext/ming/config.m4 b/ext/ming/config.m4
index bc92e239a99c0e37c66f2cd48072111d3b2aac23..4cf3d9c5c296bca422cac78e1a068fcf0dd81385 100644 (file)
--- a/ext/ming/config.m4
+++ b/ext/ming/config.m4
@@ -84,6 +84,9 @@ int main(void) { SWFMovie_output(NULL, NULL, NULL, 0); return 0; }
   ], [])
   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

diff --git a/ext/ming/ming.c b/ext/ming/ming.c
index 7dab0d1c35ca245f89730637789dc6b07d6e4320..772a6b2a2977b0c99de3999fb8acf8cc19aff98f 100644 (file)
--- a/ext/ming/ming.c
+++ b/ext/ming/ming.c
@@ -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))