X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=6ea583a737a9250d1278e7c36fc9ab133948d5b2;hb=5cf39390c0d9a4c9ef2860746126f0bbad3370b6;hp=a76eb3d24454ec010a9af3f23bffa515bdc97128;hpb=4eb14b4abd9c60d76c0e7fa9f12516b70b2fef2b;p=vlc

diff --git a/configure.ac b/configure.ac
index a76eb3d244..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"
@@ -1133,6 +1133,7 @@ VLC_ADD_PLUGIN([extract])
 VLC_ADD_PLUGIN([sharpen])
 VLC_ADD_PLUGIN([seamcarving])
 VLC_ADD_PLUGIN([croppadd])
+VLC_ADD_PLUGIN([canvas])
 VLC_ADD_PLUGIN([blendbench])
 VLC_ADD_PLUGIN([blend])
 VLC_ADD_PLUGIN([scale])
@@ -1203,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])
@@ -1215,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])
@@ -1693,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
@@ -2044,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`"
@@ -3571,14 +3579,30 @@ dnl
 AC_ARG_ENABLE(dirac,
 [  --enable-dirac          experimental dirac codec (default disabled)])
 if test "${enable_dirac}" = "yes"; then
-  PKG_CHECK_MODULES(DIRAC,[dirac >= 0.9.0], [
+  PKG_CHECK_MODULES(DIRAC,[dirac >= 0.10.0], [
       VLC_ADD_PLUGIN([dirac])
       VLC_ADD_CFLAGS([dirac],[$DIRAC_CFLAGS])
       VLC_ADD_LIBS([dirac],[$DIRAC_LIBS -lstdc++]) ],[
-      AC_MSG_ERROR([libdirac doesn't appear to be installed on you system.])
+      AC_MSG_ERROR([libdirac >= 0.10.0 doesn't appear to be installed on your system.])
   ])
 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
@@ -4411,33 +4435,6 @@ then
       fi ])
 fi
 
-dnl
-dnl  Glide module
-dnl
-AC_ARG_ENABLE(glide,
-  [  --enable-glide          Glide (3dfx) support (default disabled)])
-if test "${enable_glide}" = "yes"
-then
-  CFLAGS_save="${CFLAGS}"
-  AC_ARG_WITH(glide,
-    [    --with-glide=PATH     path to libglide],
-    [ if test "${with_glide}" != "no" -a -n "${with_glide}"
-      then
-        VLC_ADD_CPPFLAGS([glide],[-I${with_glide}/include])
-        VLC_ADD_LIBS([glide],[-L${with_glide}/lib])
-        CFLAGS="$CFLAGS -I${with_glide}/include"
-    fi ])
-   CFLAGS="$CFLAGS -I/usr/include/glide"
-   AC_CHECK_HEADER(glide.h,[   
-      VLC_ADD_PLUGIN([glide])
-      VLC_ADD_LIBS([glide],[-lglide2x -lm])
-      VLC_ADD_CPPFLAGS([glide],[-I/usr/include/glide])
-    ],[
-      AC_MSG_ERROR([You don't have libglide. Install it or do not use --enable-glide])
-     ])
-   CFLAGS="${CFLAGS_save}"
-fi
-
 dnl
 dnl  AA plugin
 dnl
@@ -4966,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
@@ -5615,16 +5612,6 @@ then
   VLC_ADD_PLUGIN([test4])
 fi
 
-dnl
-dnl Microsoft Layer for Unicode for WIN9x/ME
-dnl
-if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"
-then
-    AC_CHECK_LIB(unicows, LoadUnicowsSymbol, [
-        VLC_ADD_LDFLAGS([vlc libvlc],[-Wl,--exclude-libs,libunicows.a -lunicows])
-    ])
-fi
-
 dnl
 dnl  gtk_main plugin
 dnl
@@ -5732,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