X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=18653372e17b5373e27b67d2fa0ff247835b18d8;hb=af23abe4b8908ee9067b412fce5b93918e8750b1;hp=17629a6c1df02bd6cf5532430126de8cc7022d32;hpb=55a578529adf3d194d878a81fc3bab48f688d393;p=vlc

diff --git a/configure.ac b/configure.ac
index 17629a6c1d..18653372e1 100644
--- 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,8 +2609,9 @@ 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}/libavcodec/libpostproc ${+real_ffmpeg_tree}/libavcodec/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)
@@ -5161,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`]])
@@ -5181,7 +5183,6 @@ then
       else
         xpidl_path="`${MOZILLA_CONFIG} --prefix`/bin"
       fi	
-    fi
     dnl End of moz_sdk = ""
   else
     dnl special case for mingw32
@@ -5244,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
@@ -5378,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