* modules/codec/ffmpeg/audio.c: reduce memory usage a bit.

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index 273181382ed53b5d216110f3f28132e3016a619c..18653372e17b5373e27b67d2fa0ff247835b18d8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -77,7 +77,7 @@ AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
 
 AC_ARG_ENABLE(libtool,
-    [  --enable-libtool        use libtool (default disabled, EXPERIMENTAL)],
+    [  --enable-libtool        use libtool (default disabled)],
     [],[enable_libtool="no"])
 AM_CONDITIONAL(USE_LIBTOOL, [test "${enable_libtool}" != "no"])
 
@@ -2609,10 +2609,13 @@ dnl Those options have to be here because the .pc can be bogus for ffmpeg previo
    if ! fgrep -s "pp_get_context" "${real_ffmpeg_tree}/libavcodec/libavcodec.a"; then
      if test -f "${real_ffmpeg_tree}/libavcodec/libpostproc/libpostproc.a"; then
        VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavcodec/libpostproc ${real_ffmpeg_tree}/libavcodec/libpostproc/libpostproc.a])       
+     elif test -f "${real_ffmpeg_tree}/libpostproc/libpostproc.a"; then 
+       VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libpostproc ${real_ffmpeg_tree}/libpostproc/libpostproc.a])
+        VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[-I${real_ffmpeg_tree}])
      else
        dnl  The given libavcodec wasn't built with --enable-pp
        AC_MSG_RESULT(no)
-       AC_MSG_ERROR([${real_ffmpeg_tree}/libavcodec/libavcodec.a was not compiled with postprocessing support, make sure you configured ffmpeg with --enable-pp])
+       AC_MSG_ERROR([cannot find libpostproc.a in ${real_ffmpeg_tree}/[libavcodec/]libpostproc/. Make sure you configured ffmpeg with --enable-pp])
      fi
    fi
    dnl  Use a custom libffmpeg
@@ -5159,6 +5162,7 @@ then
         ])
         LDFLAGS="${LDFLAGS_save}"
       fi
+    fi
       mozilla=:
       dnl Workaround for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=150490
       VLC_ADD_CPPFLAGS([mozilla],[[`${MOZILLA_CONFIG} --cflags plugin xpcom java | sed 's,-I\([^ ]*\)/mozilla/\([^ ]*\),-I\1/\2 -I\1/mozilla/\2,g' | xargs`]])
@@ -5179,7 +5183,6 @@ then
       else
         xpidl_path="`${MOZILLA_CONFIG} --prefix`/bin"
       fi       
-    fi
     dnl End of moz_sdk = ""
   else
     dnl special case for mingw32
@@ -5242,6 +5245,12 @@ dnl  Java bindings
 dnl
 AC_ARG_ENABLE(java-bindings,
   [  --enable-java-bindings  Enable Java bindings (default disabled)])
+if test "${enable-java-bindings}" = "yes"
+then
+  AC_PROG_JAVA_CC(javac)
+  AC_PROG_JAVAC
+  AC_PROG_JAVA
+fi
 AM_CONDITIONAL(BUILD_JAVA, [test "${enable_java_bindings}" = "yes"])
 
 dnl
@@ -5376,10 +5385,6 @@ AS_IF([test "${enable_shared_libvlc}" != "no" || test "${enable_libtool}" != "no
   FILE_LIBVLC_DLL="!define LIBVLC_DLL libvlc.dll"],
   FILE_LIBVLC_DLL="" )
 
-pic=pic
-AS_IF([test "${SYS}" = "mingw32"], [pic=])
-AC_SUBST(pic)
-
 dnl Import conditional variables generated by bootstrap
 VLC_CONDITIONALS