From: Marcus Boerger <helly@php.net>
Date: Fri, 3 Nov 2006 18:57:37 +0000 (+0000)
Subject: - Include new headers only if present
X-Git-Tag: RELEASE_1_0_0RC1~1142
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b24dd998e6a0678245ee2b6ef2cc8ff4f052eda3;p=php

- Include new headers only if present
---

diff --git a/ext/ming/config.m4 b/ext/ming/config.m4
index bc92e239a9..4cf3d9c5c2 100644
--- 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 d4dbcdeec4..c2d3758d8e 100644
--- 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))