Contribs update:

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index e9deddce72fb90ea60f955c27547343bb92a11b2..4504e5848a63c40c24a73e9ffe403c294e8d078e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Autoconf settings for vlc
 
-AC_INIT(vlc, 0.9.0-test1)
+AC_INIT(vlc, 0.9.0-test2)
 VERSION_MAJOR="0"
 VERSION_MINOR="9"
 VERSION_REVISION="0"
@@ -1204,7 +1204,7 @@ if test "${SYS}" != "mingwce"; then
   VLC_ADD_PLUGIN([i422_i420])
   VLC_ADD_PLUGIN([yuy2_i422])
   VLC_ADD_PLUGIN([yuy2_i420])
-  VLC_ADD_PLUGIN([chroma_chain])
+  VLC_ADD_PLUGIN([chain])
   VLC_ADD_PLUGIN([aout_file])
   VLC_ADD_PLUGIN([linear_resampler])
   VLC_ADD_PLUGIN([bandlimited_resampler])
@@ -3586,6 +3586,22 @@ if test "${enable_dirac}" = "yes"; then
   ])
 fi
 
+dnl
+dnl  schroedinger decoder plugin (for dirac format video)
+dnl
+AC_ARG_ENABLE(schroedinger,
+[  --disable-schroedinger   high performance dirac codec (default enabled)])
+if test "${enable_schroedinger}" != "no"; then
+  PKG_CHECK_MODULES(SCHROEDINGER,[schroedinger-1.0 >= 1.0], [
+      VLC_ADD_PLUGIN([schroedinger])
+      VLC_ADD_CFLAGS([schroedinger],[$SCHROEDINGER_CFLAGS])
+      VLC_ADD_LIBS([schroedinger],[$SCHROEDINGER_LIBS]) ], [
+        AS_IF([test "x${enable_schroedinger}" != "x"], [
+          AC_MSG_ERROR([${SCHROEDINGER_PKG_ERRORS}])
+        ])
+])
+fi
+
 dnl
 dnl  PNG decoder module
 dnl
@@ -4946,7 +4962,7 @@ then
  
   ORIGCFLAGS=$CFLAGS
   CFLAGS="$CFLAGS -x objective-c"
-  AC_CHECK_HEADER(QuartzCore/CALayer.h, 
+  AC_TRY_COMPILE([#import <QuartzCore/CALayer.h>], 
   [VLC_ADD_PLUGIN([opengllayer])
   VLC_ADD_OBJCFLAGS([opengllayer], [-isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5])])
   CFLAGS=$ORIGCFLAGS