*BUGFIX*

Windows ports fixes and improvements due to my current work on toxine:
- first experiments with external win32 pthreads,
  more portable code (pthread_t may be a struct)
- headers refactored
- moved dirent win32 replacement to lib/, hide it for frontends,
  used system version, if found, not used non-POSIX dirent->d_reclen
  (this item doesn't work in MinGW), fix memleak in dvb
- separated settings for postproc and avcodec when using external ffmpeg
- check for malloc.h in public xine.m4, used it conditionally in xine headers
- replaced random() by POSIX more common rand()
- prevent one segfault in directx vo plugin, if fails
- M$VC port update

CVS patchset: 7709
CVS date: 2005/08/25 15:36:29

2 files changed, 10 insertions, 3 deletions

diff --git a/m4/ffmpeg.m4 b/m4/ffmpeg.m4
index d228de8a0..51f1eef83 100644
--- a/m4/ffmpeg.m4
+++ b/m4/ffmpeg.m4
@@ -75,13 +75,17 @@ if test x"$external_ffmpeg" != "xno"; then
         AC_CHECK_LIB(postproc, pp_get_context, 
           AC_CHECK_LIB(avcodec, register_avcodec,
             [external_ffmpeg_found=yes
-            FFMPEG_LIBS="${FFMPEG_LIBS} -lavcodec -lpostproc"
+            FFMPEG_POSTPROC_LIBS="${FFMPEG_LIBS} -lpostproc"
+            FFMPEG_LIBS="${FFMPEG_LIBS} -lavcodec"
             break]
           ),,
           [-lavcodec]
         )
       done
-  
+      if test x$FFMPEG_POSTPROC_LIBS = "x"; then
+        FFMPEG_POSTPROC_LIBS="${FFMPEG_LIBS}"
+      fi
+
       dnl result of autodetection
       if test x"$external_ffmpeg_found" = "xyes"; then
         AC_MSG_RESULT([External ffmpeg library was found in ${dir}.])
@@ -99,7 +103,7 @@ configure option --with-external-ffmpeg.
     else
       dnl check specified flags
       CPPFLAGS="${FFMPEG_CPPFLAGS} ${ac_save_CPPFLAGS}"
-      LDFLAGS="${FFMPEG_LIBS} ${ac_save_LDFLAGS}"
+      LDFLAGS="${FFMPEG_LIBS} ${FFMPEG_POSTPROC_LIBS } ${ac_save_LDFLAGS}"
       AC_LINK_IFELSE([#include <avcodec.h>
 #include <postprocess.h>
  
@@ -158,6 +162,7 @@ use internal ffmpeg.
   
   AC_SUBST(FFMPEG_CPPFLAGS)
   AC_SUBST(FFMPEG_LIBS)
+  AC_SUBST(FFMPEG_POSTPROC_LIBS)
   
 else
   AC_MSG_RESULT([using included ffmpeg])
diff --git a/m4/xine.m4 b/m4/xine.m4
index 3f361bfbd..316ca4918 100644
--- a/m4/xine.m4
+++ b/m4/xine.m4
@@ -210,4 +210,6 @@ main ()
 dnl Make sure HAVE_STRSEP, HAVE_SETENV and HAVE_STRPBRK are defined as
 dnl necessary.
   AC_CHECK_FUNCS([strsep strpbrk setenv])
+dnl alloca (in public macro) and MinGW
+  AC_CHECK_HEADERS([malloc.h])
 ])