*BUGFIX*

Build improvements and WIN32 port updates:
 - add --with-pthread-pefix and --with-zlib-pefix options
 - prepare for removing internal zlib and pthreads-win32 relics,
   updated documentation for possible WIN32 developers (only for me? :->)
 - fixed bug in unimportant part of configure.ac for MinGW due to xine paths
 - fixed my bug in cdda (but it compiled fine anyway)
 - fixed unimportant bug in planar Makefile.am
 - next MSVC update due to external zlib, pthreads and latest changes,
   removed relic includes
 - checked distcheck

CVS patchset: 7719
CVS date: 2005/09/05 17:02:56

9 files changed, 30 insertions, 33 deletions

diff --git a/src/audio_out/audio_directx2_out.c b/src/audio_out/audio_directx2_out.c
index 97d3c8cd1..3f33d34d5 100644
--- a/src/audio_out/audio_directx2_out.c
+++ b/src/audio_out/audio_directx2_out.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: audio_directx2_out.c,v 1.3 2005/08/29 15:28:16 valtri Exp $
+ * $Id: audio_directx2_out.c,v 1.4 2005/09/05 17:02:57 valtri Exp $
  *
  *
  * xine audio output plugin using DirectX
@@ -129,7 +129,7 @@ typedef struct {
   int paused;                      /* paused mode */
   int finished;                    /* driver finished */
   int failed;                      /* don't open modal dialog again */
-  int count;                       /* number of current free parts */
+  int count;                       /* current free part number */
 
   pthread_t buffer_service;        /* service thread for operating with DSB */
   pthread_cond_t data_cond;        /* signals on data */
diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am
index e55e732f6..db84d364b 100644
--- a/src/demuxers/Makefile.am
+++ b/src/demuxers/Makefile.am
@@ -1,6 +1,7 @@
 include $(top_srcdir)/misc/Makefile.common
 
 AM_CFLAGS = $(THEORA_CFLAGS) $(OGG_CFLAGS) $(SPEEX_CFLAGS) $(LIBMODPLUG_CFLAGS)
+AM_CPPFLAGS = $(ZLIB_CPPFLAGS)
 
 libdir = $(XINE_PLUGINDIR)
 
diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index ff4595f4d..64b7b4920 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -76,7 +76,7 @@ xineplug_inp_file_la_LIBADD = $(XINE_LIB)
 xineplug_inp_file_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
 xineplug_inp_dvd_la_SOURCES = input_dvd.c media_helper.c
-xineplug_inp_dvd_la_LIBADD = $(XINE_LIB) $(link_dvdnav)
+xineplug_inp_dvd_la_LIBADD = $(XINE_LIB) $(link_dvdnav) $(THREAD_LIBS)
 xineplug_inp_dvd_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
 xineplug_inp_net_la_SOURCES = input_net.c net_buf_ctrl.c
diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c
index 0e0831c91..7ff668c47 100644
--- a/src/input/input_cdda.c
+++ b/src/input/input_cdda.c
@@ -20,7 +20,7 @@
  * Compact Disc Digital Audio (CDDA) Input Plugin 
  *   by Mike Melanson (melanson@pcisys.net)
  *
- * $Id: input_cdda.c,v 1.76 2005/09/02 22:39:43 tmattern Exp $
+ * $Id: input_cdda.c,v 1.77 2005/09/05 17:02:57 valtri Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -32,7 +32,7 @@
 #include <unistd.h>
 
 #include <sys/types.h>
-#ifndef SYS_PARAM_H
+#ifdef SYS_PARAM_H
 #include <sys/param.h>
 #endif
 #ifdef HAVE_DIRENT_H
diff --git a/src/libffmpeg/Makefile.am b/src/libffmpeg/Makefile.am
index 5927fbebc..a5c23ba4e 100644
--- a/src/libffmpeg/Makefile.am
+++ b/src/libffmpeg/Makefile.am
@@ -1,7 +1,7 @@
 include $(top_srcdir)/misc/Makefile.common
 
 if HAVE_FFMPEG
-FF_CPPFLAGS = $(FFMPEG_CPPFLAGS)
+ff_cppflags = $(FFMPEG_CPPFLAGS)
 link_ffmpeg = $(FFMPEG_LIBS)
 else
 link_ffmpeg = \
@@ -20,7 +20,8 @@ libdir = $(XINE_PLUGINDIR)
 lib_LTLIBRARIES = xineplug_decode_ff.la xineplug_decode_dvaudio.la
 
 if HAVE_DXR3
-AM_CPPFLAGS = -I$(top_srcdir)/src/dxr3 $(X_CFLAGS) $(FF_CPPFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/src/dxr3 $(X_CFLAGS) $(ff_cppflags) \
+              $(ZLIB_CPPFLAGS)
 xineplug_decode_ff_la_SOURCES = xine_decoder.c audio_decoder.c video_decoder.c \
                                 xine_encoder.c mpeg_parser.c
 # The dxr3 uses ffmpegs MPEG encoder by dlopen()ing the ffmpeg plugin and
@@ -28,7 +29,7 @@ xineplug_decode_ff_la_SOURCES = xine_decoder.c audio_decoder.c video_decoder.c \
 # symbols and cannot use @XINE_PLUGIN_MIN_SYMS@
 xineplug_decode_ff_la_LDFLAGS = -avoid-version -module
 else
-AM_CPPFLAGS = $(FF_CPPFLAGS)
+AM_CPPFLAGS = $(ff_cppflags) $(ZLIB_CPPFLAGS)
 xineplug_decode_ff_la_SOURCES = xine_decoder.c audio_decoder.c video_decoder.c \
                                 mpeg_parser.c
 xineplug_decode_ff_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
diff --git a/src/libffmpeg/libavcodec/Makefile.am b/src/libffmpeg/libavcodec/Makefile.am
index 3095cb76c..457c5f275 100644
--- a/src/libffmpeg/libavcodec/Makefile.am
+++ b/src/libffmpeg/libavcodec/Makefile.am
@@ -10,6 +10,7 @@ EXTRA_DIST = motion_est_template.c imgresample.c \
 # otherwise we get unresolved symbols, because some unsatisfied function calls
 # are not optimized away with debug optimization
 AM_CFLAGS = $(LIBFFMPEG_CFLAGS) `test "$(CFLAGS)" = "$(DEBUG_CFLAGS)" && echo -DCONFIG_ENCODERS`
+AM_CPPFLAGS = $(ZLIB_CPPFLAGS)
 ASFLAGS =
 
 noinst_LTLIBRARIES = libavcodec.la
diff --git a/src/post/planar/Makefile.am b/src/post/planar/Makefile.am
index f0c512228..ee40f6771 100644
--- a/src/post/planar/Makefile.am
+++ b/src/post/planar/Makefile.am
@@ -1,22 +1,27 @@
 include $(top_srcdir)/misc/Makefile.common
 
-AM_CFLAGS = -I$(top_srcdir)/src/libffmpeg/libavcodec/libpostproc
+POSTPROC_INT_LIB = $(top_builddir)/src/libffmpeg/libavcodec/libpostproc/libpostprocess.la
+
 if HAVE_FFMPEG
-POSTPROC_LIB = $(FFMPEG_POSTPROC_LIBS)
+postproc_lib = $(FFMPEG_POSTPROC_LIBS)
+ff_cppflags = $(FFMPEG_CPPFLAGS)
 else
-POSTPROC_LIB = $(top_builddir)/src/libffmpeg/libavcodec/libpostproc/libpostprocess.la
-POSTPROC_DEP = $(POSTPROC_LIB)
+ff_cppflags = -I$(top_srcdir)/src/libffmpeg/libavcodec/libpostproc
+postproc_lib = $(POSTPROC_INT_LIB)
+postproc_dep = $(postproc_lib)
 endif
 
+AM_CPPFLAGS = $(ff_cppflags)
+
 libdir = $(XINE_PLUGINDIR)/post
 
 lib_LTLIBRARIES = xineplug_post_planar.la
 
 xineplug_post_planar_la_SOURCES = planar.c invert.c expand.c fill.c boxblur.c \
                                   denoise3d.c eq.c eq2.c unsharp.c pp.c
-xineplug_post_planar_la_DEPENDENCIES = $(POSTPROC_DEP)
-xineplug_post_planar_la_LIBADD = $(XINE_LIB) $(POSTPROC_LIB) -lm $(THREAD_LIBS)
+xineplug_post_planar_la_DEPENDENCIES = $(postproc_dep)
+xineplug_post_planar_la_LIBADD = $(XINE_LIB) $(postproc_lib) -lm $(THREAD_LIBS)
 xineplug_post_planar_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
-$(POSTPROC_LIB):
+$(POSTPROC_INT_LIB):
 	cd $(top_builddir)/src/libffmpeg/libavcodec/libpostproc && $(MAKE) libpostprocess.la
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
index b78d54af6..83b79f43b 100644
--- a/src/xine-engine/Makefile.am
+++ b/src/xine-engine/Makefile.am
@@ -1,22 +1,14 @@
 include $(top_srcdir)/misc/Makefile.common
 include $(top_srcdir)/lib/Makefile.common
 
-AM_CFLAGS = $(THREAD_CFLAGS) $(X_CFLAGS) $(FT2_CFLAGS)
+AM_CFLAGS = $(X_CFLAGS) $(FT2_CFLAGS)
+AM_CPPFLAGS = $(ZLIB_CPPFLAGS)
 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool
 lib_LTLIBRARIES = libxine.la
 
 XINEUTILS_LIB  = $(top_builddir)/src/xine-utils/libxineutils.la
-INTERNAL_ZLIB_LIB = $(top_builddir)/win32/contrib/zlib/libzlib.la
-INTERNAL_PTHREAD_LIB = $(top_builddir)/win32/contrib/pthreads/libpthread.la
 DEF_FILE = libxine-$(XINE_MAJOR).def
-if HAVE_ZLIB
-else
-zlib_dep = $(INTERNAL_ZLIB_LIB)
-endif
-if HAVE_INTERNAL_WIN32_PTHREAD
-pthread_dep = $(INTERNAL_PTHREAD_LIB)
-endif
 if WIN32
 def_ldflags="-Wl,--output-def,$(DEF_FILE)"
 endif
@@ -34,7 +26,7 @@ EXTRA_DIST = lrb.c lrb.h accel_xvmc.h
 if INCLUDED_INTL
 INCLUDED_INTLLIBS = @INTLLIBS@
 endif
-libxine_la_DEPENDENCIES = $(INCLUDED_INTLLIBS) $(XINEUTILS_LIB) $(zlib_dep) \
+libxine_la_DEPENDENCIES = $(INCLUDED_INTLLIBS) $(XINEUTILS_LIB) \
                           $(pthread_dep) $(LIBXINEPOSIX)
 libxine_la_LIBADD = $(THREAD_LIBS) $(DYNAMIC_LD_LIBS) @INTLLIBS@ $(ZLIB_LIBS) \
 		    -lm $(XINEUTILS_LIB) $(LIBICONV) $(FT2_LIBS) \
@@ -66,9 +58,3 @@ endif
 
 $(XINEUTILS_LIB):
 	$(MAKE) -C $(top_builddir)/src/xine-utils libxineutils.la
-
-$(INTERNAL_PTHREAD_LIB):
-	$(MAKE) -C $(top_builddir)/win32/contrib/pthreads libpthread.la
-
-$(INTERNAL_ZLIB_LIB):
-	$(MAKE) -C $(top_builddir)/win32/contrib/zlib libzlib.la
diff --git a/src/xine-utils/utils.c b/src/xine-utils/utils.c
index e0eb7f4e6..98026133d 100644
--- a/src/xine-utils/utils.c
+++ b/src/xine-utils/utils.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: utils.c,v 1.41 2005/08/30 15:27:58 valtri Exp $
+ * $Id: utils.c,v 1.42 2005/09/05 17:02:57 valtri Exp $
  *
  */
 #define	_POSIX_PTHREAD_SEMANTICS 1	/* for 5-arg getpwuid_r on solaris */
@@ -32,6 +32,9 @@
 
 #include "xineutils.h"
 #include "xineintl.h"
+#ifdef _MSC_VER
+#include "xine_internal.h"
+#endif
 
 #include <errno.h>
 #include <pwd.h>