* modules/gui/wxwidgets/menus.cpp: avoid using STL strings. This gets rid of weird...

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index ab48b639ea27f429b40ea763fdffa55c2698014a..18653372e17b5373e27b67d2fa0ff247835b18d8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2611,7 +2611,7 @@ dnl Those options have to be here because the .pc can be bogus for ffmpeg previo
        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],[-I${real_ffmpeg_tree}])
+        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)
@@ -5162,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`]])
@@ -5182,7 +5183,6 @@ then
       else
         xpidl_path="`${MOZILLA_CONFIG} --prefix`/bin"
       fi       
-    fi
     dnl End of moz_sdk = ""
   else
     dnl special case for mingw32
@@ -5385,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