gegl r2728 - in trunk: . operations/external operations/workshop/external

[neo svn gnome org]

Author: neo
Date: Tue Nov 11 09:37:52 2008
New Revision: 2728
URL: http://svn.gnome.org/viewvc/gegl?rev=2728&view=rev

Log:
2008-11-11  Sven Neumann  <sven gimp org>

	* configure.ac: test different ways to include avformat.h and
	define HAVE_LIBAVFORMAT_AVFORMAT_H accordingly.

	* operations/external/ff-load.c
	* operations/workshop/external/ff-save.c: include the avformat.h
	header according to the results of the configure tests.



Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/operations/external/ff-load.c
   trunk/operations/workshop/external/ff-save.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Nov 11 09:37:52 2008
@@ -775,11 +775,18 @@
   PKG_CHECK_MODULES(AVFORMAT, libavformat libavcodec,
     have_libavformat="yes",
     have_libavformat="no  (libavformat not found)")
+  # verify the presence of the avformat.h header
   if test "x$have_libavformat" = "xyes"; then
     gegl_save_CPPFLAGS=$CPPFLAGS
     CPPFLAGS="$AVFORMAT_CFLAGS $CPPFLAGS"
-    AC_CHECK_HEADER([libavformat/avformat.h], ,
+    AC_CHECK_HEADER([libavformat/avformat.h],
+      AC_DEFINE(HAVE_LIBAVFORMAT_AVFORMAT_H, 1,
+                [define to 1 if avformat.h is found in libavformat]),
       [have_libavformat="no  (avformat.h not found where expected)"])
+    # on some systems the header needs to be included differently
+    if test "x$have_libavformat" != "xyes"; then
+      AC_CHECK_HEADER([avformat.h], [have_libavformat="yes"])
+    fi
     CPPFLAGS=$gegl_save_CPPFLAGS
   fi
 else

Modified: trunk/operations/external/ff-load.c
==============================================================================
--- trunk/operations/external/ff-load.c	(original)
+++ trunk/operations/external/ff-load.c	Tue Nov 11 09:37:52 2008
@@ -32,7 +32,12 @@
 
 #include "gegl-chant.h"
 #include <errno.h>
+
+#ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
 #include <libavformat/avformat.h>
+#else
+#include <avformat.h>
+#endif
 
 typedef struct
 {

Modified: trunk/operations/workshop/external/ff-save.c
==============================================================================
--- trunk/operations/workshop/external/ff-save.c	(original)
+++ trunk/operations/workshop/external/ff-save.c	Tue Nov 11 09:37:52 2008
@@ -32,7 +32,12 @@
 #define GEGL_CHANT_C_FILE       "ff-save.c"
 
 #include "gegl-chant.h"
+
+#ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
 #include <libavformat/avformat.h>
+#else
+#include <avformat.h>
+#endif
 
 typedef struct
 {