X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=6ea583a737a9250d1278e7c36fc9ab133948d5b2;hb=5b492c8481d4dc877f59efd0f06923faece77043;hp=214e4007042be807509be92e9ee6ea5cd4010bfd;hpb=e2a614c82b502ea6c3cdee7d0fc39cbb9627041e;p=vlc

diff --git a/configure.ac b/configure.ac
index 214e400704..6ea583a737 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Autoconf settings for vlc
 
-AC_INIT(vlc,0.9.0-git)
+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])
@@ -1216,6 +1216,7 @@ if test "${SYS}" != "mingwce"; then
   VLC_ADD_PLUGIN([normvol])
   VLC_ADD_PLUGIN([equalizer])
   VLC_ADD_PLUGIN([param_eq])
+  VLC_ADD_PLUGIN([scaletempo])
   VLC_ADD_PLUGIN([converter_float])
   VLC_ADD_PLUGIN([a52tospdif])
   VLC_ADD_PLUGIN([dtstospdif])
@@ -1694,6 +1695,7 @@ AS_IF([test "${enable_vlm}" != "no"], [
   AC_DEFINE(ENABLE_VLM, 1, [Define if you want the VideoLAN manager support])
   VLC_ADD_PLUGIN([telnet])
 ])
+AM_CONDITIONAL([ENABLE_VLM], [test "${enable_vlm}" != "no"])
 
 dnl
 dnl Growl notification plugin
@@ -2045,11 +2047,16 @@ then
         [ VLC_ADD_PLUGIN([dvdread])
           VLC_ADD_LIBS([dvdread],[-ldvdread ${LIBS_dvdcss}])
         ],[
-          if test -n "${enable_dvdread}"
-          then
-            AC_MSG_ERROR([cannot find libdvdread headers])
-          fi
-        ])
+	  AC_CHECK_HEADERS(libdvdread/dvd_reader.h,
+            [ VLC_ADD_PLUGIN([dvdread])
+	      VLC_ADD_LIBS([dvdread],[-ldvdread ${LIBS_dvdcss}])
+	    ],[
+	      if test -n "${enable_dvdread}"
+	      then
+	      AC_MSG_ERROR([cannot find libdvdread headers])
+	     fi
+	   ])
+	])
     else
       AC_MSG_CHECKING(for libdvdread.a in ${with_dvdread_tree})
       real_dvdread_tree="`cd ${with_dvdread_tree} 2>/dev/null && pwd`"
@@ -3580,6 +3587,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
@@ -4940,7 +4963,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
@@ -5696,7 +5719,7 @@ dnl  Handle substvars that use $(top_srcdir)
 dnl
 VLC_CONFIG="top_builddir=\"\$(top_builddir)\" \$(top_builddir)/vlc-config"
 AC_SUBST(VLC_CONFIG)
-CPPFLAGS_save="${CPPFLAGS_save} -I\$(top_srcdir)/include -I\$(top_builddir)/include"
+CPPFLAGS_save="-I\$(top_srcdir)/include -I\$(top_builddir)/include ${CPPFLAGS_save}"
 
 dnl
 dnl  Restore *FLAGS