Fixed various decoder/packetizer flush.

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index 33402285f90754c8a86c5359b92a70ed95f421bb..319677fa4cb035492c44a2d96ccce484ef50e4ae 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -311,6 +311,7 @@ case "${host_os}" in
     ;;
   *mingw32* | *cygwin* | *wince* | *mingwce* | *pe*)
     AC_CHECK_TOOL(WINDRES, windres, :)
+    AC_CHECK_TOOL(OBJCOPY, objcopy, :)
 
     case "${host_os}" in
       *wince* | *mingwce* | *mingw32ce* | *pe*)
@@ -514,7 +515,7 @@ AC_FUNC_ALLOCA
 AC_CHECK_FUNCS(fcntl)
 
 dnl Check for Linux system calls
-AC_CHECK_FUNCS([vmsplice eventfd])
+AC_CHECK_FUNCS([vmsplice])
 
 AH_BOTTOM([#include <vlc_fixups.h>])
 
@@ -1085,11 +1086,6 @@ case "${host_cpu}" in
   "")
     ARCH=unknown
     ;;
-  arm*)
-    dnl use arm assembly
-    VLC_ADD_CFLAGS([wma_fixed],[-DCPU_ARM])
-    ARCH="${host_cpu}"
-    ;;
   *)
     ARCH="${host_cpu}"
     ;;
@@ -1565,14 +1561,18 @@ AC_ARG_ENABLE(debug,
 test "${enable_debug}" != "yes" && enable_debug="no"
 AH_TEMPLATE(NDEBUG,
             [Define to 1 if debug code should NOT be compiled])
-AS_IF([test "x${enable_debug}" = "xno"], [AC_DEFINE(NDEBUG)])
+AS_IF([test "x${enable_debug}" = "xno"], [
+  AC_DEFINE(NDEBUG)
+], [
+  AC_CHECK_HEADERS([valgrind/valgrind.h])
+])
 
 dnl
 dnl Allow runing as root (usefull for people runing on embedded platforms)
 dnl
 AC_ARG_ENABLE(run-as-root,
 [  --enable-run-as-root    allow runing VLC as root (default disabled)])
-AS_IF([test "${enable_run_as_root}" == "yes"],[
+AS_IF([test "${enable_run_as_root}" = "yes"],[
     AC_DEFINE(ALLOW_RUN_AS_ROOT, 1,
               [Define to 1 to allow runing VLC as root (uid 0).])
 ])
@@ -3716,6 +3716,9 @@ if test "${enable_x264}" != "no"; then
         VLC_ADD_PLUGIN([x264])
         VLC_ADD_LDFLAGS([x264],[${X264_LIBS}])
         VLC_ADD_CFLAGS([x264],[${X264_CFLAGS}])
+        if echo ${X264_LIBS} |grep -q 'pthreadGC2'; then
+          VLC_ADD_CFLAGS([x264], [-DPTW32_STATIC_LIB])
+        fi
       ],[
         AC_MSG_ERROR([the specified tree hasn't been compiled])
       ])
@@ -3729,6 +3732,9 @@ if test "${enable_x264}" != "no"; then
         VLC_ADD_PLUGIN([x264])
         VLC_ADD_LDFLAGS([x264],[${X264_LIBS}])
         VLC_ADD_CFLAGS([x264],[${X264_CFLAGS}])
+        if echo ${X264_LIBS} |grep -q 'pthreadGC2'; then
+          VLC_ADD_CFLAGS([x264], [-DPTW32_STATIC_LIB])
+        fi
       ],[
         if test "${enable_x264}" = "yes"; then
             AC_MSG_ERROR([Could not find libx264 on your system: you may get it from http://www.videolan.org/x264.html])
@@ -5891,6 +5897,7 @@ AC_CONFIG_FILES([
   po/Makefile.in
   projects/activex/axvlc_rc.rc
   projects/mozilla/npvlc_rc.rc
+  projects/mozilla/vlc.r
   share/Makefile
   share/vlc_win32_rc.rc
   share/libvlc_win32_rc.rc