gegl r2332 - in trunk: . operations/external

[kcozens svn gnome org]

Author: kcozens
Date: Wed May 21 20:58:44 2008
New Revision: 2332
URL: http://svn.gnome.org/viewvc/gegl?rev=2332&view=rev

Log:
2008-05-21  Kevin Cozens  <kcozens cvs gnome org>

	Fix for problem when building on a Mac.

	* configure.ac: Added check for linux/videodev.h and set HAVE_V4L
	if available.

	* operations/external/Makefile.am: Only build the v4l operation if
	HAVE_V4L is set.


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/operations/external/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Wed May 21 20:58:44 2008
@@ -755,6 +755,15 @@
 AC_SUBST(AVFORMAT_LIBS) 
 
 
+###############
+# Check for V4L
+###############
+ 
+have_v4l=no
+AC_CHECK_HEADER(linux/videodev.h, have_v4l=yes)
+
+AM_CONDITIONAL(HAVE_V4L, test "x$have_v4l" = "xyes")
+
 
 
 ################
@@ -858,4 +867,5 @@
   graphviz:       $have_graphviz
   avcodec:        $have_libavcodec
   avformat:       $have_libavformat
+  V4L:            $have_v4l
 ]);

Modified: trunk/operations/external/Makefile.am
==============================================================================
--- trunk/operations/external/Makefile.am	(original)
+++ trunk/operations/external/Makefile.am	Wed May 21 20:58:44 2008
@@ -60,11 +60,11 @@
 display_la_CFLAGS = $(SDL_CFLAGS)
 endif
 
-#if HAVE_V4L
-#ops += v4l.la
-#v4l_la_SOURCES = v4l.c
-#v4l_la_LIBADD = $(op_libs)
-#endif
+if HAVE_V4L
+ops += v4l.la
+v4l_la_SOURCES = v4l.c
+v4l_la_LIBADD = $(op_libs)
+endif
 
 EXTRA_DIST=v4lutils/v4lutils.c v4lutils/v4lutils.h