[Sumover-dev] [svn commit] r4588 - vic/branches/mpeg4

[sumover-dev at cs.ucl.ac.uk]

Author: douglask
Date: Wed Feb  3 13:23:20 2010
New Revision: 4588

Modified:
   vic/branches/mpeg4/configure.in

Log:
Ensure X11 grabber is built on all platforms other than MacOS X and Windows


Modified: vic/branches/mpeg4/configure.in
==============================================================================
--- vic/branches/mpeg4/configure.in	(original)
+++ vic/branches/mpeg4/configure.in	Wed Feb  3 13:23:20 2010
@@ -192,9 +192,7 @@
         V_OBJ_GRABBER="$V_OBJ_GRABBER  video/tinyjpeg.o video/jidctflt.o"
 fi
 
-AC_ARG_WITH(decklink,
-    AC_HELP_STRING([--with-decklink=dir], [directory containing DeckLinkAPIDispatch.cpp]),
-    with_decklinkapidispatch=${withval})
+AC_ARG_WITH(decklink,--with-decklink=dir     specify directory containing DeckLinkAPIDispatch.cpp, with_decklinkapidispatch=${withval})
 AC_MSG_NOTICE([checking for Blackmagic DeckLink SDK])
 AC_CACHE_VAL(ac_cv_c_decklinkapidispatch,[
         # First check to see if --with-decklink was specified.
@@ -553,10 +551,15 @@
         OPSYS=macosx
         V_OBJ_GRABBER="$V_OBJ_GRABBER video/grabber-macosx.o video/yuv_convert.o"
         ;;
-   *-*-mingw*)
+*-*-mingw*)
         ffmpeg_conf="$ffmpeg_conf --enable-memalign-hack"
         ;;
-   *)
+esac
+
+case "$target" in
+*-*-darwin* | *-*-mingw* | *-*-cygwin* | *-*-pw32*)
+        ;;
+*)
         V_OBJ_GRABBER="$V_OBJ_GRABBER video/grabber-x11.o"
         ;;
 esac