r3374 - in general/xine-lib-vdr/trunk/debian: . patches

Thomas Schmidt tschmidt at costa.debian.org
Sat Sep 23 16:59:18 UTC 2006


Author: tschmidt
Date: 2006-09-23 16:59:04 +0000 (Sat, 23 Sep 2006)
New Revision: 3374

Added:
   general/xine-lib-vdr/trunk/debian/reportbug.presubj
Removed:
   general/xine-lib-vdr/trunk/debian/patches/99_1.1.2-1-1.1.2-2-patch.dpatch
Modified:
   general/xine-lib-vdr/trunk/debian/changelog
   general/xine-lib-vdr/trunk/debian/control
   general/xine-lib-vdr/trunk/debian/libxine1.install
   general/xine-lib-vdr/trunk/debian/patches/02_CVS.dpatch
   general/xine-lib-vdr/trunk/debian/patches/03_vdr-xine.dpatch
   general/xine-lib-vdr/trunk/debian/patches/99_autoconf.dpatch
   general/xine-lib-vdr/trunk/debian/rules
   general/xine-lib-vdr/trunk/debian/shlibdeps.sh
Log:
resynced with xine-lib-vdr 1.1.2-4vdr1 from Darren

Modified: general/xine-lib-vdr/trunk/debian/changelog
===================================================================
--- general/xine-lib-vdr/trunk/debian/changelog	2006-09-23 16:52:47 UTC (rev 3373)
+++ general/xine-lib-vdr/trunk/debian/changelog	2006-09-23 16:59:04 UTC (rev 3374)
@@ -1,14 +1,45 @@
-xine-lib-vdr (1.1.2-2vdr1) unstable; urgency=low
+xine-lib-vdr (1.1.2-4vdr1) unstable; urgency=low
 
-  * Added upstream changes from official 1.1.2-2 version except from
-    the changes in debian/rules
+  * Rebase on 1.1.2-4.
 
- -- Thomas Schmidt <tschmidt at debian.org>  Sun, 13 Aug 2006 16:54:01 +0200
+ -- Darren Salt <linux at youmustbejoking.demon.co.uk>  Sat, 02 Sep 2006 14:11:30 +0100
 
+xine-lib (1.1.2-4) unstable; urgency=low
+
+  * build against external liba52
+  * Bug fix: "libxine1: Please use the Debian ffmpeg version", thanks to
+    Josselin Mouette. Please note that the ffmpeg version used has WMV3
+    support. Unfortunately, this version of xine cannot use that support
+    yet. This is 1.1.3 stuff. (Closes: #367095).
+  * Bug fix: "libxine1: Please support m4b files", thanks to Johannes
+    Adams. Bugfix by copying src/demuxers/demux_qt.c from CVS
+    version. (Closes: #384435).
+  * Build against internal libvcdinfo for now and add libvcdinfo-dev to
+    build-conflicts. This is a workaround for Bug: #364837, using internal
+    libvcdinfo makes the segfault go away.
+  * install a note for reportbug users
+  * cleanup (actually remove) confusing and unnecessary documentation.
+  * fetch bug from upstream cvs to fix bug where incorrect aspect ratio was
+    being passed to post plugins up (src/post/planar/expand.c, rev 1.16)
+  * add build dependency on sgmltools-lite to build faq
+  * add build dependencies transfig and gs to correctly build the hackers
+    guide
+
+ -- Reinhard Tartler <siretart at tauware.de>  Sun, 27 Aug 2006 21:41:58 +0200
+
+xine-lib (1.1.2-3) unstable; urgency=low
+
+  * backport fix for cdda:/ MRL from upstream (Closes: #276728)
+  * add note from darren to xine(5) as well
+  * fix totem-xine crashing when started with no argument (closes: #370283)
+    (patch taken from upstream)
+
+ -- Reinhard Tartler <siretart at tauware.de>  Sat, 12 Aug 2006 00:27:15 +0200
+
 xine-lib (1.1.2-2) unstable; urgency=high
- 
+
   Urgency high because of security related upload
- 
+
   * readd debian/watch file
   * update debian/rules from CVS. more complete handling of noauto flag
     to prevent running auto* tools.
@@ -21,42 +52,27 @@
     + src/xine-utils/xine_mutex.c
   * Imported security fix for included copy of libmms from upstream CVS,
     (e.g. USN-315-1)
-  
+ 
  -- Reinhard Tartler <siretart at tauware.de>  Thu, 13 Jul 2006 21:51:46 +0200
 
-xine-lib-vdr (1.1.2-1vdr1) unstable; urgency=low
+xine-lib (1.1.2-1) unstable; urgency=low
 
-  * Added patches from CVS:
-    - fixes for some libmms-related overflows (related to CVE-2006-2200);
-    - missing sentinel (crash fix in DVB, trigger was lost/weak signal);
-    - wrong strncpy parameters in mutex debug code;
-    - allow word-wrapping of the tvtime methods' help text.
-  * Modified the -O0 fix: debug builds have shown problems with it.
-    (This is now in CVS.)
-  * Replaced the inline use-before-define patch - instead, prevent
-    redefinition of inline, avoiding use of the always_inline attribute.
-    (This is also in CVS.)
-
- -- Darren Salt <linux at youmustbejoking.demon.co.uk>  Fri, 14 Jul 2006 02:10:04 +0100
-
-xine-lib-vdr (1.1.2-1vdr0) unstable; urgency=low
-
-  * New upstream release. By me!
-  * Removed all patches which are already in CVS.
-  * Using upstream VDR patch rather than my split-up-for-1.1.1 version.
-  * Added 02_-O0_compile_failure (problem with libavcodec MMX)
-
- -- Darren Salt <linux at youmustbejoking.demon.co.uk>  Tue, 11 Jul 2006 01:03:22 +0100
-
-xine-lib (1.1.1+cvs20060702-2) UNRELEASED; urgency=low
-
+  * New upstream release: 1.1.2
+  * use internal ffmpeg for upload to unstable, we will reinvestigate again
+    in experimental later..
+  * [sparc] Upstream fixed '--enable-vis'. So if compiling with vis, we are
+    using -mcpu=v9. This creates binaries, which probably segfault on 'true'
+    sparc32, but these poor old machines are not going to have much fun with
+    xine anyway... If there is an increasing demand for non-vis sparc
+    binaries, please contact me
   * updated README.Debian
+  * use AM_MAINTAINER_MODE in configure.ac again
 
   [Darren Salt]
   * Option to prevent autogen.sh from being run on package build.
     Use DEB_BUILD_OPTIONS='noauto'.
 
- -- Reinhard Tartler <siretart at tauware.de>  Mon,  3 Jul 2006 11:13:30 +0200
+ -- Reinhard Tartler <siretart at tauware.de>  Wed, 12 Jul 2006 09:53:38 +0200
 
 xine-lib (1.1.1+cvs20060702-1) experimental; urgency=low
 

Modified: general/xine-lib-vdr/trunk/debian/control
===================================================================
--- general/xine-lib-vdr/trunk/debian/control	2006-09-23 16:52:47 UTC (rev 3373)
+++ general/xine-lib-vdr/trunk/debian/control	2006-09-23 16:59:04 UTC (rev 3374)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Siggi Langauf <siggi at debian.org>
 Uploaders: Philipp Matthias Hahn <pmhahn at debian.org>, Reinhard Tartler <siretart at tauware.de>
-Build-Depends: debhelper (>= 4.0.4), binutils (>= 2.12.90.0.9), libaa1-dev | aalib1-dev (>= 1.4p5-2), libcaca-dev, libxinerama-dev | xlibs-static-dev (<< 6.8.0), libxv-dev | xlibs-static-dev (<< 6.8.0), libesd0-dev, zlib1g-dev | libz-dev, libartsc0-dev (>>1.1.0), liblircclient-dev, libogg-dev, libvorbis-dev, libtheora-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libflac-dev (>>1.1.0), libmodplug-dev, libgnomevfs2-dev, libsmbclient-dev, libspeex-dev, libmng-dev, libpng12-dev | libpng-dev, libfreetype6-dev, libsdl1.2-dev (>=1.1.5), libvcdinfo-dev, libmad0-dev, libxvmc-dev | xlibs-dev (<< 6.8.0), libcdio-dev, dpatch
+Build-Depends: debhelper (>= 4.0.4), binutils (>= 2.12.90.0.9), libaa1-dev | aalib1-dev (>= 1.4p5-2), libcaca-dev, libxinerama-dev | xlibs-static-dev (<< 6.8.0), libxv-dev | xlibs-static-dev (<< 6.8.0), libesd0-dev, zlib1g-dev | libz-dev, libartsc0-dev (>>1.1.0), liblircclient-dev, libogg-dev, libvorbis-dev, libtheora-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libflac-dev (>>1.1.0), libmodplug-dev, libgnomevfs2-dev, libsmbclient-dev, libspeex-dev, libmng-dev, libfreetype6-dev, libsdl1.2-dev (>=1.1.5), libvcdinfo-dev, libmad0-dev, libxvmc-dev | xlibs-dev (<< 6.8.0), libcdio-dev, libavcodec-dev (>= 0.cvs20060329) | libc6-dev (<< 2.3.3), libpostproc-dev (>= 0.cvs20060329)| libc6-dev (<< 2.3.3), dpatch
 Build-Conflicts: libdvdnav-dev
 Standards-Version: 3.7.2
 

Modified: general/xine-lib-vdr/trunk/debian/libxine1.install
===================================================================
--- general/xine-lib-vdr/trunk/debian/libxine1.install	2006-09-23 16:52:47 UTC (rev 3373)
+++ general/xine-lib-vdr/trunk/debian/libxine1.install	2006-09-23 16:59:04 UTC (rev 3374)
@@ -7,3 +7,4 @@
 usr/share/man/man5/xine.5
 usr/share/doc/libxine1/faq/*
 usr/share/doc/libxine1/README*
+usr/share/bug/libxine1/presubj

Modified: general/xine-lib-vdr/trunk/debian/patches/02_CVS.dpatch
===================================================================
--- general/xine-lib-vdr/trunk/debian/patches/02_CVS.dpatch	2006-09-23 16:52:47 UTC (rev 3373)
+++ general/xine-lib-vdr/trunk/debian/patches/02_CVS.dpatch	2006-09-23 16:59:04 UTC (rev 3374)
@@ -5,9 +5,143 @@
 ## DP: From CVS.
 
 @DPATCH@
+diff -urNad xine-lib-vdr-1.1.2~/configure.ac xine-lib-vdr-1.1.2/configure.ac
+--- xine-lib-vdr-1.1.2~/configure.ac	2006-09-02 14:28:11.000000000 +0100
++++ xine-lib-vdr-1.1.2/configure.ac	2006-09-02 14:28:13.675609760 +0100
+@@ -8,6 +8,8 @@
+ 
+ AM_MAINTAINER_MODE
+ 
++AM_MAINTAINER_MODE
++
+ dnl
+ dnl Require autoconf version 2.53
+ dnl
+@@ -175,7 +177,7 @@
+ dnl AC_C_BIGENDIAN triggers an AC_TRY_RUN warning; we can't cross compile
+ dnl xine (oh, well)
+ AC_C_CONST
+-AC_C_ALWAYS_INLINE
++dnl AC_C_ALWAYS_INLINE removal allows ffmpeg to be more widely buildable
+ AC_TYPE_OFF_T
+ AC_TYPE_SIZE_T
+ AC_CHECK_SIZEOF(long)
+diff -urNad xine-lib-vdr-1.1.2~/doc/Makefile.am xine-lib-vdr-1.1.2/doc/Makefile.am
+--- xine-lib-vdr-1.1.2~/doc/Makefile.am	2006-09-02 14:28:11.000000000 +0100
++++ xine-lib-vdr-1.1.2/doc/Makefile.am	2006-09-02 14:28:13.675609760 +0100
+@@ -3,9 +3,7 @@
+ SUBDIRS = man hackersguide faq
+ 
+ docs_DATA = README README.dvb README.dxr3 \
+-	    README.freebsd README.irix README.network_dvd README.opengl \
+-	    README.solaris README.syncfb README_xxmc.html README.MINGWCROSS \
+-	    README.WIN32
++	    README.opengl README_xxmc.html 
+ 
+ EXTRA_DIST = $(docs_DATA)
+ 
+diff -urNad xine-lib-vdr-1.1.2~/doc/man/en/xine.5 xine-lib-vdr-1.1.2/doc/man/en/xine.5
+--- xine-lib-vdr-1.1.2~/doc/man/en/xine.5	2006-09-02 14:28:11.000000000 +0100
++++ xine-lib-vdr-1.1.2/doc/man/en/xine.5	2006-09-02 14:28:13.675609760 +0100
+@@ -37,7 +37,7 @@
+ .br
+ .BI vcdo://...
+ .br
+-.BI cdda://<track-number>
++.BI cdda:/[<device>][/<track-number>]
+ .LP
+ .TP
+ \(bu Video devices:
+@@ -74,6 +74,10 @@
+ .BR rtsp://<host>... " (requires Real codecs)"
+ .br
+ .LP
++\fBNOTE:\fP where a file name is required, the \fIfull path must be
++provided\fP - from a shell, you can use \fB$PWD/file\fP if the file
++is in the current directory.
++
+ Several MRLs may be specified in order to play a number of consecutive
+ streams. Additional input plugins will provide additional MRL types. The ones
+ listed above are available with stock libxine...
+diff -urNad xine-lib-vdr-1.1.2~/src/demuxers/demux_qt.c xine-lib-vdr-1.1.2/src/demuxers/demux_qt.c
+--- xine-lib-vdr-1.1.2~/src/demuxers/demux_qt.c	2006-09-02 14:28:11.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/demuxers/demux_qt.c	2006-09-02 14:28:13.679609817 +0100
+@@ -3054,13 +3054,13 @@
+ }
+ 
+ static char *get_extensions (demux_class_t *this_gen) {
+-  return "mov qt mp4 m4a";
++  return "mov qt mp4 m4a m4b";
+ }
+ 
+ static char *get_mimetypes (demux_class_t *this_gen) {
+   return "video/quicktime: mov,qt: Quicktime animation;"
+          "video/x-quicktime: mov,qt: Quicktime animation;"
+-         "audio/x-m4a: m4a: MPEG-4 audio;"
++         "audio/x-m4a: m4a,m4b: MPEG-4 audio;"
+          "application/x-quicktimeplayer: qtl: Quicktime list;";
+ }
+ 
+diff -urNad xine-lib-vdr-1.1.2~/src/input/input_cdda.c xine-lib-vdr-1.1.2/src/input/input_cdda.c
+--- xine-lib-vdr-1.1.2~/src/input/input_cdda.c	2006-09-02 14:28:11.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/input/input_cdda.c	2006-09-02 14:28:13.679609817 +0100
+@@ -2537,28 +2537,33 @@
+   /* fetch the CD track to play */
+   if (!strncasecmp (mrl, "cdda:/", 6)) {
+ 
+-    if ( strlen(mrl) > 8 && strchr(&mrl[8],'/') ) {
+-      int i;
+-
+-      cdda_device = strdup(&mrl[6]);
+-
+-      i = strlen(cdda_device)-1;
+-      while( i && cdda_device[i] != '/' )
+-        i--;
+-
+-      if( i ) {
+-        cdda_device[i] = '\0';
+-        track = atoi(&cdda_device[i+1]);
+-      } else
+-        track = -1;        
+-
++    const char *p, *slash = mrl + 6;
++    while (*slash == '/')
++      ++slash;
++    p = --slash; /* point at a slash */
++    while (*p >= '0' && *p <= '9')
++      ++p;
++    if (*p) {
++      char *lastslash;
++      cdda_device = strdup (slash);
++      p = lastslash = strrchr (cdda_device, '/'); /* guaranteed to return non-NULL */
++      while (*++p >= '0' && *p <= '9')
++        /**/;
++      if (!*p) {
++        track = atoi (lastslash + 1);
++        *lastslash = 0;
++        if (lastslash == cdda_device) {
++          free (cdda_device);
++          cdda_device = NULL;
++        }
++      } else {
++        track = -1;
++      }
+     } else {
+-      track = atoi(&mrl[6]);
++      track = atoi (slash + 1);
+     }
+-    
+-    /* CD tracks start at 1, reject illegal tracks */
+-    if (track <= 0)
+-      return NULL;
++    if (track < 1)
++      track = 1;
+   } else
+     return NULL;
+ 
 diff -urNad xine-lib-vdr-1.1.2~/src/input/input_dvb.c xine-lib-vdr-1.1.2/src/input/input_dvb.c
---- xine-lib-vdr-1.1.2~/src/input/input_dvb.c	2006-07-09 15:37:35.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/input/input_dvb.c	2006-07-14 02:01:44.331586434 +0100
+--- xine-lib-vdr-1.1.2~/src/input/input_dvb.c	2006-09-02 14:28:11.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/input/input_dvb.c	2006-09-02 14:28:13.667609648 +0100
 @@ -2512,7 +2512,7 @@
  
    /* no data for several seconds - tell the user a possible reason */
@@ -18,8 +152,8 @@
  #ifdef DVB_NO_BUFFERING
    if(this->newchannel){
 diff -urNad xine-lib-vdr-1.1.2~/src/input/mms.c xine-lib-vdr-1.1.2/src/input/mms.c
---- xine-lib-vdr-1.1.2~/src/input/mms.c	2006-07-09 15:37:35.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/input/mms.c	2006-07-14 02:01:44.331586434 +0100
+--- xine-lib-vdr-1.1.2~/src/input/mms.c	2006-09-02 14:28:11.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/input/mms.c	2006-09-02 14:28:13.671609704 +0100
 @@ -138,7 +138,7 @@
    int           num_stream_ids;
    int           stream_ids[ASF_MAX_NUM_STREAMS];
@@ -74,8 +208,8 @@
          lprintf ("file object, file_length = %lld, packet length = %d",
  		 this->file_len, this->asf_packet_len);
 diff -urNad xine-lib-vdr-1.1.2~/src/input/mmsh.c xine-lib-vdr-1.1.2/src/input/mmsh.c
---- xine-lib-vdr-1.1.2~/src/input/mmsh.c	2006-07-09 15:37:35.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/input/mmsh.c	2006-07-14 02:01:44.335586491 +0100
+--- xine-lib-vdr-1.1.2~/src/input/mmsh.c	2006-09-02 14:28:11.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/input/mmsh.c	2006-09-02 14:28:13.671609704 +0100
 @@ -182,7 +182,7 @@
    int           num_stream_ids;
    int           stream_ids[ASF_MAX_NUM_STREAMS];
@@ -96,21 +230,9 @@
          this->file_length   = LE_64(this->asf_header + i + 40 - 24);
          /*lprintf ("file object, file_length = %lld, packet length = %d",
  		 this->file_length, this->packet_count);*/
-diff -urNad xine-lib-vdr-1.1.2~/src/xine-utils/xine_mutex.c xine-lib-vdr-1.1.2/src/xine-utils/xine_mutex.c
---- xine-lib-vdr-1.1.2~/src/xine-utils/xine_mutex.c	2006-06-23 19:24:22.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/xine-utils/xine_mutex.c	2006-07-14 02:01:44.331586434 +0100
-@@ -35,7 +35,7 @@
- 		     const char *id) {
- 
- #ifdef DBG_MUTEX
--  strncpy (mutex->id, sizeof (mutex->id), id);
-+  strncpy (mutex->id, id, sizeof (mutex->id));
-   mutex->id[sizeof (mutex->id) - 1] = 0;
- #endif
- 
 diff -urNad xine-lib-vdr-1.1.2~/src/libffmpeg/libavcodec/i386/Makefile.am xine-lib-vdr-1.1.2/src/libffmpeg/libavcodec/i386/Makefile.am
---- xine-lib-vdr-1.1.2~/src/libffmpeg/libavcodec/i386/Makefile.am	2006-07-09 15:39:01.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libffmpeg/libavcodec/i386/Makefile.am	2006-07-12 20:27:10.844759129 +0100
+--- xine-lib-vdr-1.1.2~/src/libffmpeg/libavcodec/i386/Makefile.am	2006-09-02 14:28:11.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libffmpeg/libavcodec/i386/Makefile.am	2006-09-02 14:28:13.671609704 +0100
 @@ -11,6 +11,9 @@
  # Avoid "can't find register" failures with -O1 and higher
  dsputil_mmx.o dsputil_mmx.lo: CFLAGS=`echo @CFLAGS@ | sed -e 's/-funroll-loops//g; s/-O[0-9]/-Os/g'`
@@ -122,8 +244,8 @@
  
  noinst_LTLIBRARIES = libavcodec_mmx.la
 diff -urNad xine-lib-vdr-1.1.2~/src/post/deinterlace/deinterlace.h xine-lib-vdr-1.1.2/src/post/deinterlace/deinterlace.h
---- xine-lib-vdr-1.1.2~/src/post/deinterlace/deinterlace.h	2006-07-12 16:04:25.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/post/deinterlace/deinterlace.h	2006-07-12 16:04:33.061695439 +0100
+--- xine-lib-vdr-1.1.2~/src/post/deinterlace/deinterlace.h	2006-09-02 14:28:11.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/post/deinterlace/deinterlace.h	2006-09-02 14:28:13.671609704 +0100
 @@ -130,7 +130,7 @@
      deinterlace_copy_scanline_t copy_scanline;
      deinterlace_frame_t deinterlace_frame;
@@ -134,8 +256,8 @@
  
  /**
 diff -urNad xine-lib-vdr-1.1.2~/src/post/deinterlace/plugins/double.c xine-lib-vdr-1.1.2/src/post/deinterlace/plugins/double.c
---- xine-lib-vdr-1.1.2~/src/post/deinterlace/plugins/double.c	2006-07-12 16:04:25.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/post/deinterlace/plugins/double.c	2006-07-12 16:04:33.061695439 +0100
+--- xine-lib-vdr-1.1.2~/src/post/deinterlace/plugins/double.c	2006-09-02 14:28:11.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/post/deinterlace/plugins/double.c	2006-09-02 14:28:13.671609704 +0100
 @@ -61,16 +61,7 @@
      copy_scanline,
      0,
@@ -155,8 +277,8 @@
  
  deinterlace_method_t *double_get_method( void )
 diff -urNad xine-lib-vdr-1.1.2~/src/post/deinterlace/plugins/greedy.c xine-lib-vdr-1.1.2/src/post/deinterlace/plugins/greedy.c
---- xine-lib-vdr-1.1.2~/src/post/deinterlace/plugins/greedy.c	2006-07-12 16:04:25.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/post/deinterlace/plugins/greedy.c	2006-07-12 16:04:33.061695439 +0100
+--- xine-lib-vdr-1.1.2~/src/post/deinterlace/plugins/greedy.c	2006-09-02 14:28:11.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/post/deinterlace/plugins/greedy.c	2006-09-02 14:28:13.671609704 +0100
 @@ -188,16 +188,13 @@
      deinterlace_greedy_packed422_scanline_mmxext,
      0,
@@ -182,8 +304,8 @@
  
  deinterlace_method_t *greedy_get_method( void )
 diff -urNad xine-lib-vdr-1.1.2~/src/post/deinterlace/plugins/greedy2frame.c xine-lib-vdr-1.1.2/src/post/deinterlace/plugins/greedy2frame.c
---- xine-lib-vdr-1.1.2~/src/post/deinterlace/plugins/greedy2frame.c	2006-07-12 16:04:25.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/post/deinterlace/plugins/greedy2frame.c	2006-07-12 16:04:33.061695439 +0100
+--- xine-lib-vdr-1.1.2~/src/post/deinterlace/plugins/greedy2frame.c	2006-09-02 14:28:11.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/post/deinterlace/plugins/greedy2frame.c	2006-09-02 14:28:13.671609704 +0100
 @@ -63,16 +63,7 @@
      0,
      DeinterlaceGreedy2Frame_SSE,
@@ -203,8 +325,8 @@
  
  deinterlace_method_t *greedy2frame_get_method( void )
 diff -urNad xine-lib-vdr-1.1.2~/src/post/deinterlace/plugins/kdetv_greedyh.c xine-lib-vdr-1.1.2/src/post/deinterlace/plugins/kdetv_greedyh.c
---- xine-lib-vdr-1.1.2~/src/post/deinterlace/plugins/kdetv_greedyh.c	2006-07-12 16:04:25.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/post/deinterlace/plugins/kdetv_greedyh.c	2006-07-12 16:04:33.061695439 +0100
+--- xine-lib-vdr-1.1.2~/src/post/deinterlace/plugins/kdetv_greedyh.c	2006-09-02 14:28:11.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/post/deinterlace/plugins/kdetv_greedyh.c	2006-09-02 14:28:13.671609704 +0100
 @@ -116,16 +116,13 @@
      0,
      deinterlace_frame_di_greedyh,
@@ -230,8 +352,8 @@
  
  deinterlace_method_t *dscaler_greedyh_get_method( void )
 diff -urNad xine-lib-vdr-1.1.2~/src/post/deinterlace/plugins/kdetv_tomsmocomp.c xine-lib-vdr-1.1.2/src/post/deinterlace/plugins/kdetv_tomsmocomp.c
---- xine-lib-vdr-1.1.2~/src/post/deinterlace/plugins/kdetv_tomsmocomp.c	2006-07-12 16:04:25.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/post/deinterlace/plugins/kdetv_tomsmocomp.c	2006-07-12 16:04:33.061695439 +0100
+--- xine-lib-vdr-1.1.2~/src/post/deinterlace/plugins/kdetv_tomsmocomp.c	2006-09-02 14:28:11.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/post/deinterlace/plugins/kdetv_tomsmocomp.c	2006-09-02 14:28:13.671609704 +0100
 @@ -132,16 +132,12 @@
      0,
      deinterlace_frame_di_tomsmocomp,
@@ -256,8 +378,8 @@
  
  deinterlace_method_t *dscaler_tomsmocomp_get_method( void )
 diff -urNad xine-lib-vdr-1.1.2~/src/post/deinterlace/plugins/linear.c xine-lib-vdr-1.1.2/src/post/deinterlace/plugins/linear.c
---- xine-lib-vdr-1.1.2~/src/post/deinterlace/plugins/linear.c	2006-07-12 16:04:25.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/post/deinterlace/plugins/linear.c	2006-07-12 16:04:33.061695439 +0100
+--- xine-lib-vdr-1.1.2~/src/post/deinterlace/plugins/linear.c	2006-09-02 14:28:11.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/post/deinterlace/plugins/linear.c	2006-09-02 14:28:13.671609704 +0100
 @@ -64,16 +64,12 @@
      copy_scanline,
      0,
@@ -282,8 +404,8 @@
  
  deinterlace_method_t *linear_get_method( void )
 diff -urNad xine-lib-vdr-1.1.2~/src/post/deinterlace/plugins/linearblend.c xine-lib-vdr-1.1.2/src/post/deinterlace/plugins/linearblend.c
---- xine-lib-vdr-1.1.2~/src/post/deinterlace/plugins/linearblend.c	2006-07-12 16:04:25.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/post/deinterlace/plugins/linearblend.c	2006-07-12 16:04:33.061695439 +0100
+--- xine-lib-vdr-1.1.2~/src/post/deinterlace/plugins/linearblend.c	2006-09-02 14:28:11.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/post/deinterlace/plugins/linearblend.c	2006-09-02 14:28:13.671609704 +0100
 @@ -302,6 +302,14 @@
      emms();
  }
@@ -336,8 +458,8 @@
  
  deinterlace_method_t *linearblend_get_method( void )
 diff -urNad xine-lib-vdr-1.1.2~/src/post/deinterlace/plugins/scalerbob.c xine-lib-vdr-1.1.2/src/post/deinterlace/plugins/scalerbob.c
---- xine-lib-vdr-1.1.2~/src/post/deinterlace/plugins/scalerbob.c	2006-07-12 16:04:25.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/post/deinterlace/plugins/scalerbob.c	2006-07-12 16:04:33.061695439 +0100
+--- xine-lib-vdr-1.1.2~/src/post/deinterlace/plugins/scalerbob.c	2006-09-02 14:28:11.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/post/deinterlace/plugins/scalerbob.c	2006-09-02 14:28:13.675609760 +0100
 @@ -52,16 +52,12 @@
      0,
      0,
@@ -362,8 +484,8 @@
  
  deinterlace_method_t *scalerbob_get_method( void )
 diff -urNad xine-lib-vdr-1.1.2~/src/post/deinterlace/plugins/vfir.c xine-lib-vdr-1.1.2/src/post/deinterlace/plugins/vfir.c
---- xine-lib-vdr-1.1.2~/src/post/deinterlace/plugins/vfir.c	2006-07-12 16:04:25.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/post/deinterlace/plugins/vfir.c	2006-07-12 16:04:33.061695439 +0100
+--- xine-lib-vdr-1.1.2~/src/post/deinterlace/plugins/vfir.c	2006-09-02 14:28:11.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/post/deinterlace/plugins/vfir.c	2006-09-02 14:28:13.675609760 +0100
 @@ -148,16 +148,12 @@
      copy_scanline,
      0,
@@ -388,8 +510,8 @@
  
  deinterlace_method_t *vfir_get_method( void )
 diff -urNad xine-lib-vdr-1.1.2~/src/post/deinterlace/plugins/weave.c xine-lib-vdr-1.1.2/src/post/deinterlace/plugins/weave.c
---- xine-lib-vdr-1.1.2~/src/post/deinterlace/plugins/weave.c	2006-07-12 16:04:25.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/post/deinterlace/plugins/weave.c	2006-07-12 16:04:33.065695496 +0100
+--- xine-lib-vdr-1.1.2~/src/post/deinterlace/plugins/weave.c	2006-09-02 14:28:11.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/post/deinterlace/plugins/weave.c	2006-09-02 14:28:13.675609760 +0100
 @@ -62,16 +62,7 @@
      copy_scanline,
      0,
@@ -409,8 +531,8 @@
  
  deinterlace_method_t *weave_get_method( void )
 diff -urNad xine-lib-vdr-1.1.2~/src/post/deinterlace/xine_plugin.c xine-lib-vdr-1.1.2/src/post/deinterlace/xine_plugin.c
---- xine-lib-vdr-1.1.2~/src/post/deinterlace/xine_plugin.c	2006-07-12 16:04:25.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/post/deinterlace/xine_plugin.c	2006-07-12 16:06:31.595362701 +0100
+--- xine-lib-vdr-1.1.2~/src/post/deinterlace/xine_plugin.c	2006-09-02 14:28:11.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/post/deinterlace/xine_plugin.c	2006-09-02 14:28:13.675609760 +0100
 @@ -57,7 +57,7 @@
  typedef struct post_plugin_deinterlace_s post_plugin_deinterlace_t;
  
@@ -456,15 +578,76 @@
    }
    enum_methods[i+1] = NULL;
    
-diff -urNad xine-lib-vdr-1.1.2~/configure.ac xine-lib-vdr-1.1.2/configure.ac
---- xine-lib-vdr-1.1.2~/configure.ac	2006-07-12 21:54:09.000000000 +0100
-+++ xine-lib-vdr-1.1.2/configure.ac	2006-07-12 21:54:10.286174331 +0100
-@@ -175,7 +175,7 @@
- dnl AC_C_BIGENDIAN triggers an AC_TRY_RUN warning; we can't cross compile
- dnl xine (oh, well)
- AC_C_CONST
--AC_C_ALWAYS_INLINE
-+dnl AC_C_ALWAYS_INLINE
- AC_TYPE_OFF_T
- AC_TYPE_SIZE_T
- AC_CHECK_SIZEOF(long)
+diff -urNad xine-lib-vdr-1.1.2~/src/post/planar/expand.c xine-lib-vdr-1.1.2/src/post/planar/expand.c
+--- xine-lib-vdr-1.1.2~/src/post/planar/expand.c	2006-09-02 14:28:11.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/post/planar/expand.c	2006-09-02 14:28:13.679609817 +0100
+@@ -106,6 +106,7 @@
+ static vo_frame_t    *expand_get_frame(xine_video_port_t *port_gen, uint32_t width, 
+ 				       uint32_t height, double ratio, 
+ 				       int format, int flags);
++static int            expand_draw(vo_frame_t *frame, xine_stream_t *stream);
+ 
+ /* overlay manager intercept check */
+ static int            expand_intercept_ovl(post_video_port_t *port);
+@@ -155,6 +156,7 @@
+   
+   port = _x_post_intercept_video_port(&this->post, video_target[0], &input, &output);
+   port->new_port.get_frame     = expand_get_frame;
++  port->new_frame->draw        = expand_draw;
+   port->intercept_ovl          = expand_intercept_ovl;
+   port->new_manager->add_event = expand_overlay_add_event;
+   
+@@ -241,6 +243,20 @@
+ }
+ 
+ 
++static int expand_draw(vo_frame_t *frame, xine_stream_t *stream)
++{
++    post_video_port_t *port = (post_video_port_t *)frame->port;
++    post_expand_t *this = (post_expand_t *)port->post;
++    int skip;
++
++    frame->ratio = this->aspect;
++    _x_post_frame_copy_down(frame, frame->next);
++    skip = frame->next->draw(frame->next, stream);
++    _x_post_frame_copy_up(frame, frame->next);
++    return skip;
++}
++
++
+ static vo_frame_t *expand_get_frame(xine_video_port_t *port_gen, uint32_t width, 
+ 				    uint32_t height, double ratio, 
+ 				    int format, int flags)
+@@ -275,7 +291,7 @@
+      * from the decoders by modifying the pointers to and
+      * the size of the drawing area */
+     frame->height = height;
+-    frame->ratio  = this->aspect;
++    frame->ratio  = ratio;
+     switch (format) {
+     case XINE_IMGFMT_YV12:
+       /* paint top bar */
+diff -urNad xine-lib-vdr-1.1.2~/src/xine-utils/color.c xine-lib-vdr-1.1.2/src/xine-utils/color.c
+--- xine-lib-vdr-1.1.2~/src/xine-utils/color.c	2006-09-02 14:28:11.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/xine-utils/color.c	2006-09-02 14:28:13.679609817 +0100
+@@ -164,6 +164,8 @@
+ 
+   int plane_size;
+ 
++  memset (yuv_planes, 0, sizeof (yuv_planes));
++
+   yuv_planes->row_width = width;
+   yuv_planes->row_count = height;
+   plane_size = yuv_planes->row_width * yuv_planes->row_count;
+diff -urNad xine-lib-vdr-1.1.2~/src/xine-utils/xine_mutex.c xine-lib-vdr-1.1.2/src/xine-utils/xine_mutex.c
+--- xine-lib-vdr-1.1.2~/src/xine-utils/xine_mutex.c	2006-09-02 14:28:11.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/xine-utils/xine_mutex.c	2006-09-02 14:28:13.671609704 +0100
+@@ -35,7 +35,7 @@
+ 		     const char *id) {
+ 
+ #ifdef DBG_MUTEX
+-  strncpy (mutex->id, sizeof (mutex->id), id);
++  strncpy (mutex->id, id, sizeof (mutex->id));
+   mutex->id[sizeof (mutex->id) - 1] = 0;
+ #endif
+ 

Modified: general/xine-lib-vdr/trunk/debian/patches/03_vdr-xine.dpatch
===================================================================
--- general/xine-lib-vdr/trunk/debian/patches/03_vdr-xine.dpatch	2006-09-23 16:52:47 UTC (rev 3373)
+++ general/xine-lib-vdr/trunk/debian/patches/03_vdr-xine.dpatch	2006-09-23 16:59:04 UTC (rev 3374)
@@ -6,9 +6,9 @@
 
 @DPATCH@
 diff -urNad xine-lib-vdr-1.1.2~/configure.ac xine-lib-vdr-1.1.2/configure.ac
---- xine-lib-vdr-1.1.2~/configure.ac	2006-07-11 01:47:52.000000000 +0100
-+++ xine-lib-vdr-1.1.2/configure.ac	2006-07-11 01:47:52.812004937 +0100
-@@ -2422,6 +2422,7 @@
+--- xine-lib-vdr-1.1.2~/configure.ac	2006-09-02 14:28:40.000000000 +0100
++++ xine-lib-vdr-1.1.2/configure.ac	2006-09-02 14:28:41.432000174 +0100
+@@ -2424,6 +2424,7 @@
  src/video_out/vidix/drivers/Makefile
  src/xine-utils/Makefile
  src/xine-engine/Makefile
@@ -16,7 +16,7 @@
  win32/Makefile
  win32/include/Makefile])
  AC_CONFIG_COMMANDS([default],[[chmod +x ./misc/SlackBuild ./misc/build_rpms.sh ./misc/relchk.sh]],[[]])
-@@ -2477,7 +2478,7 @@
+@@ -2479,7 +2480,7 @@
  echo "   - stdin_fifo    - rtp"
  echo "   - http          - mms"
  echo "   - pnm           - rtsp"
@@ -25,7 +25,7 @@
  if test x"$external_dvdnav" = "xyes"; then
    echo "   - dvd (external libs)"
  else
-@@ -2660,6 +2661,7 @@
+@@ -2662,6 +2663,7 @@
  echo "   - eq              - eq2"
  echo "   - boxblur         - denoise3d"
  echo "   - unsharp         - tvtime"
@@ -34,8 +34,8 @@
  echo "   - goom            - oscope"
  echo "   - fftscope        - mosaico"
 diff -urNad xine-lib-vdr-1.1.2~/src/Makefile.am xine-lib-vdr-1.1.2/src/Makefile.am
---- xine-lib-vdr-1.1.2~/src/Makefile.am	2006-07-11 01:47:51.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/Makefile.am	2006-07-11 01:47:52.816004993 +0100
+--- xine-lib-vdr-1.1.2~/src/Makefile.am	2006-07-09 15:37:12.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/Makefile.am	2006-09-02 14:28:41.432000174 +0100
 @@ -30,4 +30,5 @@
  	libfaad \
  	libflac \
@@ -44,8 +44,8 @@
 +	post \
 +	vdr
 diff -urNad xine-lib-vdr-1.1.2~/src/libmpeg2/decode.c xine-lib-vdr-1.1.2/src/libmpeg2/decode.c
---- xine-lib-vdr-1.1.2~/src/libmpeg2/decode.c	2006-07-11 01:47:51.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libmpeg2/decode.c	2006-07-11 01:47:52.816004993 +0100
+--- xine-lib-vdr-1.1.2~/src/libmpeg2/decode.c	2006-07-09 15:39:11.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libmpeg2/decode.c	2006-09-02 14:28:41.432000174 +0100
 @@ -236,7 +236,7 @@
  }
  
@@ -273,8 +273,8 @@
  	  
        if (mpeg2dec->is_sequence_needed) {
 diff -urNad xine-lib-vdr-1.1.2~/src/post/planar/expand.c xine-lib-vdr-1.1.2/src/post/planar/expand.c
---- xine-lib-vdr-1.1.2~/src/post/planar/expand.c	2006-07-11 01:47:51.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/post/planar/expand.c	2006-07-11 01:47:52.816004993 +0100
+--- xine-lib-vdr-1.1.2~/src/post/planar/expand.c	2006-09-02 14:28:40.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/post/planar/expand.c	2006-09-02 14:31:55.278726768 +0100
 @@ -21,7 +21,8 @@
   *
   * expand video filter by James Stembridge 24/05/2003
@@ -323,17 +323,7 @@
  } post_expand_t;
  
  /* plugin class functions */
-@@ -107,6 +118,9 @@
- 				       uint32_t height, double ratio, 
- 				       int format, int flags);
- 
-+/* replaced vo_frame functions */
-+static int            expand_draw(vo_frame_t *frame, xine_stream_t *stream);
-+
- /* overlay manager intercept check */
- static int            expand_intercept_ovl(post_video_port_t *port);
- 
-@@ -152,11 +166,14 @@
+@@ -153,6 +164,8 @@
    this->enable_automatic_shift = 0;
    this->overlay_y_offset       = 0;
    this->aspect                 = 4.0 / 3.0;
@@ -342,13 +332,7 @@
    
    port = _x_post_intercept_video_port(&this->post, video_target[0], &input, &output);
    port->new_port.get_frame     = expand_get_frame;
-   port->intercept_ovl          = expand_intercept_ovl;
-   port->new_manager->add_event = expand_overlay_add_event;
-+  port->new_frame->draw        = expand_draw;
-   
-   input_param       = &this->parameter_input;
-   input_param->name = "parameters";
-@@ -164,8 +181,8 @@
+@@ -166,8 +179,8 @@
    input_param->data = &post_api;
    xine_list_push_back(this->post.input, input_param);
    
@@ -359,7 +343,7 @@
    
    this->post.xine_post.video_input[0] = &port->new_port;
    
-@@ -212,6 +229,8 @@
+@@ -214,6 +227,8 @@
    this->enable_automatic_shift = param->enable_automatic_shift;
    this->overlay_y_offset       = param->overlay_y_offset;
    this->aspect                 = param->aspect;
@@ -368,7 +352,7 @@
    return 1;
  }
  
-@@ -223,6 +242,8 @@
+@@ -225,6 +240,8 @@
    param->enable_automatic_shift = this->enable_automatic_shift;
    param->overlay_y_offset       = this->overlay_y_offset;
    param->aspect                 = this->aspect;
@@ -377,7 +361,7 @@
    return 1;
  }
  
-@@ -236,6 +257,7 @@
+@@ -238,25 +255,12 @@
             "  Enable_automatic_shift: Enable automatic overlay shifting\n"
             "  Overlay_y_offset: Manually shift the overlay vertically\n"
             "  aspect: The target aspect ratio (default 4:3)\n"
@@ -385,8 +369,27 @@
             "\n"
           );
  }
-@@ -322,6 +344,10 @@
  
+ 
+-static int expand_draw(vo_frame_t *frame, xine_stream_t *stream)
+-{
+-    post_video_port_t *port = (post_video_port_t *)frame->port;
+-    post_expand_t *this = (post_expand_t *)port->post;
+-    int skip;
+-
+-    frame->ratio = this->aspect;
+-    _x_post_frame_copy_down(frame, frame->next);
+-    skip = frame->next->draw(frame->next, stream);
+-    _x_post_frame_copy_up(frame, frame->next);
+-    return skip;
+-}
+-
+-
+ static vo_frame_t *expand_get_frame(xine_video_port_t *port_gen, uint32_t width, 
+ 				    uint32_t height, double ratio, 
+ 				    int format, int flags)
+@@ -338,6 +342,10 @@
+ 
  static int expand_intercept_ovl(post_video_port_t *port)
  {
 +  post_expand_t         *this = (post_expand_t *)port->post;
@@ -396,7 +399,7 @@
    /* we always intercept overlay manager */
    return 1;
  }
-@@ -350,3 +376,79 @@
+@@ -366,3 +374,79 @@
    
    return port->original_manager->add_event(port->original_manager, event_gen);
  }
@@ -478,7 +481,7 @@
 +}
 diff -urNad xine-lib-vdr-1.1.2~/src/vdr/Makefile.am xine-lib-vdr-1.1.2/src/vdr/Makefile.am
 --- xine-lib-vdr-1.1.2~/src/vdr/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/vdr/Makefile.am	2006-07-11 01:47:52.816004993 +0100
++++ xine-lib-vdr-1.1.2/src/vdr/Makefile.am	2006-09-02 14:28:41.436000230 +0100
 @@ -0,0 +1,30 @@
 +include $(top_srcdir)/misc/Makefile.common
 +
@@ -512,7 +515,7 @@
 +
 diff -urNad xine-lib-vdr-1.1.2~/src/vdr/input_vdr.c xine-lib-vdr-1.1.2/src/vdr/input_vdr.c
 --- xine-lib-vdr-1.1.2~/src/vdr/input_vdr.c	1970-01-01 01:00:00.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/vdr/input_vdr.c	2006-07-11 01:47:52.820005050 +0100
++++ xine-lib-vdr-1.1.2/src/vdr/input_vdr.c	2006-09-02 14:28:41.436000230 +0100
 @@ -0,0 +1,2480 @@
 +/*
 + * Copyright (C) 2003-2004 the xine project
@@ -2996,7 +2999,7 @@
 +
 diff -urNad xine-lib-vdr-1.1.2~/src/vdr/input_vdr.h xine-lib-vdr-1.1.2/src/vdr/input_vdr.h
 --- xine-lib-vdr-1.1.2~/src/vdr/input_vdr.h	1970-01-01 01:00:00.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/vdr/input_vdr.h	2006-07-11 01:47:52.820005050 +0100
++++ xine-lib-vdr-1.1.2/src/vdr/input_vdr.h	2006-09-02 14:28:41.440000287 +0100
 @@ -0,0 +1,585 @@
 +
 +#ifndef __INPUT_VDR_H
@@ -3585,7 +3588,7 @@
 +
 diff -urNad xine-lib-vdr-1.1.2~/src/vdr/post_vdr.c xine-lib-vdr-1.1.2/src/vdr/post_vdr.c
 --- xine-lib-vdr-1.1.2~/src/vdr/post_vdr.c	1970-01-01 01:00:00.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/vdr/post_vdr.c	2006-07-11 01:47:52.820005050 +0100
++++ xine-lib-vdr-1.1.2/src/vdr/post_vdr.c	2006-09-02 14:28:41.440000287 +0100
 @@ -0,0 +1,44 @@
 +/*
 + * Copyright (C) 2000-2004 the xine project
@@ -3633,7 +3636,7 @@
 +
 diff -urNad xine-lib-vdr-1.1.2~/src/vdr/post_vdr.h xine-lib-vdr-1.1.2/src/vdr/post_vdr.h
 --- xine-lib-vdr-1.1.2~/src/vdr/post_vdr.h	1970-01-01 01:00:00.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/vdr/post_vdr.h	2006-07-11 01:47:52.820005050 +0100
++++ xine-lib-vdr-1.1.2/src/vdr/post_vdr.h	2006-09-02 14:28:41.440000287 +0100
 @@ -0,0 +1,71 @@
 +
 +#ifndef __POST_VDR_H
@@ -3708,7 +3711,7 @@
 +
 diff -urNad xine-lib-vdr-1.1.2~/src/vdr/post_vdr_audio.c xine-lib-vdr-1.1.2/src/vdr/post_vdr_audio.c
 --- xine-lib-vdr-1.1.2~/src/vdr/post_vdr_audio.c	1970-01-01 01:00:00.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/vdr/post_vdr_audio.c	2006-07-11 01:47:52.820005050 +0100
++++ xine-lib-vdr-1.1.2/src/vdr/post_vdr_audio.c	2006-09-02 14:28:41.440000287 +0100
 @@ -0,0 +1,287 @@
 +/*
 + * Copyright (C) 2000-2004 the xine project
@@ -3999,7 +4002,7 @@
 +}
 diff -urNad xine-lib-vdr-1.1.2~/src/vdr/post_vdr_video.c xine-lib-vdr-1.1.2/src/vdr/post_vdr_video.c
 --- xine-lib-vdr-1.1.2~/src/vdr/post_vdr_video.c	1970-01-01 01:00:00.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/vdr/post_vdr_video.c	2006-07-11 01:47:52.820005050 +0100
++++ xine-lib-vdr-1.1.2/src/vdr/post_vdr_video.c	2006-09-02 14:28:41.440000287 +0100
 @@ -0,0 +1,485 @@
 +/*
 + * Copyright (C) 2000-2004 the xine project
@@ -4487,8 +4490,8 @@
 +  return skip;
 +}
 diff -urNad xine-lib-vdr-1.1.2~/src/xine-engine/audio_out.c xine-lib-vdr-1.1.2/src/xine-engine/audio_out.c
---- xine-lib-vdr-1.1.2~/src/xine-engine/audio_out.c	2006-07-11 01:47:51.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/xine-engine/audio_out.c	2006-07-11 01:47:52.824005106 +0100
+--- xine-lib-vdr-1.1.2~/src/xine-engine/audio_out.c	2006-07-09 15:40:08.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/xine-engine/audio_out.c	2006-09-02 14:28:41.440000287 +0100
 @@ -1040,6 +1040,10 @@
  		 in_buf->vpts, cur_time);
        }
@@ -4501,8 +4504,8 @@
        xine_usec_sleep (10000);
        lprintf ("loop:pause: I wake up.\n");
 diff -urNad xine-lib-vdr-1.1.2~/src/xine-engine/demux.c xine-lib-vdr-1.1.2/src/xine-engine/demux.c
---- xine-lib-vdr-1.1.2~/src/xine-engine/demux.c	2006-07-11 01:47:51.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/xine-engine/demux.c	2006-07-11 01:47:52.824005106 +0100
+--- xine-lib-vdr-1.1.2~/src/xine-engine/demux.c	2006-07-09 15:40:08.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/xine-engine/demux.c	2006-09-02 14:28:41.440000287 +0100
 @@ -85,6 +85,8 @@
    stream->video_fifo->clear(stream->video_fifo);
    stream->audio_fifo->clear(stream->audio_fifo);
@@ -4609,8 +4612,8 @@
  
  static void *demux_loop (void *stream_gen) {
 diff -urNad xine-lib-vdr-1.1.2~/src/xine-engine/post.c xine-lib-vdr-1.1.2/src/xine-engine/post.c
---- xine-lib-vdr-1.1.2~/src/xine-engine/post.c	2006-07-11 01:47:51.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/xine-engine/post.c	2006-07-11 01:47:52.824005106 +0100
+--- xine-lib-vdr-1.1.2~/src/xine-engine/post.c	2006-07-09 15:40:08.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/xine-engine/post.c	2006-09-02 14:28:41.440000287 +0100
 @@ -149,6 +149,14 @@
    if (port->port_lock) pthread_mutex_unlock(port->port_lock);
  }
@@ -4635,8 +4638,8 @@
    port->new_port.get_property        = post_video_get_property;
    port->new_port.set_property        = post_video_set_property;
 diff -urNad xine-lib-vdr-1.1.2~/src/xine-engine/video_out.c xine-lib-vdr-1.1.2/src/xine-engine/video_out.c
---- xine-lib-vdr-1.1.2~/src/xine-engine/video_out.c	2006-07-11 01:47:51.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/xine-engine/video_out.c	2006-07-11 01:47:52.824005106 +0100
+--- xine-lib-vdr-1.1.2~/src/xine-engine/video_out.c	2006-03-25 01:26:34.000000000 +0000
++++ xine-lib-vdr-1.1.2/src/xine-engine/video_out.c	2006-09-02 14:28:41.444000343 +0100
 @@ -127,6 +127,9 @@
    int                       frame_drop_limit;
    int                       frame_drop_cpt;
@@ -4763,8 +4766,8 @@
    this->frame_drop_cpt        = 0;
  
 diff -urNad xine-lib-vdr-1.1.2~/src/xine-engine/video_out.h xine-lib-vdr-1.1.2/src/xine-engine/video_out.h
---- xine-lib-vdr-1.1.2~/src/xine-engine/video_out.h	2006-07-11 01:47:51.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/xine-engine/video_out.h	2006-07-11 01:47:52.824005106 +0100
+--- xine-lib-vdr-1.1.2~/src/xine-engine/video_out.h	2006-07-09 15:40:08.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/xine-engine/video_out.h	2006-09-02 14:28:41.444000343 +0100
 @@ -205,6 +205,9 @@
    /* flush video_out fifo */
    void (*flush) (xine_video_port_t *self);
@@ -4776,8 +4779,8 @@
     *
     * See VO_PROP_* bellow
 diff -urNad xine-lib-vdr-1.1.2~/src/xine-engine/video_overlay.h xine-lib-vdr-1.1.2/src/xine-engine/video_overlay.h
---- xine-lib-vdr-1.1.2~/src/xine-engine/video_overlay.h	2006-07-11 01:47:51.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/xine-engine/video_overlay.h	2006-07-11 01:47:52.824005106 +0100
+--- xine-lib-vdr-1.1.2~/src/xine-engine/video_overlay.h	2006-07-09 15:40:08.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/xine-engine/video_overlay.h	2006-09-02 14:28:41.444000343 +0100
 @@ -38,7 +38,7 @@
  
  #define MAX_OBJECTS   50
@@ -4788,8 +4791,8 @@
  #define OVERLAY_EVENT_NULL             0
  #define OVERLAY_EVENT_SHOW             1
 diff -urNad xine-lib-vdr-1.1.2~/src/xine-engine/xine.c xine-lib-vdr-1.1.2/src/xine-engine/xine.c
---- xine-lib-vdr-1.1.2~/src/xine-engine/xine.c	2006-07-11 01:47:51.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/xine-engine/xine.c	2006-07-11 01:47:52.824005106 +0100
+--- xine-lib-vdr-1.1.2~/src/xine-engine/xine.c	2006-07-09 15:40:08.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/xine-engine/xine.c	2006-09-02 14:28:41.444000343 +0100
 @@ -533,6 +533,7 @@
    pthread_mutex_init (&stream->info_mutex, NULL);
    pthread_mutex_init (&stream->meta_mutex, NULL);
@@ -4897,8 +4900,8 @@
 +  pthread_mutex_unlock(&stream->frontend_lock);
 +}
 diff -urNad xine-lib-vdr-1.1.2~/src/xine-engine/xine_internal.h xine-lib-vdr-1.1.2/src/xine-engine/xine_internal.h
---- xine-lib-vdr-1.1.2~/src/xine-engine/xine_internal.h	2006-07-11 01:47:51.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/xine-engine/xine_internal.h	2006-07-11 01:47:52.828005162 +0100
+--- xine-lib-vdr-1.1.2~/src/xine-engine/xine_internal.h	2006-04-21 23:46:33.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/xine-engine/xine_internal.h	2006-09-02 14:28:41.444000343 +0100
 @@ -320,6 +320,7 @@
    int                        demux_thread_running;
    pthread_mutex_t            demux_lock;

Deleted: general/xine-lib-vdr/trunk/debian/patches/99_1.1.2-1-1.1.2-2-patch.dpatch
===================================================================
--- general/xine-lib-vdr/trunk/debian/patches/99_1.1.2-1-1.1.2-2-patch.dpatch	2006-09-23 16:52:47 UTC (rev 3373)
+++ general/xine-lib-vdr/trunk/debian/patches/99_1.1.2-1-1.1.2-2-patch.dpatch	2006-09-23 16:59:04 UTC (rev 3374)
@@ -1,3034 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 99_1.1.2-1-1.1.2-2-patch.dpatch by Thomas Schmidt <tschmidt at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad xine-lib-vdr-1.1.2~/configure.ac xine-lib-vdr-1.1.2/configure.ac
---- xine-lib-vdr-1.1.2~/configure.ac	2006-07-09 16:36:29.000000000 +0200
-+++ xine-lib-vdr-1.1.2/configure.ac	2006-08-13 16:45:51.000000000 +0200
-@@ -173,7 +173,7 @@
- dnl AC_C_BIGENDIAN triggers an AC_TRY_RUN warning; we can't cross compile
- dnl xine (oh, well)
- AC_C_CONST
--AC_C_ALWAYS_INLINE
-+dnl AC_C_ALWAYS_INLINE removal allows ffmpeg to be more widely buildable
- AC_TYPE_OFF_T
- AC_TYPE_SIZE_T
- AC_CHECK_SIZEOF(long)
-diff -urNad xine-lib-vdr-1.1.2~/configure.ac.orig xine-lib-vdr-1.1.2/configure.ac.orig
---- xine-lib-vdr-1.1.2~/configure.ac.orig	1970-01-01 01:00:00.000000000 +0100
-+++ xine-lib-vdr-1.1.2/configure.ac.orig	2006-07-09 16:36:29.000000000 +0200
-@@ -0,0 +1,2868 @@
-+dnl
-+dnl Configure.ac for xine
-+dnl
-+
-+AC_INIT
-+AC_CONFIG_SRCDIR([src/xine-engine/xine.c])
-+AC_CONFIG_LIBOBJ_DIR([lib])
-+
-+dnl
-+dnl Require autoconf version 2.53
-+dnl
-+AC_PREREQ(2.53)
-+
-+dnl Making releases:
-+dnl   XINE_SUB += 1; continue with XINE_LT_* values below
-+dnl
-+XINE_MAJOR=1
-+XINE_MINOR=1
-+XINE_SUB=2
-+
-+#if test $XINE_SUB -eq 0 ; then
-+#  XINE_SUBPART="";
-+#else
-+  XINE_SUBPART=".$XINE_SUB"
-+#fi
-+
-+dnl The libtool version numbers (XINE_LT_*); Don't even think about faking this!
-+dnl 
-+dnl immediately before every release do:
-+dnl ===================================
-+dnl if (the interface is totally unchanged from previous release)
-+dnl    XINE_LT_REVISION ++;
-+dnl else { /* interfaces have been added, removed or changed */
-+dnl    XINE_LT_REVISION = 0;
-+dnl    XINE_LT_CURRENT ++;
-+dnl    if (any interfaces have been _added_ since last release)
-+dnl       XINE_LT_AGE ++;
-+dnl    if (any interfaces have been _removed_ or _incompatibly changed_)
-+dnl       XINE_LT_AGE = 0;
-+dnl }
-+dnl 
-+dnl If you want to know more about what you are doing, here are some details:
-+dnl  * XINE_LT_CURRENT is the current API version
-+dnl  * XINE_LT_REVISION is an internal revision number which is increased when the API
-+dnl    itself did not change
-+dnl  * XINE_LT_AGE is the number of previous API versions still supported by this library
-+dnl  * libtool has its own numbering scheme, because local library numbering schemes
-+dnl    are platform dependent
-+dnl  * in Linux, the library will be named
-+dnl    libname.so.(XINE_LT_CURRENT - XINE_LT_AGE).XINE_LT_AGE.XINE_LT_REVISION
-+
-+XINE_LT_CURRENT=15
-+XINE_LT_REVISION=0
-+XINE_LT_AGE=14
-+
-+dnl for a release tarball do "rm .cvsversion" before "make dist"
-+if test -f .cvsversion; then
-+  XINE_PRE="cvs"
-+else
-+  XINE_PRE=""
-+fi
-+
-+AC_SUBST(XINE_MAJOR)
-+AC_SUBST(XINE_MINOR)
-+AC_SUBST(XINE_SUB)
-+AC_SUBST(XINE_IFACE_AGE)
-+AC_SUBST(XINE_BIN_AGE)
-+
-+AC_DEFINE_UNQUOTED(XINE_MAJOR, $XINE_MAJOR,[xine major version number])
-+AC_DEFINE_UNQUOTED(XINE_MINOR, $XINE_MINOR,[xine minor version number])
-+AC_DEFINE_UNQUOTED(XINE_SUB, $XINE_SUB, [xine sub version number])
-+
-+AC_SUBST(XINE_LT_CURRENT)
-+AC_SUBST(XINE_LT_REVISION)
-+AC_SUBST(XINE_LT_AGE)
-+
-+SPEC_VERSION=$XINE_MAJOR.$XINE_MINOR${XINE_SUBPART}$XINE_PRE
-+TAR_NAME="xine-lib-"$SPEC_VERSION
-+dnl TAR_NAME="xine-lib-"$XINE_MAJOR-$XINE_PRE
-+dnl SPEC_VERSION=${XINE_MAJOR}_$XINE_PRE
-+
-+AC_SUBST(TAR_NAME)
-+AC_SUBST(SPEC_VERSION)
-+
-+LIBNAME=libxine$XINE_MAJOR
-+AC_SUBST(LIBNAME)
-+
-+AC_DEFINE_UNQUOTED(XINE_TEXTDOMAIN, "$LIBNAME", [catalog message text domain])
-+
-+dnl
-+AC_CANONICAL_TARGET
-+
-+dnl
-+AM_INIT_AUTOMAKE("xine-lib", $SPEC_VERSION)
-+dnl AM_INIT_AUTOMAKE("xine-lib", $XINE_MAJOR-$XINE_PRE)
-+
-+
-+dnl ---------------------------------------------
-+dnl Made possible to build for another arch.
-+dnl ---------------------------------------------
-+
-+if test x$XINE_BUILD != "x"; then
-+  AC_MSG_RESULT([*** build forced to $XINE_BUILD ***])
-+  build=$XINE_BUILD
-+  host=$XINE_BUILD
-+else
-+  check_athlon=yes
-+fi
-+
-+AM_CONFIG_HEADER(config.h)
-+
-+
-+dnl ---------------------------------------------
-+dnl Check for programs.
-+dnl ---------------------------------------------
-+
-+dnl Save CFLAGS, AC_ISC_POSIX set some unwanted default CFLAGS
-+saved_CFLAGS="$CFLAGS"
-+AC_ISC_POSIX
-+AC_PATH_MAGIC
-+CFLAGS="$saved_CFLAGS"
-+AC_PROG_CC
-+AC_HEADER_STDC
-+AC_PROG_MAKE_SET
-+dnl AC_PROG_EGREP  needs autoconf 2.54, just hardcode for "egrep"
-+AC_PROG_INSTALL
-+AC_PROG_LN_S
-+AC_PROG_AWK
-+AC_C_INLINE
-+
-+
-+dnl ---------------------------------------------
-+dnl Check for assembler (ffmpeg need it), don't call this before LIBTOOL
-+dnl ---------------------------------------------
-+
-+AM_PROG_AS_MOD
-+
-+
-+dnl ---------------------------------------------
-+dnl Libtool
-+dnl ---------------------------------------------
-+
-+AC_LIBTOOL_DLOPEN
-+AC_DISABLE_STATIC
-+AC_LIBTOOL_WIN32_DLL
-+AC_PROG_LIBTOOL
-+AC_PROG_LIBTOOL_SANITYCHECK
-+AC_SUBST(LIBTOOL_DEPS)
-+if ${CONFIG_SHELL} ./libtool --features | grep "enable static" >/dev/null; then
-+  STATIC="-static"
-+else
-+  STATIC=
-+fi
-+AC_SUBST(STATIC)
-+
-+
-+dnl ---------------------------------------------
-+dnl NLS Support
-+dnl ---------------------------------------------
-+
-+dnl ALL_LINGUAS="cs da de el en at quot en at boldquot es et fr gl id it ja ko nl nn no pl pt pt_BR ru sl sv tr zh"
-+AM_ICONV
-+AM_GNU_GETTEXT([external])
-+AC_PROG_GMSGFMT_PLURAL
-+
-+AC_CHECK_FUNCS([nl_langinfo])
-+
-+dnl ---------------------------------------------
-+dnl Checks for typedefs, structures, and compiler characteristics.
-+dnl ---------------------------------------------
-+
-+AC_C_BIGENDIAN
-+dnl AC_C_BIGENDIAN triggers an AC_TRY_RUN warning; we can't cross compile
-+dnl xine (oh, well)
-+AC_C_CONST
-+AC_C_ALWAYS_INLINE
-+AC_TYPE_OFF_T
-+AC_TYPE_SIZE_T
-+AC_CHECK_SIZEOF(long)
-+dnl AC_CHECK_TYPES([ptrdiff_t])
-+dnl For systems without inttypes.h would be needed extend generated replacement.
-+AC_CHECK_GENERATE_INTTYPES([lib])
-+AM_CONDITIONAL(GENERATED_INTTYPES_H, test x"$ac_cv_header_inttypes_h" != x"yes")
-+AC_CHECK_TYPE(ssize_t, :, AC_DEFINE(ssize_t, __int64, [define ssize_t to __int64 if it's missing in default includes]))
-+
-+
-+dnl ---------------------------------------------
-+dnl threads and OS specific stuff
-+dnl ---------------------------------------------
-+
-+AC_ARG_WITH(pthread-prefix, 
-+  AC_HELP_STRING(
-+    [--with-pthread-prefix=PREFIX],
-+    [path to pthread library]),
-+  [pthread_prefix="$withval"],
-+  [pthread_prefix="no"])
-+
-+case "$host" in
-+  *-*-freebsd*)
-+    if test x"$pthread_prefix" = "xno"; then
-+      pthread_prefix="/usr/local"
-+    fi
-+    THREAD_LIBS="-L$pthread_prefix/lib -pthread"
-+    THREAD_CPPFLAGS="-I$pthread_prefix/include"
-+    CPPFLAGS="$CPPFLAGS $THREAD_CPPFLAGS -D_THREAD_SAFE"
-+    have_pthread=yes
-+
-+    if test x"$am_cv_func_iconv" != xyes; then
-+      AC_MSG_WARN([
-+****************************************************************
-+* You need to install a recent version of the port 'libiconv'  *
-+* (in /usr/ports/converters/libiconv) or to specify prefix     *
-+* by option --with-libiconv-prefix.                            *
-+* The library in this port is needed to successfully compile   *
-+* libsputext plugin.                                           *
-+****************************************************************
-+      ])
-+    fi
-+    ;;
-+
-+  *-*-hpux11*)
-+    THREAD_LIBS="-lpthread"
-+    have_pthread=yes
-+
-+    ;;
-+
-+  *)
-+    if test x"$pthread_prefix" = "xno"; then
-+      THREAD_LIBS="-lpthread"
-+    else
-+      THREAD_LIBS="-L$pthread_prefix/lib -lpthread"
-+      THREAD_CPPFLAGS="-I$pthread_prefix/include"
-+    fi
-+    CPPFLAGS="$CPPFLAGS $THREAD_CPPFLAGS"
-+
-+    ac_save_LIBS="$LIBS"
-+    LIBS="$LIBS $THREAD_LIBS"
-+
-+    AC_CHECK_LIB(pthread, pthread_create, have_pthread=yes)
-+
-+    LIBS="$ac_save_LIBS"
-+    ;;
-+esac
-+
-+if test x"$have_pthread" != "xyes"; then
-+  AC_MSG_ERROR(pthread needed)
-+fi
-+
-+AC_SUBST(THREAD_CPPFLAGS)
-+AC_SUBST(THREAD_LIBS)
-+
-+dnl
-+AC_MSG_CHECKING(for recursive mutex support in pthread)
-+ac_save_LIBS="$LIBS"
-+LIBS="$LIBS $THREAD_LIBS"
-+
-+AC_DEFINE(_GNU_SOURCE)
-+have_recursive_mutex=no
-+AC_COMPILE_IFELSE(AC_LANG_SOURCE([#include <pthread.h>
-+
-+int main() {
-+  pthread_mutexattr_t attr;
-+  pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-+  return 0;
-+}
-+	]),[
-+	    have_recursive_mutex=yes
-+	],[
-+	    AC_MSG_ERROR(recursive mutex support is needed - please report)
-+	])
-+LIBS="$ac_save_LIBS"
-+
-+AC_MSG_RESULT($have_recursive_mutex)
-+
-+
-+dnl ---------------------------------------------
-+dnl Windows ports checks
-+dnl ---------------------------------------------
-+case "$host" in
-+  *-*-mingw* | *-*-cygwin*)
-+    dnl check if we are using the cygwin, mingw or cygwin with mno-cygwin mode
-+    dnl in which case we are actually dealing with a mingw32 compiler
-+    case "$host" in
-+      *-*-mingw32*)
-+        SYS=mingw32
-+        ;;
-+      *-*-cygwin*)
-+        AC_EGREP_CPP(pattern, 
-+                     [#ifdef WIN32
-+                      yes
-+                      #endif],
-+                     SYS=mingw32, SYS=cygwin)
-+        ;;
-+    esac
-+
-+    if test "$SYS" = "mingw32"; then
-+      WIN32_CPPFLAGS='-I$(top_srcdir)/win32/include'
-+      LIBS="-lwinmm -lwsock32 $LIBS"
-+      GOOM_LIBS="-liberty"
-+    fi
-+    LDFLAGS="-no-undefined $LDFLAGS"
-+    ;;
-+esac
-+AC_SUBST(GOOM_LIBS)
-+AC_SUBST(WIN32_CPPFLAGS)
-+AM_CONDITIONAL(WIN32, test x$SYS = "xmingw32")
-+
-+
-+dnl ---------------------------------------------
-+dnl dynamic linker
-+dnl ---------------------------------------------
-+AM_DL()
-+
-+
-+dnl ---------------------------------------------
-+dnl determine libdir name
-+dnl ---------------------------------------------
-+
-+AC_MSG_CHECKING([libdir name])
-+case $host in
-+*-*-linux*)
-+ # Test if the compiler is 64bit
-+ echo 'int i;' > conftest.$ac_ext
-+ xine_cv_cc_64bit_output=no
-+ if AC_TRY_EVAL(ac_compile); then
-+ case `"$MAGIC_CMD" conftest.$ac_objext` in
-+ *"ELF 64"*)
-+   xine_cv_cc_64bit_output=yes
-+   ;;
-+ esac
-+ fi
-+ rm -rf conftest*
-+ ;;
-+esac
-+
-+case $host_cpu:$xine_cv_cc_64bit_output in
-+powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
-+ XINE_LIBNAME="lib64"
-+ ;;
-+*:*)
-+ XINE_LIBNAME="lib"
-+ ;;
-+esac
-+AC_MSG_RESULT([$XINE_LIBNAME])
-+
-+
-+dnl ---------------------------------------------
-+dnl mpeg2lib and ffmpeg stuff
-+dnl ---------------------------------------------
-+
-+AC_SUBST(LIBMPEG2_CFLAGS)
-+AC_SUBST(LIBFFMPEG_CPPFLAGS)
-+
-+LIBMPEG2_CFLAGS=""
-+LIBFFMPEG_CPPFLAGS="-DSIMPLE_IDCT -DHAVE_AV_CONFIG_H -DRUNTIME_CPUDETECT -DUSE_FASTMEMCPY -DCONFIG_RISKY -DCONFIG_DECODERS -DXINE_MPEG_ENCODER -DCONFIG_ZLIB -DCONFIG_GPL"
-+
-+AC_CHECK_DECL(lrintf,[
-+	AC_DEFINE(HAVE_LRINTF,1,[Define this if the 'lrintf' function is declared in math.h])
-+	AC_DEFINE(_ISOC9X_SOURCE,1,[Define this if you are ISO C9X compliant])
-+      ],,[
-+#define _ISOC9X_SOURCE
-+#include <math.h>
-+])
-+AC_CHECK_DECL(rintf,[
-+	AC_DEFINE(HAVE_RINTF,1,[Define this if the 'rintf' function is declared in math.h])
-+      ],,[
-+#include <math.h>
-+])
-+
-+AC_CHECK_TYPES(int_fast8_t, [], [LIBFFMPEG_CFLAGS="$LIBFFMPEG_CFLAGS -DEMULATE_FAST_INT"])
-+
-+AC_ARG_ENABLE(altivec,
-+	AC_HELP_STRING([--disable-altivec], [do not use assembly codes for Motorola 74xx CPUs]),
-+		enable_altivec=$enableval,
-+		enable_altivec=yes)
-+
-+AC_ARG_ENABLE(vis,
-+	AC_HELP_STRING([--disable-vis], [do not use assembly codes for Sun UltraSPARC CPUs]))
-+
-+AC_ARG_ENABLE(mlib,
-+	AC_HELP_STRING([--disable-mlib], [do not build Sun mediaLib support]),
-+		enable_mlib=$enableval,
-+		enable_mlib=yes)
-+
-+AC_ARG_ENABLE(mlib-lazyload,
-+	AC_HELP_STRING([--enable-mlib-lazyload], [check for Sun mediaLib at runtime]),
-+		enable_mlib_lazyload=$enableval,
-+		enable_mlib_lazyload=no)
-+
-+if test x$enable_mlib = xyes; then
-+    if test x"$MLIBHOME" = x; then
-+	mlibhome=/opt/SUNWmlib
-+    else
-+	mlibhome="$MLIBHOME"
-+    fi
-+
-+    AC_CHECK_LIB(mlib, mlib_VideoAddBlock_U8_S16,
-+	[ saved_CPPFLAGS="$CPPFLAGS"
-+	  CPPFLAGS="$CPPFLAGS -I$mlibhome/include"
-+	  AC_CHECK_HEADER(mlib_video.h,
-+	       [ if test x$enable_mlib_lazyload = xyes; then
-+		     if test "$GCC" = yes; then
-+			 MLIB_LIBS="-L$mlibhome/lib -Wl,-z,lazyload,-lmlib,-z,nolazyload"
-+		     else
-+			 MLIB_LIBS="-L$mlibhome/lib -z lazyload -lmlib -z nolazyload"
-+		     fi
-+		     AC_DEFINE(MLIB_LAZYLOAD,1,[Define this if you want to load mlib lazily])
-+		 else
-+		     MLIB_LIBS="-L$mlibhome/lib -lmlib"
-+		 fi
-+		 MLIB_CFLAGS="-I$mlibhome/include"
-+		 LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS $MLIB_CFLAGS" 
-+		 LIBFFMPEG_CFLAGS="$LIBFFMPEG_CFLAGS $MLIB_CFLAGS"
-+		 AC_DEFINE(HAVE_MLIB,1,[Define this if you have mlib installed])
-+		 AC_DEFINE(LIBMPEG2_MLIB,1,[Define this if you have mlib installed])
-+		 ac_have_mlib=yes
-+	       ],)
-+	  CPPFLAGS="$saved_CPPFLAGS"
-+	], , -L$mlibhome/lib)
-+fi
-+AM_CONDITIONAL(HAVE_MLIB, test x$ac_have_mlib = "xyes")
-+AC_SUBST(MLIB_LIBS)
-+AC_SUBST(MLIB_CFLAGS)
-+
-+AM_PATH_FFMPEG(AC_DEFINE(HAVE_FFMPEG, 1, [Define this if you have ffmpeg library]))
-+AM_CONDITIONAL(HAVE_FFMPEG, test x"$external_ffmpeg_found" = "xyes")
-+
-+
-+dnl ---------------------------------------------
-+dnl Checks for X11
-+dnl ---------------------------------------------
-+
-+AC_PATH_XTRA
-+if test x"$no_x" != "xyes"; then
-+    AC_DEFINE(HAVE_X11,1,[Define this if you have X11R6 installed])
-+fi
-+AM_CONDITIONAL(HAVE_X11, [test x"$no_x" != "xyes"])
-+
-+
-+dnl ---------------------------------------------
-+dnl Locate libraries needed for X health check
-+dnl ---------------------------------------------
-+
-+soname_script="/[[0-9]]$/! d; s%^.*/%%
-+t q
-+b
-+:q
-+q"
-+x_lib_location="`ls -1 "${x_libraries:-/usr/local/lib}/libX11.so"* "${x_libraries:-/usr/lib}/libX11.so"* 2>/dev/null | sed -e \"${soname_script}\"`"
-+AC_DEFINE_UNQUOTED([LIBX11_SO], "${x_lib_location:-libX11.so}", [The soname of libX11, needed for dlopen()])
-+x_lib_location="`ls -1 "${x_libraries:-/usr/local/lib}/libXv.so"*  "${x_libraries:-/usr/lib}/libXv.so"*  2>/dev/null | sed -e \"${soname_script}\"`"
-+AC_DEFINE_UNQUOTED([LIBXV_SO],  "${x_lib_location:-libXv.so}",  [The soname of libXv, needed for dlopen()])
-+
-+
-+dnl ---------------------------------------------
-+dnl socket library
-+dnl ---------------------------------------------
-+
-+dnl Test for socket and network support library
-+NET_LIBS=""
-+AC_CHECK_LIB(socket, socket, NET_LIBS="-lsocket $NET_LIBS",)
-+AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",)
-+AC_SUBST(NET_LIBS)
-+
-+
-+dnl ---------------------------------------------
-+dnl socklen_t
-+dnl ---------------------------------------------
-+AC_CHECK_SOCKLEN_T
-+
-+
-+dnl ---------------------------------------------
-+dnl IPv6
-+dnl ---------------------------------------------
-+
-+AC_ARG_ENABLE(ipv6,
-+	AC_HELP_STRING([--enable-ipv6], [enable use of IPv6]),
-+		enable_ipv6=$enableval,
-+		enable_ipv6=no)
-+
-+echo -n "IPv6 is "
-+if test x$enable_ipv6 = xyes; then
-+    CFLAGS="-DENABLE_IPV6 $CFLAGS"
-+    echo "enabled"
-+else
-+    echo "disabled"
-+fi
-+
-+
-+dnl ---------------------------------------------
-+dnl zlib
-+dnl ---------------------------------------------
-+
-+AC_ARG_WITH(zlib-prefix, 
-+  AC_HELP_STRING(
-+    [--with-zlib-prefix=PREFIX],
-+    [path to zlib compression library]),
-+  [zlib_prefix="$withval"],
-+  [zlib_prefix="no"])
-+
-+if test x"$zlib_prefix" = "xno"; then
-+  ZLIB_LIBS="-lz"
-+else
-+  ZLIB_CPPFLAGS="-I$zlib_prefix/include"
-+  ZLIB_LIBS="-L$zlib_prefix/lib -lz"
-+fi
-+
-+ac_save_CPPFLAGS="$CPPFLAGS"
-+ac_save_LIBS="$LIBS"
-+CPPFLAGS="$CPPFLAGS $ZLIB_CPPFLAGS"
-+LIBS="$LIBS $ZLIB_LIBS"
-+
-+AC_CHECK_LIB(z, gzsetparams,
-+  [AC_CHECK_HEADER(zlib.h,
-+     have_zlib=yes)])
-+
-+CPPFLAGS="$ac_save_CPPFLAGS"
-+LIBS="$ac_save_LIBS"
-+
-+if test "x$have_zlib" != "xyes"; then
-+  AC_MSG_ERROR(zlib needed)
-+fi
-+AC_SUBST(ZLIB_CPPFLAGS)
-+AC_SUBST(ZLIB_LIBS)
-+
-+
-+dnl ---------------------------------------------
-+dnl check posix timers
-+dnl ---------------------------------------------
-+
-+AC_CHECK_LIB(rt, clock_getres,
-+             [RT_LIBS="-lrt"
-+              AC_DEFINE(HAVE_POSIX_TIMERS,1,
-+                        [Define this if you have POSIX timers.])], 
-+             AC_MSG_RESULT([*** no POSIX timers available.]))
-+AC_SUBST(RT_LIBS)
-+
-+dnl ---------------------------------------------
-+dnl Check for OpenGL & [GLut | GLU]
-+dnl ---------------------------------------------
-+
-+AM_PATH_OPENGL()
-+
-+
-+dnl ---------------------------------------------
-+dnl Check for platform which supports syncfb
-+dnl ---------------------------------------------
-+
-+case "$host_or_hostalias" in
-+  *linux* )
-+    AC_ARG_ENABLE([fb],
-+      AC_HELP_STRING([--disable-fb], [do not build syncfb plugins]),
-+      have_syncfb=$enableval, have_syncfb="yes")
-+    ;;
-+  *)
-+    have_syncfb="no"
-+    ;;
-+esac
-+AM_CONDITIONAL(HAVE_SYNCFB, test x"$have_syncfb" = "xyes")
-+
-+
-+dnl ----------------------------------------------
-+dnl Check for usable video-for-linux (v4l) support
-+dnl ----------------------------------------------
-+AC_ARG_ENABLE([v4l],
-+  AC_HELP_STRING([--disable-v4l], [do not build Video4Linux support]),
-+  [with_v4l=${enableval}], [with_v4l=yes])
-+
-+if test "x$with_v4l" == "xyes"; then
-+  AC_CHECK_HEADER(linux/videodev.h, have_v4l=yes,)
-+else
-+  have_v4l=no
-+fi
-+AM_CONDITIONAL(HAVE_V4L, [test x"$have_v4l" = "xyes"])
-+
-+
-+dnl ----------------------------------------------
-+dnl Check for Xv and XvMC support
-+dnl ----------------------------------------------
-+
-+dnl With recent XFree86 or Xorg, dynamic linking is preferred!
-+dnl Only dynamic linking is possible when using libtool < 1.4.0
-+
-+AC_ARG_WITH(xv-path, AC_HELP_STRING([--with-xv-path=path], [where libXv is installed]),
-+            xv_path="$withval",)
-+
-+AC_ARG_ENABLE([static-xv],
-+        AC_HELP_STRING([--enable-static-xv],[Enable this to force linking against libXv.a]))
-+
-+if test "x$enable_static_xv" = "xyes"; then
-+  xv_prefer_shared="no"
-+else
-+  xv_prefer_shared="yes"
-+fi
-+
-+if test x"$no_x" != "xyes"; then
-+  AC_FIND_LIBXV
-+fi
-+AM_CONDITIONAL(HAVE_XV, test x$ac_have_xv = "xyes")
-+
-+
-+host_or_hostalias="$host"
-+if test "$host_or_hostalias" = ""; then
-+    dnl user has called ./configure with a host parameter unknown to
-+    dnl config.sub; the canonical "$host" is empty
-+    dnl
-+    dnl Try the following switch with user's original host_alias 
-+    dnl input instead.
-+    dnl
-+    host_or_hostalias="$host_alias"
-+fi
-+
-+case "$host_or_hostalias" in
-+  hppa*)
-+	if test x$ac_have_xv_static = "xyes"; then
-+	  echo "warning: hppa linker - disabling static libXv"
-+	  XV_LIB="libXv.so"
-+	fi
-+	;;
-+
-+  ppc-*-linux* | powerpc-*)
-+        ppc_arch="yes"
-+        ;;
-+
-+  *)
-+        ;;
-+esac
-+AM_CONDITIONAL(PPC_ARCH, test x$ppc_arch = "xyes")
-+
-+dnl
-+dnl Check if we can enable the xxmc plugin.
-+dnl
-+
-+AC_ARG_ENABLE([xvmc],
-+  AS_HELP_STRING([--disable-xvmc], [Disable XxMC and XvMC outplut plugins]) )
-+
-+if test x$no_x = "x" && test "x$enable_xvmc" != "xno"; then
-+
-+AC_ARG_WITH(xxmc-path, AC_HELP_STRING([--with-xxmc-path=path], [where libXvMC libraries for the
-+	xxmc plugin are  installed. Defalts to the default X library path.]),
-+	xxmc_path="$withval", xxmc_path="$x_libraries")
-+AC_ARG_WITH(xxmc-lib, AC_HELP_STRING([--with-xxmc-lib=XXXX], [The name of the XvMC library 
-+	libXXXX.so for the xxmc plugin.]),xxmc_stub="$withval", 
-+	xxmc_stub="XvMCW")
-+
-+saved_libs="$LIBS"
-+saved_CPPFLAGS="$CPPFLAGS"
-+if test x$x_includes != "x"; then
-+	CPPFLAGS="$CPPFLAGS -I$x_includes"
-+fi
-+
-+XXMC_LIB="-L$xxmc_path -l$xxmc_stub"
-+AC_MSG_CHECKING(whether to enable the xxmc plugin with vld extensions)
-+AC_MSG_RESULT()
-+dnl Check if vld "extended" XvMC is available
-+if test x$xxmc_stub == "xXvMCW" && test x$ac_have_xv == "xyes"; then
-+	AC_CHECK_LIB($xxmc_stub, XvMCPutSlice,
-+             	     ac_have_xxmc="yes",
-+	             [ac_have_xxmc="no"
-+              	        AC_MSG_RESULT([*** Could not link with -l$xxmc_stub for vld extensions.])],
-+                     [-L$xxmc_path $X_LIBS $X_PRE_LIBS $XV_LIB -lXext $X_EXTRA_LIBS])
-+else
-+    if test x$ac_have_xv = "xyes"; then 
-+      AC_CHECK_LIB($xxmc_stub, XvMCPutSlice,
-+	           [ac_have_xxmc="yes"
-+	             XXMC_LIB="$XXMC_LIB -lXvMC"],
-+                   [ac_have_xxmc="no"
-+		     AC_MSG_RESULT([*** Could not link with -l$xxmc_stub -lXvMC for vld extensions.])],
-+                   [-L$xxmc_path -lXvMC $X_LIBS $X_PRE_LIBS $XV_LIB -lXext $X_EXTRA_LIBS])
-+    else 
-+      ac_have_xxmc="no",
-+    fi  
-+fi
-+
-+if test x$ac_have_xxmc = "xyes"; then
-+  AC_CHECK_HEADERS(X11/extensions/vldXvMC.h,
-+     [ac_have_vldxvmc_h="yes"],
-+     ac_have_vldxvmc="no",)
-+  if test "x$ac_have_vldxvmc_h" = "xyes"; then
-+     AC_DEFINE([HAVE_VLDXVMC], [1], 
-+               [Define 1 if you have vldXvMC.h])
-+  fi
-+fi
-+dnl Try fallback to standard XvMC if vld failed
-+if test x$ac_have_xxmc = "xno"; then
-+  if test x$xxmc_stub == "xXvMCW"; then
-+	  AC_CHECK_LIB($xxmc_stub, XvMCCreateContext,
-+               ac_have_xxmc="yes",
-+	       [ac_have_xxmc="no"
-+                AC_MSG_RESULT([*** Could not link with -l$xxmc_stub for standard XvMC.])],
-+               [-L$xxmc_path $X_LIBS $X_PRE_LIBS $XV_LIB -lXext $X_EXTRA_LIBS])
-+  else
-+      if test x$ac_have_xv = "xyes"; then 
-+        AC_CHECK_LIB($xxmc_stub, XvMCCreateContext,
-+	             [ac_have_xxmc="yes"
-+		      XXMC_LIB="$XXMC_LIB -lXvMC"],
-+                     [ac_have_xxmc="no"
-+		      AC_MSG_RESULT([*** Could not link with -lXvMC for standard XvMC.])],
-+                     [-L$xxmc_path -lXvMC $X_LIBS $X_PRE_LIBS $XV_LIB -lXext $X_EXTRA_LIBS])
-+      else 
-+        ac_have_xxmc="no",
-+      fi  
-+  fi
-+fi
-+if test x$ac_have_xxmc = "xyes"; then
-+  AC_CHECK_HEADERS(X11/extensions/XvMC.h,,
-+     ac_have_xxmc="no",)
-+fi
-+if test x$ac_have_xxmc = "xyes"; then
-+  AC_DEFINE(HAVE_XXMC,1,[Define this to compile the xxmc plugin.])
-+  if test "x$ac_have_vldxvmc_h" = "xyes"; then
-+    AC_MSG_RESULT([*** Enabling xxmc plugin with vld extensions.])
-+  else
-+    AC_MSG_RESULT([*** Enabling xxmc plugin for standard XvMC *only*.])
-+  fi
-+else
-+  AC_MSG_RESULT([*** Disabling xxmc plugin due to above errors.])
-+fi
-+LIBS="$saved_libs"
-+fi
-+AM_CONDITIONAL(HAVE_VLDXVMC, test x$ac_have_vldxvmc_h = "xyes")
-+AM_CONDITIONAL(HAVE_XXMC, test x$ac_have_xxmc = "xyes")
-+AC_SUBST(XXMC_LIB)
-+	   
-+dnl
-+dnl Check if we can enable the xvmc plugin.
-+dnl
-+if test x$no_x = "x" && test "x$enable_xvmc" != "xno"; then
-+
-+AC_ARG_WITH(xvmc-path, AC_HELP_STRING([--with-xvmc-path=path], [where libXvMC libraries for the
-+	xvmc plugin are  installed. Defalts to the default X library path.]),
-+	xvmc_path="$withval", xvmc_path="$x_libraries")
-+AC_ARG_WITH(xvmc-lib, AC_HELP_STRING([--with-xvmc-lib=XXXX], [The name of the XvMC library 
-+	libXXXX.so for the xvmc plugin.]),xvmc_stub="$withval", 
-+	xvmc_stub="XvMCW")
-+saved_libs="$LIBS"
-+XVMC_LIB="-L$xvmc_path -l$xvmc_stub"
-+AC_MSG_CHECKING(whether to enable the xvmc plugin)
-+AC_MSG_RESULT()
-+if test x$xvmc_stub == "xXvMCW"; then
-+	AC_CHECK_LIB($xvmc_stub, XvMCCreateContext,
-+             ac_have_xvmc="yes",
-+	     [ac_have_xvmc="no"
-+              AC_MSG_RESULT([*** Could not link with -l$xvmc_stub.])],
-+             [-L$xvmc_path $X_LIBS $X_PRE_LIBS $XV_LIB -lXext $X_EXTRA_LIBS])
-+else
-+    if test x$ac_have_xv = "xyes"; then 
-+      AC_CHECK_LIB($xvmc_stub, XvMCCreateContext,
-+	           [ac_have_xvmc="yes"
-+		    XVMC_LIB="$XVMC_LIB -lXvMC"],
-+                   [ac_have_xvmc="no"
-+		    AC_MSG_RESULT([*** Could not link with -lXvMC.])],
-+                   [-L$xvmc_path -lXvMC $X_LIBS $X_PRE_LIBS $XV_LIB -lXext $X_EXTRA_LIBS])
-+    else 
-+      ac_have_xvmc="no",
-+    fi  
-+fi
-+if test x$ac_have_xvmc = "xyes"; then
-+  AC_CHECK_HEADERS(X11/extensions/XvMC.h,,
-+     ac_have_xvmc="no",)
-+fi
-+if test x$ac_have_xvmc = "xyes"; then
-+  AC_DEFINE(HAVE_XVMC,1,[Define this if you have an XvMC library and XvMC.h installed.])
-+  AC_MSG_RESULT([*** Enabling old xvmc plugin.])
-+else
-+  AC_MSG_RESULT([*** Disabling old xvmc plugin due to above errors.])
-+fi
-+CPPFLAGS="$saved_CPPFLAGS"
-+LIBS="$saved_libs"
-+fi
-+AM_CONDITIONAL(HAVE_XVMC, test x$ac_have_xvmc = "xyes")
-+AC_SUBST(XVMC_LIB)
-+
-+
-+dnl ---------------------------------------------
-+dnl Checks for Xinerama extension
-+dnl ---------------------------------------------
-+
-+AC_ARG_ENABLE([xinerama],
-+  AC_HELP_STRING([--disable-xinerama], [do not build Xinerama support]),
-+  [with_xinerama=$enableval], [with_xinerama=yes])
-+
-+if test "x$with_xinerama" = "xyes"; then
-+  AC_CHECK_LIB(Xinerama, XineramaQueryExtension, 
-+             [X_LIBS="$X_LIBS -lXinerama"
-+              AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed])
-+              ac_have_xinerama="yes"],,
-+             [$X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS])
-+else
-+  ac_have_xinerama=no
-+fi
-+dnl AM_CONDITIONAL(HAVE_XINERAMA, test x$ac_have_xinerama = "xyes")
-+
-+ 
-+dnl ---------------------------------------------
-+dnl Checks for Ascii-Art library
-+dnl ---------------------------------------------
-+
-+AC_ARG_ENABLE([aalib],
-+  AC_HELP_STRING([--disable-aalib], [do not build AALIB support]),
-+  [with_aalib=$enableval], [with_aalib=yes])
-+
-+if test "x$with_aalib" = "xyes"; then
-+  AM_PATH_AALIB(1.4,, AC_MSG_RESULT([*** All of AALIB dependent parts will be disabled ***]))
-+else
-+  no_aalib=yes
-+fi
-+
-+AM_CONDITIONAL(HAVE_AA, test x$no_aalib != "xyes")
-+
-+dnl ---------------------------------------------
-+dnl Checks for Color AsCii Art library
-+dnl ---------------------------------------------
-+
-+AC_ARG_ENABLE([caca],
-+  AC_HELP_STRING([--disable-caca], [do not build CACA support]),
-+  [with_caca=$enableval], [with_caca=yes])
-+
-+if test "x$with_caca" = "xyes"; then
-+  AM_PATH_CACA(0.3,, AC_MSG_RESULT([*** All CACA-dependent parts will be disabled ***]))
-+else
-+  no_caca=yes
-+fi
-+AM_CONDITIONAL(HAVE_CACA, test x$no_caca != "xyes")
-+
-+dnl ---------------------------------------------
-+dnl Check solaris framebuffer device support
-+dnl ---------------------------------------------
-+
-+AC_CHECK_HEADER(sys/fbio.h, ac_have_sunfb=yes,)
-+AM_CONDITIONAL(HAVE_SUNFB, [test x"$ac_have_sunfb" = "xyes"])
-+
-+
-+dnl ---------------------------------------------
-+dnl Check for Sun DGA
-+dnl ---------------------------------------------
-+
-+saved_LDFLAGS="$LDFLAGS"
-+LDFLAGS="$LDFLAGS -L/usr/openwin/lib"
-+saved_CPPFLAGS="$CPPFLAGS"
-+CPPFLAGS="$CPPFLAGS -I/usr/openwin/include"
-+AC_CHECK_LIB(dga, XDgaGrabDrawable, [
-+	AC_CHECK_HEADER(dga/dga.h, [
-+	        SUNDGA_CFLAGS="-I/usr/openwin/include"
-+		SUNDGA_LIBS="-L/usr/openwin/lib -R/usr/openwin/lib -ldga"
-+		ac_have_sundga=yes
-+	])
-+])
-+LDFLAGS="$saved_LDFLAGS"
-+CPPFLAGS="$saved_CPPFLAGS"
-+AM_CONDITIONAL(HAVE_SUNDGA, [test x"$ac_have_sundga" = "xyes"])
-+AC_SUBST(SUNDGA_CFLAGS)
-+AC_SUBST(SUNDGA_LIBS)
-+
-+
-+dnl ---------------------------------------------
-+dnl Check linux framebuffer device support
-+dnl ---------------------------------------------
-+
-+AC_CHECK_HEADER(linux/fb.h,
-+                [AC_DEFINE(HAVE_FB,1,[Define this if you have linux framebuffer support])
-+                 have_fb=yes],)
-+AC_ARG_ENABLE(fb, AC_HELP_STRING([--disable-fb], [do not build linux framebuffer support]),
-+	      have_fb=$enableval)
-+AM_CONDITIONAL(HAVE_FB, [test x"$have_fb" = "xyes"])
-+
-+
-+dnl ---------------------------------------------
-+dnl Check whether to build Mac OS X video output driver
-+dnl ---------------------------------------------
-+
-+AC_ARG_ENABLE(macosx_video, AC_HELP_STRING([--enable-macosx-video], [enable support for Mac OS X OpenGL video output]),
-+              have_macosx_video=$enableval)
-+AM_CONDITIONAL(HAVE_MACOSX_VIDEO, [test x"$have_macosx_video" = "xyes"])
-+
-+
-+dnl ---------------------------------------------
-+dnl Check whether to build Mac OS X audio output driver
-+dnl ---------------------------------------------
-+
-+AC_ARG_ENABLE(coreaudio, AC_HELP_STRING([--enable-coreaudio], [enable support for Mac OS X Coreaudio output]),
-+              have_coreaudio=$enableval)
-+AM_CONDITIONAL(HAVE_COREAUDIO, [test x"$have_coreaudio" = "xyes"])
-+
-+
-+dnl ---------------------------------------------
-+dnl Find pkg-config
-+dnl ---------------------------------------------
-+
-+AC_PATH_TOOL(PKG_CONFIG, pkg-config, no)
-+if test x$PKG_CONFIG = xno ; then
-+  echo "*** pkg-config not found. See http://pkgconfig.sourceforge.net"
-+  echo "*** All of DIRECTFB dependent parts will be disabled"
-+else
-+
-+
-+dnl ---------------------------------------------
-+dnl Check for DirectFB
-+dnl ---------------------------------------------
-+AC_ARG_ENABLE(directfb,
-+	AC_HELP_STRING([--enable-directfb], [enable use of DirectFB]),
-+		enable_directfb=$enableval,
-+		enable_directfb=no)
-+
-+  DIRECTFB_REQUIRED_VERSION=0.9.22
-+if test x$enable_directfb = "xyes"; then
-+  AC_MSG_CHECKING(for DirectFB)
-+  if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb ; then
-+        AC_MSG_RESULT(found)
-+        DIRECTFB_CFLAGS=`$PKG_CONFIG --cflags directfb`
-+        DIRECTFB_LIBS=`$PKG_CONFIG --libs directfb`
-+        have_directfb="yes"
-+  else
-+    AC_MSG_RESULT([*** All of DIRECTFB dependent parts will be disabled ***])
-+  fi
-+fi
-+fi
-+
-+AC_SUBST(DIRECTFB_CFLAGS)
-+AC_SUBST(DIRECTFB_LIBS)
-+AM_CONDITIONAL(HAVE_DIRECTFB, test x$have_directfb = "xyes" )
-+
-+
-+dnl ---------------------------------------------
-+dnl check for SDL
-+dnl ---------------------------------------------
-+
-+AC_ARG_ENABLE([sdl],
-+  AC_HELP_STRING([--disable-sdl], [do not build SDL support]),
-+  [with_sdl=$enableval], [with_sdl=yes])
-+
-+if test "x$with_sdl" = "xyes"; then
-+  AM_PATH_SDL(1.1.5, 
-+    AC_DEFINE(HAVE_SDL,1,[Define this if you have SDL library installed]),
-+    [])
-+else
-+  no_sdl=yes
-+fi
-+AM_CONDITIONAL(HAVE_SDL, [test x"$no_sdl" != x"yes"])
-+
-+
-+dnl ---------------------------------------------
-+dnl check for Libstk
-+dnl ---------------------------------------------
-+
-+AC_MSG_CHECKING(for Libstk)
-+dnl do some actual testing here
-+if test x$PKG_CONFIG = xno ; then
-+  AC_MSG_RESULT(no)
-+  echo "*** pkg-config not found. See http://pkgconfig.sourceforge.net"
-+  echo "*** All of LIBSTK dependent parts will be disabled"
-+else
-+    LIBSTK_REQUIRED_VERSION=0.2.0
-+    if $PKG_CONFIG --atleast-version $LIBSTK_REQUIRED_VERSION libstk ; then
-+        LIBSTK_CFLAGS=`$PKG_CONFIG --cflags libstk`
-+        LIBSTK_LIBS=`$PKG_CONFIG --libs libstk`
-+        have_stk="yes"
-+        AC_MSG_RESULT(yes)
-+    else
-+        AC_MSG_RESULT(no)
-+        AC_MSG_RESULT([*** All of Libstk dependent parts will be disabled ***])
-+    fi
-+fi
-+AC_SUBST(LIBSTK_CFLAGS)
-+AC_SUBST(LIBSTK_LIBS)
-+AM_CONDITIONAL(HAVE_STK, [test x"$have_stk" = x"yes"])
-+
-+dnl ---------------------------------------------
-+dnl check for polypaudio
-+dnl ---------------------------------------------
-+
-+AC_ARG_ENABLE([polypaudio],
-+  AC_HELP_STRING([--disable-polypaudio], [do not build Polypaudio support]),
-+  [with_polypaudio=$enableval], [with_polypaudio=yes])
-+
-+if test "x$with_polypaudio" = "xyes"; then
-+  AC_MSG_CHECKING(for polypaudio)
-+  dnl do some actual testing here
-+  if test x$PKG_CONFIG = xno ; then
-+    AC_MSG_RESULT(no)
-+    echo "*** pkg-config not found. See http://pkgconfig.sourceforge.net"
-+    echo "*** All of polypaudio dependent parts will be disabled"
-+  else
-+      POLYPAUDIO_REQUIRED_VERSION=0.6
-+      if $PKG_CONFIG --atleast-version $POLYPAUDIO_REQUIRED_VERSION polyplib ; then
-+          POLYPAUDIO_CFLAGS=`$PKG_CONFIG --cflags polyplib`
-+          POLYPAUDIO_LIBS=`$PKG_CONFIG --libs polyplib`
-+          have_polypaudio="yes"
-+          AC_MSG_RESULT(yes)
-+      else
-+          AC_MSG_RESULT(no)
-+          AC_MSG_RESULT([*** All of polypaudio dependent parts will be disabled ***])
-+      fi
-+  fi
-+  AC_SUBST(POLYPAUDIO_CFLAGS)
-+  AC_SUBST(POLYPAUDIO_LIBS)
-+else
-+  have_polypaudio=no
-+fi
-+AM_CONDITIONAL(HAVE_POLYPAUDIO, [test x"$have_polypaudio" = x"yes"])
-+
-+dnl ---------------------------------------------
-+dnl check for DirectX
-+dnl ---------------------------------------------
-+
-+AM_PATH_DIRECTX()
-+
-+
-+dnl ---------------------------------------------
-+dnl dxr3 / hollywood plus card
-+dnl ---------------------------------------------
-+
-+case "$host_or_hostalias" in
-+  *-linux*)
-+    AC_CHECK_DXR3()
-+    if test x"$have_libfame" = "xyes" ; then
-+      AC_DEFINE_UNQUOTED(HAVE_LIBFAME,1,[Define this if you have libfame mpeg encoder installed (fame.sf.net)])
-+      AM_PATH_LIBFAME(0.8.10, 
-+        AC_DEFINE(HAVE_NEW_LIBFAME,1,[Define this if you have libfame 0.8.10 or above]))
-+    fi
-+    if test x"$have_librte" = "xyes" ; then
-+      AC_DEFINE_UNQUOTED(HAVE_LIBRTE,1,[Define this if you have librte mpeg encoder installed (zapping.sf.net)])
-+    fi
-+    ;;
-+  *)
-+    have_dxr3="no"
-+    have_libfame="no"
-+    have_librte="no"
-+    have_encoder="no"
-+    ;;
-+esac
-+AM_CONDITIONAL(HAVE_DXR3, test x"$have_dxr3" = "xyes")
-+AM_CONDITIONAL(HAVE_LIBFAME, test x"$have_libfame" = "xyes")
-+AM_CONDITIONAL(HAVE_LIBRTE, test x"$have_librte" = "xyes")
-+
-+
-+dnl ---------------------------------------------
-+dnl Vidix/libdha
-+dnl ---------------------------------------------
-+
-+AC_LINUX_PATH(/usr/src/linux)
-+AC_SUBST([LINUX_INCLUDE])
-+
-+AC_ARG_ENABLE(vidix, AC_HELP_STRING([--disable-vidix], [do not build vidix support]),
-+	      check_vidix=$enableval, check_vidix=yes)
-+AC_ARG_ENABLE(dha-kmod, AC_HELP_STRING([--enable-dha-kmod], [build DHA kernel module]),
-+	      enable_dha_kmod=$enableval,enable_dha_kmod=no)
-+
-+enable_vidix="no"
-+
-+AC_MSG_CHECKING(for vidix support)
-+if test x"$check_vidix" = "xyes" -a x"$ac_cv_prog_AWK" != "xno"; then
-+  if test x"$no_x" != "xyes" -o x"$have_fb" = "xyes"; then
-+    case "$host_or_hostalias" in
-+      i?86-*-linux* | k?-*-linux* | athlon-*-linux*)
-+        enable_vidix="yes"
-+        enable_linux="yes"
-+        ;;
-+      i386-*-freebsd*)
-+        enable_vidix="yes"
-+        enable_dha_kmod="no"
-+        ;;
-+      *)
-+        enable_dha_kmod="no"
-+        enable_vidix="no"
-+        ;;
-+    esac
-+  fi
-+fi
-+AC_MSG_RESULT($enable_vidix)
-+
-+AC_MSG_CHECKING(for DHA linux kernel module build)
-+if test x"$enable_dha_kmod" = "xyes"; then
-+  AC_MSG_RESULT(yes)
-+else
-+  AC_MSG_RESULT(no)
-+fi
-+
-+AM_CONDITIONAL(HAVE_VIDIX, test x"$enable_vidix" = "xyes")
-+AM_CONDITIONAL(HAVE_LINUX, test x"$enable_linux" = "xyes")
-+AM_CONDITIONAL(BUILD_DHA_KMOD, test x"$enable_dha_kmod" = "xyes")
-+AC_CHECK_PROG(MKNOD, mknod, mknod, no)
-+AC_CHECK_PROG(DEPMOD, depmod, depmod, no, $PATH:/sbin)
-+
-+
-+dnl ---------------------------------------------
-+dnl Ogg/Vorbis libs.
-+dnl ---------------------------------------------
-+
-+AM_PATH_OGG(
-+           [ AM_PATH_VORBIS([], 
-+	                    AC_MSG_RESULT([*** All OGG/VORBIS dependent parts will be disabled ***])) 
-+	   ], 
-+           AC_MSG_RESULT([*** All of OGG/VORBIS dependent parts will be disabled ***]))
-+AM_CONDITIONAL(HAVE_VORBIS, [test x"$no_ogg" != "xyes" -a x"$no_vorbis" != "xyes"])
-+
-+
-+dnl ---------------------------------------------
-+dnl Ogg/Theora libs.
-+dnl ---------------------------------------------
-+
-+AM_PATH_OGG(
-+           [ AM_PATH_THEORA(AC_DEFINE(HAVE_THEORA,1,[Define this if you have theora]),
-+                           AC_MSG_RESULT([*** All OGG/THEORA dependent parts will be disabled ***]))
-+          ],
-+           AC_MSG_RESULT([*** All of OGG/Theora dependent parts will be disabled ***]))
-+AM_CONDITIONAL(HAVE_THEORA, [test x"$no_ogg" != "xyes" -a x"$no_theora" != "xyes"])
-+
-+
-+dnl ---------------------------------------------
-+dnl Ogg/Speex libs.
-+dnl ---------------------------------------------
-+AC_ARG_ENABLE([speex],
-+  AC_HELP_STRING([--disable-speex], [do not build speex support]),
-+  [with_speex=$enableval], [with_speex=yes])
-+
-+no_speex=yes
-+
-+if test "x$with_speex" = "xyes"; then
-+  PKG_CHECK_MODULES(SPEEX, speex, [
-+    no_speex=no
-+
-+    AC_DEFINE(HAVE_SPEEX,1,[Define this if you have speex])
-+
-+    dnl Test whether Speex headers are eg. <speex.h> or <speex/speex.h>
-+    dnl Speex headers were moved in mid-2004; 1.0.x has backwards compatible headers, 1.1.x does not
-+    AC_CHECK_HEADER([speex/speex.h], [
-+       AC_DEFINE(HAVE_SPEEX_SUBDIR, [1], [Define to 1 if speex headers are eg. <speex/speex.h>])
-+    ])
-+  ], no_speex="yes")
-+fi
-+
-+if test "x$no_speex" = "xyes" ; then
-+  AC_MSG_RESULT([*** All OGG/SPEEX dependent parts will be disabled ***])
-+fi
-+
-+AC_SUBST(SPEEX_CFLAGS)
-+AC_SUBST(SPEEX_LIBS)
-+AM_CONDITIONAL(HAVE_SPEEX, [test x"$no_ogg" != "xyes" -a x"$no_speex" != "xyes"])
-+
-+
-+dnl ---------------------------------------------
-+dnl check for libFLAC
-+dnl ---------------------------------------------
-+
-+AC_ARG_ENABLE([flac],
-+  AC_HELP_STRING([--disable-flac], [do not build flac support]),
-+  [with_flac=$enableval], [with_flac=yes])
-+
-+if test "x$with_flac" = "xyes"; then
-+  AM_PATH_LIBFLAC([],
-+    AC_MSG_RESULT([*** All FLAC dependent parts will be disabled ***]))
-+else
-+  no_libFLAC=yes
-+fi
-+AM_CONDITIONAL(HAVE_FLAC, [test x"$no_libFLAC" != "xyes"])
-+
-+dnl ---------------------------------------------
-+dnl External version of a52dec
-+dnl ---------------------------------------------
-+
-+AC_ARG_ENABLE(a52dec, AC_HELP_STRING([--disable-a52dec], [Disable support for a52dec decoding library (default: enabled)]),
-+              [enable_a52dec="$enableval"], [enable_a52dec="yes"])
-+AC_ARG_WITH(external-a52dec, AC_HELP_STRING([--with-external-a52dec], [use external a52dec library (not recommended)]),
-+            [external_a52dec="$withval"], [external_a52dec="no"])
-+
-+have_a52="no"
-+
-+if test x"$enable_a52dec" = "xno"; then
-+  AC_MSG_RESULT([a52dec support disabled])
-+elif test x"$external_a52dec" = "xyes"; then
-+  have_a52="yes"
-+  AC_CHECK_HEADERS([a52dec/a52.h a52dec/a52_internal.h],, have_a52="no",
-+[
-+  #ifdef HAVE_SYS_TYPES_H
-+  # include <sys/types.h>
-+  #endif
-+  #ifdef HAVE_INTTYPES_H
-+  # include <inttypes.h>
-+  #endif
-+  #ifdef HAVE_STDINT_H
-+  # include <stdint.h>
-+  #endif
-+
-+  #include <a52dec/a52.h>
-+])
-+  SAVE_LIBS="$LIBS"
-+  AC_CHECK_LIB([a52], [a52_init],, have_a52="no", [-lm])
-+  LIBS="$SAVE_LIBS"
-+
-+  if test "x$have_a52" = "xno"; then
-+    AC_MSG_RESULT([*** no usable version of a52dec found, using internal copy ***])
-+  fi
-+else
-+  AC_MSG_RESULT([Use included a52dec support])
-+fi
-+
-+AM_CONDITIONAL(A52, test x"$enable_a52dec" = "xyes")
-+AM_CONDITIONAL(EXTERNAL_A52DEC, test x"$have_a52" = "xyes")
-+
-+dnl ---------------------------------------------
-+dnl External version of libmad
-+dnl ---------------------------------------------
-+
-+AC_ARG_ENABLE(mad, AC_HELP_STRING([--disable-mad], [Disable support for MAD decoding library (default: enabled)]),
-+              [enable_libmad="$enableval"], [enable_libmad="yes"])
-+AC_ARG_WITH(external-libmad, AC_HELP_STRING([--with-external-libmad], [use external libmad library (not recommended)]),
-+            [external_libmad="$withval"], [external_libmad="no"])
-+
-+have_mad="no"
-+
-+if test "x$enable_libmad" = "xno"; then
-+  AC_MSG_RESULT([libmad support disabled])
-+elif test x"$external_libmad" = "xyes"; then
-+  PKG_CHECK_MODULES(LIBMAD, [mad], have_mad=yes, have_mad=no)
-+  AC_CHECK_HEADERS([mad.h])
-+  AC_SUBST(LIBMAD_LIBS)
-+  AC_SUBST(LIBMAD_CFLAGS)
-+  if test "x$have_mad" = "xno"; then
-+    AC_MSG_RESULT([*** no usable version of libmad found, using internal copy ***])
-+  fi
-+else
-+  AC_MSG_RESULT([Use included libmad support])
-+fi
-+
-+AM_CONDITIONAL(MAD, test "x$enable_libmad" = "xyes")
-+AM_CONDITIONAL(EXTERNAL_LIBMAD, test x"$have_mad" = "xyes")
-+
-+dnl ---------------------------------------------
-+dnl MNG libs.
-+dnl ---------------------------------------------
-+
-+AC_ARG_ENABLE([mng],
-+  AC_HELP_STRING([--disable-mng], [do not build mng support]),
-+  [with_mng=$enableval], [with_mng=yes])
-+
-+if test "x$with_mng" = "xyes"; then
-+  AC_CHECK_LIB(mng, mng_initialize,
-+	[ AC_CHECK_HEADER(libmng.h,
-+		[ have_libmng=yes
-+		  MNG_LIBS="-lmng" ], 
-+		AC_MSG_RESULT([*** All libmng dependent parts will be disabled ***]))],
-+	AC_MSG_RESULT([*** All libmng dependent parts will be disabled ***]))
-+  AC_SUBST(MNG_LIBS)
-+else
-+  have_libmng=no
-+fi
-+AM_CONDITIONAL(HAVE_LIBMNG, test x"$have_libmng" = "xyes")
-+
-+dnl ---------------------------------------------
-+dnl MagickWand API of Imagemagick.
-+dnl ---------------------------------------------
-+
-+AC_ARG_ENABLE([imagemagick],
-+  AC_HELP_STRING([--disable-imagemagick], [do not build ImageMagick support]),
-+  [with_imagemagick=$enableval], [with_imagemagick=yes])
-+
-+if test "x$with_imagemagick" = "xyes"; then
-+  AC_PATH_TOOL(WAND_CONFIG, Wand-config, no)
-+  if test "$WAND_CONFIG" = "no" ; then
-+    AC_MSG_RESULT([*** All Imagemagick dependent parts will be disabled, Wand-config not found. ***])
-+    have_imagemagick="no"
-+  else
-+    WAND_CFLAGS=`$WAND_CONFIG --cflags`
-+    WAND_CPPFLAGS=`$WAND_CONFIG --cppflags`
-+    WAND_LDFLAGS=`$WAND_CONFIG --ldflags`
-+    WAND_LIBS=`$WAND_CONFIG --libs`
-+    have_imagemagick="yes"
-+    AC_DEFINE(HAVE_WAND,1,[Define this if you have Imagemagick])
-+  fi
-+else
-+  have_imagemagick="no"
-+fi
-+
-+AM_CONDITIONAL(HAVE_WAND, test x"$have_imagemagick" = "xyes" )
-+AC_SUBST(WAND_CFLAGS)
-+AC_SUBST(WAND_CPPFLAGS)
-+AC_SUBST(WAND_LDFLAGS)
-+AC_SUBST(WAND_LIBS)
-+
-+dnl ---------------------------------------------
-+dnl freetype2 lib.
-+dnl ---------------------------------------------
-+
-+AM_PATH_FREETYPE2()
-+
-+
-+dnl ---------------------------------------------
-+dnl OSS style audio interface
-+dnl ---------------------------------------------
-+AC_ARG_ENABLE([oss],
-+  AC_HELP_STRING([--disable-oss], [do not build OSS support]),
-+  [with_oss=$enableval], [with_oss=yes])
-+
-+if test "x$with_oss" = "xyes"; then
-+  AC_MSG_CHECKING(for OSS audio support)
-+  have_ossaudio=no
-+  AC_TRY_COMPILE([
-+	    #ifdef __NetBSD__
-+	    #include <soundcard.h>
-+	    #else
-+	    #include <sys/soundcard.h>
-+	    #endif
-+	],[
-+	    int arg = SNDCTL_DSP_SETFRAGMENT;
-+	],[
-+	    have_ossaudio=yes
-+	])
-+  AC_MSG_RESULT($have_ossaudio)
-+else
-+  have_ossaudio=no
-+fi
-+AM_CONDITIONAL(HAVE_OSS, test x"$have_ossaudio" = "xyes")
-+
-+
-+dnl ---------------------------------------------
-+dnl Alsa support
-+dnl ---------------------------------------------
-+
-+AM_PATH_ALSA(0.9.0rc4, 
-+        [ AC_DEFINE(HAVE_ALSA,1,[Define this if you have Alsa (libasound) installed])
-+          if test x"$have_alsa09" = "xyes"; then
-+            AC_DEFINE(HAVE_ALSA09,1,[Define this if you have ALSA 0.9.x or later installed])
-+          fi
-+        ],
-+	AC_MSG_RESULT(*** All of ALSA dependent parts will be disabled ***))
-+AM_CONDITIONAL(HAVE_ALSA, test x"$no_alsa" != "xyes")
-+AM_CONDITIONAL(HAVE_ALSA09, test x"$have_alsa09" = "xyes")
-+
-+dnl ---------------------------------------------
-+dnl ESD support
-+dnl ---------------------------------------------
-+
-+AC_ARG_ENABLE([esd],
-+  AC_HELP_STRING([--disable-esd], [do not build esd support]),
-+  [with_esd=$enableval], [with_esd=yes])
-+
-+if test "x$with_esd" = "xyes"; then
-+  AM_PATH_ESD(0.2.8,
-+        AC_DEFINE(HAVE_ESD,1,[Define this if you have ESD (libesd) installed]),
-+        AC_MSG_RESULT(*** All of ESD dependent parts will be disabled ***))
-+else
-+  no_esd=yes
-+fi
-+AM_CONDITIONAL(HAVE_ESD, test x"$no_esd" != "xyes")
-+
-+
-+dnl ---------------------------------------------
-+dnl ARTS support
-+dnl ---------------------------------------------
-+
-+AC_ARG_ENABLE([arts],
-+  AC_HELP_STRING([--disable-arts], [do not build arts support]),
-+  [with_arts=$enableval], [with_arts=yes])
-+
-+if test "x$with_arts" = "xyes"; then
-+  AM_PATH_ARTS(0.9.5,
-+        AC_DEFINE(HAVE_ARTS,1,[Define this if you have ARTS (libartsc) installed]),
-+        AC_MSG_RESULT(*** All of ARTS dependent parts will be disabled ***))
-+else
-+  no_arts=yes
-+fi
-+AM_CONDITIONAL(HAVE_ARTS, test x"$no_arts" != "xyes")
-+
-+
-+dnl ---------------------------------------------
-+dnl FusionSound support
-+dnl ---------------------------------------------
-+
-+AC_ARG_ENABLE([fusionsound],
-+  AC_HELP_STRING([--enable-fusionsound], [build with fusionsound support]),
-+  [with_fusionsound=$enableval], [with_fusionsound=no])
-+
-+if test "x$with_fusionsound" = "xyes"; then
-+  PKG_CHECK_MODULES(FUSIONSOUND, fusionsound >= 0.9.23,
-+      AC_DEFINE(HAVE_FUSIONSOUND,1,[Define to 1 if you have FusionSound.]),
-+      AC_MSG_RESULT(*** All of FusionSound dependent parts will be disabled ***))
-+  AC_SUBST(FUSIONSOUND_CFLAGS)
-+  AC_SUBST(FUSIONSOUND_LIBS)
-+else
-+  no_fusionsound=yes
-+fi
-+AM_CONDITIONAL(HAVE_FUSIONSOUND, test x"$no_fusionsound" != "xyes")
-+
-+
-+dnl ---------------------------------------------
-+dnl gnome-vfs support
-+dnl ---------------------------------------------
-+
-+AC_ARG_ENABLE([gnomevfs],
-+  AC_HELP_STRING([--disable-gnomevfs], [do not build gnome-vfs support]),
-+  [with_gnome_vfs=$enableval], [with_gnome_vfs=yes])
-+
-+if test "x$with_gnome_vfs" = "xyes"; then
-+  PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0,
-+                no_gnome_vfs=no,
-+		no_gnome_vfs=yes)
-+  AC_SUBST(GNOME_VFS_CFLAGS)
-+  AC_SUBST(GNOME_VFS_LIBS)
-+  if test x"$no_gnome_vfs" != "xyes"; then
-+    AC_DEFINE(HAVE_GNOME_VFS,1,[Define this if you have gnome-vfs installed])
-+  else
-+    AC_MSG_RESULT(*** All of the gnome-vfs dependent parts will be disabled ***)
-+  fi
-+else
-+  no_gnome_vfs=yes
-+fi
-+AM_CONDITIONAL(HAVE_GNOME_VFS, test x"$no_gnome_vfs" != "xyes")
-+
-+dnl ---------------------------------------------
-+dnl gdk-pixbuf support
-+dnl ---------------------------------------------
-+
-+AC_ARG_ENABLE([gdkpixbuf],
-+  AC_HELP_STRING([--disable-gdkpixbuf], [do not build gdk-pixbuf support]),
-+  [with_gdkpixbuf=$enableval], [with_gdkpixbuf=yes])
-+
-+if test "x$with_gdkpixbuf" = "xyes"; then
-+  PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0,
-+                no_gdkpixbuf=no,
-+		no_gdkpixbuf=yes)
-+  AC_SUBST(GDK_PIXBUF_CFLAGS)
-+  AC_SUBST(GDK_PIXBUF_LIBS)
-+  if test x"$no_gdkpixbuf" != "xyes"; then
-+    AC_DEFINE(HAVE_GDK_PIXBUF,1,[Define this if you have gdk-pixbuf installed])
-+  else
-+    AC_MSG_RESULT(*** All of the gdk-pixbuf dependent parts will be disabled ***)
-+  fi
-+else
-+  no_gdkpixbuf=yes
-+fi
-+AM_CONDITIONAL(HAVE_GDK_PIXBUF, test x"$no_gdkpixbuf" != "xyes")
-+
-+dnl ---------------------------------------------
-+dnl libsmbclient support
-+dnl ---------------------------------------------
-+
-+AC_ARG_ENABLE([samba],
-+  AC_HELP_STRING([--disable-samba], [do not build Samba support]),
-+  [with_samba=$enableval], [with_samba=yes])
-+
-+if test "x$with_samba" = "xyes"; then
-+  AC_CHECK_LIB(smbclient, smbc_init,
-+	[ AC_CHECK_HEADER(libsmbclient.h,
-+		[ have_libsmbclient=yes
-+		  LIBSMBCLIENT_LIBS="-lsmbclient" ], 
-+		AC_MSG_RESULT([*** All libsmbclient dependent parts will be disabled ***]))],
-+	AC_MSG_RESULT([*** All libsmbclient dependent parts will be disabled ***]))
-+  AC_SUBST(LIBSMBCLIENT_LIBS)
-+fi
-+AM_CONDITIONAL(HAVE_LIBSMBCLIENT, test x"$have_libsmbclient" = "xyes")
-+
-+
-+dnl ---------------------------------------------
-+dnl SUN style audio interface
-+dnl ---------------------------------------------
-+
-+AC_MSG_CHECKING(for Sun audio support)
-+have_sunaudio=no
-+AC_TRY_COMPILE([
-+	    #include <sys/types.h>
-+	    #include <sys/audioio.h>
-+	],[
-+	    audio_info_t audio_info;
-+	    AUDIO_INITINFO(&audio_info);
-+	],[
-+	    have_sunaudio=yes
-+	])
-+AC_MSG_RESULT($have_sunaudio)
-+AM_CONDITIONAL(HAVE_SUNAUDIO, test x"$have_sunaudio" = "xyes")
-+
-+
-+dnl ---------------------------------------------
-+dnl IRIX style audio interface
-+dnl ---------------------------------------------
-+
-+AM_CHECK_IRIXAL([AC_DEFINE(HAVE_IRIXAL,1,
-+			[Define this if you have a usable IRIX al interface available])],
-+	[AC_MSG_RESULT([*** All of IRIX AL dependent parts will be disabled ***])])
-+AM_CONDITIONAL(HAVE_IRIXAL, [test "x$am_cv_have_irixal" = xyes])
-+
-+
-+dnl ---------------------------------------------
-+dnl Solaris kstat kernel statistics
-+dnl ---------------------------------------------
-+
-+AC_CHECK_LIB(kstat, kstat_open,
-+	[KSTAT_LIBS=-lkstat
-+	 AC_DEFINE(HAVE_KSTAT,1,[Define this if you have kernel statistics available via kstat interface])])
-+AC_SUBST(KSTAT_LIBS)
-+
-+
-+dnl ---------------------------------------------
-+dnl cdrom ioctls
-+dnl ---------------------------------------------
-+
-+AC_CHECK_HEADERS(sys/cdio.h linux/cdrom.h)
-+AM_CHECK_CDROM_IOCTLS(
-+	[AC_DEFINE(HAVE_CDROM_IOCTLS,1,[Define this if you have CDROM ioctls])],
-+	[AC_MSG_RESULT([*** (S)VCD support will be disabled ***])])
-+AM_CONDITIONAL(HAVE_CDROM_IOCTLS, [test x"$have_cdrom_ioctls" = "xyes"])
-+
-+
-+dnl ---------------------------------------------
-+dnl check for a usable version of libdvdnav
-+dnl ---------------------------------------------
-+
-+AC_ARG_WITH(external-dvdnav, AC_HELP_STRING([--with-external-dvdnav], [use external dvdnav library (not recommended)]),
-+            [external_dvdnav="$withval"], [no_dvdnav="yes"; external_dvdnav="no"])
-+
-+if test x"$external_dvdnav" = "xyes"; then
-+  AM_PATH_DVDNAV(0.1.9,
-+	  AC_DEFINE(HAVE_DVDNAV,1,[Define this if you have a suitable version of libdvdnav]),
-+	  [AC_MSG_RESULT([*** no usable version of libdvdnav found, using internal copy ***])])
-+else
-+  AC_MSG_RESULT([Use included DVDNAV support])
-+fi
-+
-+AM_CONDITIONAL(HAVE_DVDNAV, [test x"$no_dvdnav" != "xyes"])
-+
-+
-+dnl ---------------------------------------------
-+dnl Video CD
-+dnl ---------------------------------------------
-+
-+AC_ARG_ENABLE(vcd, AC_HELP_STRING([--disable-vcd], [do not compile VCD plugin]),
-+              enable_vcd=$enableval, enable_vcd=yes)
-+
-+dnl Force build of both vcd plugins, for now.
-+dnl AC_ARG_ENABLE(vcdo, AC_HELP_STRING([--disable-vcdo], [do not compile old VCD plugin]),
-+dnl               enable_vcdo=$enableval, enable_vcdo=yes)
-+dnl
-+enable_vcdo="yes"
-+
-+AC_ARG_WITH(internal-vcdlibs, AC_HELP_STRING([--with-internal-vcdlibs], [force using internal libcdio/libvcd/libvcdinfo]),
-+            [internal_vcdnav="$withval"], [internal_vcdnav="no"])
-+
-+if test x"$enable_vcd" = "xyes"; then
-+  dnl empty_array_size
-+  AC_MSG_CHECKING([how to create empty arrays])
-+
-+  empty_array_size="xxx"
-+  AC_TRY_COMPILE([],[struct { int foo; int bar[]; } doo;], empty_array_size="")
-+
-+  if test "x$empty_array_size" = "xxxx";then
-+   AC_TRY_COMPILE([],[struct { int foo; int bar[0]; } doo;], empty_array_size="0")
-+  fi
-+
-+  if test "x$empty_array_size" = "xxxx"
-+  then
-+    AC_MSG_ERROR([compiler is unable to creaty empty arrays])
-+  else
-+    AC_DEFINE_UNQUOTED(EMPTY_ARRAY_SIZE, $empty_array_size, 
-+	   [what to put between the brackets for empty arrays])
-+    changequote(`,')
-+    msg="[${empty_array_size}]"
-+    changequote([,])
-+  AC_MSG_RESULT($msg)
-+  fi
-+  dnl empty_array_size
-+
-+  if test x"$internal_vcdnav" = "xno" && test x"$PKG_CONFIG" != "xno" ; then
-+    AC_MSG_CHECKING(for libcdio)
-+    if $PKG_CONFIG --atleast-version 0.71 libcdio; then
-+      AC_MSG_RESULT(found)
-+      LIBCDIO_CFLAGS=`$PKG_CONFIG --cflags libcdio`
-+      LIBCDIO_LIBS=`$PKG_CONFIG --libs libcdio`
-+
-+      AC_MSG_CHECKING(for libvcdinfo)
-+      if $PKG_CONFIG --atleast-version 0.7.21 libvcdinfo; then
-+        AC_MSG_RESULT(found)
-+        LIBVCDINFO_CFLAGS=`$PKG_CONFIG --cflags libvcdinfo`
-+        LIBVCDINFO_LIBS=`$PKG_CONFIG --libs libvcdinfo`
-+	  AC_DEFINE(HAVE_VCDNAV,1,[Define this if you have a suitable version of libcdio/libvcd])
-+      else
-+        AC_MSG_RESULT([Use included libcdio/libvcdinfo support])
-+	internal_vcdnav="yes"
-+      fi
-+
-+    else
-+      AC_MSG_RESULT([Use included libcdio/libvcdinfo support])
-+      internal_vcdnav="yes"
-+    fi
-+  else
-+    AC_MSG_RESULT([Use included libcdio/libvcdinfo support])
-+    internal_vcdnav="yes"
-+  fi
-+
-+  dnl check twice, fallback is internal copy
-+  if test x"$internal_vcdnav" = "xyes"; then
-+    AC_DEFINE_UNQUOTED(HOST_ARCH, "$host_os/$host_cpu", [host os/cpu identifier])
-+    AC_CHECK_FUNCS(snprintf vsnprintf, , [AC_MSG_ERROR(required function not found)])
-+
-+    AC_DEFINE(_DEVELOPMENT_, [], enable warnings about being development release)
-+    AC_DEFINE(_GNU_SOURCE, [], enable GNU libc extension)
-+    AC_STDC_HEADERS
-+    AC_CHECK_HEADERS(sys/stat.h stdint.h glob.h inttypes.h stdbool.h)
-+
-+    if test "x$ac_cv_header_stdint_h" != "xyes" 
-+     then
-+       AC_CHECK_SIZEOF(int, 4)
-+       AC_CHECK_SIZEOF(long, 4)
-+       AC_CHECK_SIZEOF(long long, 8)
-+    fi
-+
-+    dnl ISOC99_PRAGMA
-+    AC_MSG_CHECKING([whether $CC supports ISOC99 _Pragma()])
-+    AC_TRY_COMPILE([],[_Pragma("pack(1)")], [
-+      ISOC99_PRAGMA=yes 
-+      AC_DEFINE(HAVE_ISOC99_PRAGMA, [], [Supports ISO _Pragma() macro])
-+    ],ISOC99_PRAGMA=no)
-+    AC_MSG_RESULT($ISOC99_PRAGMA)
-+
-+    dnl
-+    dnl bitfield order
-+    dnl
-+    AC_MSG_CHECKING([bitfield ordering in structs])
-+
-+    dnl basic compile test for all platforms
-+    AC_COMPILE_IFELSE([
-+int main() {
-+  struct { char bit_0:1, bit_12:2, bit_345:3, bit_67:2; }
-+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
-+  __attribute__((packed))
-+#endif
-+  bf = { 1,1,1,1 };
-+  switch (0) case 0: case sizeof(bf) == 1:;
-+  return 0;
-+}
-+], [], AC_MSG_ERROR([compiler doesn't support bitfield structs]))
-+
-+
-+    dnl run test
-+    AC_RUN_IFELSE([
-+int main() {
-+  struct { char bit_0:1, bit_12:2, bit_345:3, bit_67:2; }
-+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
-+  __attribute__((packed))
-+#endif
-+  bf = { 1,1,1,1 };
-+  if (sizeof (bf) != 1) return 1;
-+  return *((unsigned char*) &bf) != 0x4b; }
-+], bf_lsbf=1, [
-+  AC_RUN_IFELSE([
-+int main() {
-+  struct { char bit_0:1, bit_12:2, bit_345:3, bit_67:2; }
-+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
-+  __attribute__((packed))
-+#endif
-+ bf = { 1,1,1,1 };
-+ if (sizeof (bf) != 1) return 1;
-+ return *((unsigned char*) &bf) != 0xa5; }
-+], bf_lsbf=0, AC_MSG_ERROR([unsupported bitfield ordering]))
-+  ],
-+  [case "$host" in
-+     *-*-mingw32* | *-*-cygwin*)
-+       bf_lsbf=1
-+     ;;
-+     *)
-+       AC_MSG_RESULT([unknown])
-+       AC_MSG_ERROR([value of bitfield test isn't known for $host
-+*********************************************************************
-+Value of bitfield test can't be found out for cross-compiling and we
-+don't know its value for host "$host".
-+
-+Because it's needed for VCD plugin, disable VCD by configure option
-+--disable-vcd or use external VCD library.
-+*********************************************************************])
-+  esac]
-+)
-+
-+    if test "x$cross_compiling" = "xyes"; then
-+      TEXT=" (guessed)"
-+    else
-+      TEXT=""
-+    fi
-+    if test "x$bf_lsbf" = "x1"; then
-+     AC_MSG_RESULT(LSBF${TEXT})
-+     AC_DEFINE(BITFIELD_LSBF, [], [compiler does lsbf in struct bitfields])
-+    else
-+     AC_MSG_RESULT(MSBF${TEXT})
-+    fi
-+
-+    AC_HAVE_HEADERS( errno.h fcntl.h \
-+		     stdbool.h  stdlib.h stdint.h stdio.h string.h \
-+		     strings.h linux/version.h sys/cdio.h sys/stat.h \
-+		     sys/types.h )
-+
-+    LIBCDIO_CFLAGS='-I$(top_srcdir)/src/input/vcd/libcdio'
-+    LIBCDIO_LIBS='$(top_builddir)/src/input/vcd/libcdio/libcdio.la'
-+    LIBISO9660_LIBS='$(top_builddir)/src/input/vcd/libcdio/libiso9660.la'
-+    LIBVCD_CFLAGS='-I$(top_srcdir)/src/input/vcd/libvcd'
-+    LIBVCD_LIBS='$(top_builddir)/src/input/vcd/libvcd/libvcd.la'
-+    LIBVCDINFO_LIBS='$(top_builddir)/src/input/vcd/libvcd/libvcdinfo.la'
-+
-+    case $host_os in
-+         darwin*)
-+           AC_CHECK_HEADERS(IOKit/IOKitLib.h CoreFoundation/CFBase.h, 
-+                            [have_iokit_h="yes"])
-+           if test "x$have_iokit_h" = "xyes" ; then 
-+             AC_DEFINE([HAVE_DARWIN_CDROM], [1],
-+	          [Define 1 if you have Darwin OS X-type CD-ROM support])
-+           fi
-+         ;;
-+         linux*)
-+            AC_CHECK_HEADERS(linux/version.h)
-+            AC_CHECK_HEADERS(linux/cdrom.h, [have_linux_cdrom_h="yes"])
-+	    if test "x$have_linux_cdrom_h" = "xyes" ; then
-+	       AC_TRY_COMPILE(,[
-+#include <linux/cdrom.h>
-+struct cdrom_generic_command test;
-+int has_timeout=sizeof(test.timeout);],
-+                [AC_DEFINE([HAVE_LINUX_CDROM_TIMEOUT], [1], 
-+                       [Define 1 if timeout is in cdrom_generic_command struct])])
-+	       AC_DEFINE([HAVE_LINUX_CDROM], [1], 
-+                       [Define 1 if you have Linux-type CD-ROM support])
-+	    fi
-+	 ;;
-+         bsdi*)
-+            AC_CHECK_HEADERS(dvd.h, [have_bsdi_dvd_h="yes"])
-+	    if test "x$have_bsdi_dvd_h" = "xyes" ; then
-+     	      AC_DEFINE([HAVE_BSDI_CDROM], [1], 
-+                        [Define 1 if you have BSDI-type CD-ROM support])
-+	    fi
-+	 ;;
-+         sunos*|sun*|solaris*)
-+            AC_CHECK_HEADERS(sys/cdio.h)
-+     	    AC_DEFINE([HAVE_SOLARIS_CDROM], [1], 
-+                      [Define 1 if you have Solaris CD-ROM support])
-+	 ;;
-+         cygwin*)
-+	    AC_DEFINE([CYGWIN], [1], 
-+                      [Define 1 if you are compiling using cygwin])
-+     	    AC_DEFINE([HAVE_WIN32_CDROM], [1], 
-+                      [Define 1 if you have MinGW CD-ROM support])
-+	    LIBCDIO_LIBS="$LIBCDIO_LIBS -lwinmm"
-+	    LIBVCD_LIBS="$LIBVCD_LIBS -lwinmm"
-+	 ;;
-+         mingw*)
-+	    AC_DEFINE([MINGW32], [1], 
-+                      [Define 1 if you are compiling using MinGW])
-+     	    AC_DEFINE([HAVE_WIN32_CDROM], [1], 
-+                      [Define 1 if you have MinGW CD-ROM support])
-+	 ;;
-+         freebsd4.*)
-+     	    AC_DEFINE([HAVE_FREEBSD_CDROM], [1], 
-+                      [Define 1 if you have FreeBSD CD-ROM support])
-+	 ;;
-+         *)
-+	    AC_MSG_WARN(Don't have OS CD-reading support for ${host_os}...)
-+	    AC_MSG_WARN(Will use generic support.)
-+	 ;;
-+    esac
-+    AC_SUBST(LINUX_CDROM_TIMEOUT)
-+    AC_SUBST(HAVE_BSDI_CDROM)
-+    AC_SUBST(HAVE_DARWIN_CDROM)
-+    AC_SUBST(HAVE_FREEBSD_CDROM)
-+    AC_SUBST(HAVE_LINUX_CDROM)
-+    AC_SUBST(HAVE_SOLARIS_CDROM)
-+    AC_SUBST(HAVE_WIN32_CDROM)
-+    AC_SUBST(LINUX_CDROM_TIMEOUT)
-+    AC_SUBST(LIBVCD_SYSDEP)
-+
-+    AC_CHECK_FUNCS( bzero memcpy )
-+
-+    AC_CHECK_MEMBER([struct tm.tm_gmtoff],
-+                    [AC_DEFINE(HAVE_TM_GMTOFF, 1,
-+                           [Define if struct tm has the tm_gmtoff member.])],
-+                     ,
-+                     [#include <time.h>])
-+  fi
-+fi
-+
-+AC_DEFINE([LIBCDIO_CONFIG_H], 1, [This defined to get of rid system libcdio build configuration])
-+AC_SUBST(LIBCDIO_CFLAGS)
-+AC_SUBST(LIBCDIO_LIBS)
-+AC_SUBST(LIBISO9660_LIBS)
-+AC_SUBST(LIBVCD_CFLAGS)
-+AC_SUBST(LIBVCD_LIBS)
-+AC_SUBST(LIBVCDINFO_LIBS)
-+AM_CONDITIONAL(HAVE_VCDNAV, [test x"$internal_vcdnav" = "xno"])
-+AM_CONDITIONAL(ENABLE_VCD, [test x"$enable_vcd" = "xyes"])
-+
-+
-+dnl ---------------------------------------------
-+dnl ASF build can be optional
-+dnl ---------------------------------------------
-+
-+AC_ARG_ENABLE(asf, AC_HELP_STRING([--disable-asf], [do not build ASF demuxer]),
-+	      enable_asf=$enableval, enable_asf=yes)
-+AM_CONDITIONAL(BUILD_ASF, test x"$enable_asf" = "xyes")
-+
-+
-+dnl ---------------------------------------------
-+dnl FAAD build can be optional
-+dnl ---------------------------------------------
-+
-+AC_ARG_ENABLE(faad, AC_HELP_STRING([--disable-faad], [do not build FAAD decoder]),
-+	      enable_faad=$enableval, enable_faad=yes)
-+AM_CONDITIONAL(BUILD_FAAD, test x"$enable_faad" = "xyes")
-+
-+dnl ---------------------------------------------
-+dnl Optional and external libdts
-+dnl ---------------------------------------------
-+
-+AC_ARG_ENABLE(dts, AC_HELP_STRING([--disable-dts], [Disable support for DTS decoding library (default: enabled)]),
-+              [enable_libdts="$enableval"], [enable_libdts="yes"])
-+AC_ARG_WITH(external-libdts, AC_HELP_STRING([--with-external-libdts], [use external libdts library (not recommended)]),
-+            [external_libdts="$withval"], [external_libdts="no"])
-+
-+have_dts="no"
-+
-+if test "x$enable_libdts" = "xno"; then
-+  AC_MSG_RESULT([libdts support disabled])
-+elif test x"$external_libdts" = "xyes"; then
-+  PKG_CHECK_MODULES(LIBDTS, [libdts], have_dts=yes, have_dts=no)
-+  AC_CHECK_HEADERS([dts.h])
-+  AC_SUBST(LIBDTS_LIBS)
-+  AC_SUBST(LIBDTS_CFLAGS)
-+  if test "x$have_dts" = "xno"; then
-+    AC_MSG_RESULT([*** no usable version of libdts found, using internal copy ***])
-+  fi
-+else
-+  AC_MSG_RESULT([Use included libdts support])
-+fi
-+
-+AM_CONDITIONAL(DTS, test "x$enable_libdts" = "xyes")
-+AM_CONDITIONAL(EXTERNAL_LIBDTS, test x"$have_dts" = "xyes")
-+
-+dnl ---------------------------------------------
-+dnl libmodplug support 
-+dnl ---------------------------------------------
-+AC_ARG_ENABLE([modplug],
-+  AS_HELP_STRING([--enable-modplug], [Enable modplub support]) )
-+
-+if test "x$enable_modplug" != "xno"; then
-+  PKG_CHECK_MODULES([LIBMODPLUG], [libmodplug >= 0.7],
-+    AC_DEFINE([HAVE_MODPLUG], 1, [define this if you have libmodplug installed]),
-+    [enable_modplug=no])
-+fi
-+
-+AC_SUBST(LIBMODPLUG_CFLAGS)
-+AC_SUBST(LIBMODPLUG_LIBS)
-+dnl AM_CONDITIONAL(HAVE_MODPLUG, [test x"$have_modplug" = x"yes"])
-+
-+
-+dnl ---------------------------------------------
-+dnl Win32 DLL codecs
-+dnl ---------------------------------------------
-+AC_ARG_ENABLE([w32dll],
-+  AC_HELP_STRING([--disable-w32dll], [Disable Win32 DLL support]),
-+  enable_w32dll=$enableval, [
-+    AC_MSG_CHECKING([whether to enable Win32 DLL support])
-+    case "$host_or_hostalias" in
-+      *-mingw* | *-cygwin)
-+        enable_w32dll="no"
-+        ;;
-+      i?86-* | k?-* | athlon-* | pentium*-)
-+        enable_w32dll="yes"
-+        ;;
-+      *)
-+        enable_w32dll="no"
-+    esac
-+    AC_MSG_RESULT([$enable_w32dll])])
-+AM_CONDITIONAL(HAVE_W32DLL, test x"$enable_w32dll" = "xyes")
-+if test x"$enable_w32dll" = "xyes"; then
-+   W32DLL_DEP=""
-+else 
-+   W32DLL_DEP="#"
-+fi
-+AC_SUBST(W32DLL_DEP)
-+
-+
-+dnl ---------------------------------------------
-+dnl ip_mreqn
-+dnl ---------------------------------------------
-+
-+AC_CHECK_IP_MREQN
-+if test x"$have_ip_mreqn" = "xyes"; then
-+  AC_DEFINE(HAVE_IP_MREQN,1,[Define this if you have ip_mreqn in netinet/in.h])
-+fi
-+
-+
-+dnl ---------------------------------------------
-+dnl Using or not using -fPIC (override default behavior - system dependent)
-+dnl ---------------------------------------------
-+
-+AC_ARG_ENABLE(fpic, AC_HELP_STRING([--disable-fpic], [disable -fPIC on shared libs (default on x86)]),
-+   enable_fpic=$enableval)
-+
-+
-+dnl ---------------------------------------------
-+dnl Some extra checks.
-+dnl ---------------------------------------------
-+
-+AC_SYS_LARGEFILE
-+AC_CHECK_LIB(posix4, sched_get_priority_min)
-+AC_CHECK_FUNCS([_vsnprintf _snprintf _stricmp _strnicmp vsscanf sigaction sigset getpwuid_r nanosleep lstat memset readlink strchr strcasecmp strncasecmp])
-+AC_FUNC_FSEEKO
-+AC_DEFINE(_GNU_SOURCE)
-+AC_CHECK_HEADERS(assert.h byteswap.h malloc.h execinfo.h ucontext.h sys/mman.h sys/mixer.h libgen.h netdb.h dirent.h sys/times.h sys/ioctl.h sys/param.h)
-+AC_REPLACE_FUNCS(basename gettimeofday setenv strndup strpbrk strsep strtok_r timegm unsetenv)
-+
-+AC_LIBSOURCE(hstrerror.c)
-+AC_LINK_IFELSE([#include <netdb.h>
-+int main(void) {
-+  hstrerror(0);
-+}], ac_cv_function_system_hstrerror="yes")
-+AC_CHECK_LIB([resolv], [hstrerror], [ac_cv_function_system_hstrerror="yes"])
-+if test x"$ac_cv_function_system_hstrerror" = "xyes"; then
-+  AC_DEFINE(HAVE_HSTRERROR, 1, [Define to 1 if you have 'hstrerror' in <netdb.h>])
-+else
-+  AC_LIBOBJ(hstrerror)
-+fi
-+
-+AC_LIBSOURCE(dirent_msvc.c)
-+AC_CHECK_FUNC(opendir,
-+  [AC_DEFINE(HAVE_OPENDIR, 1, [Define to 1 if you have 'opendir' function])],
-+  [if test x"$SYS" = "xmingw32"; then
-+    AC_LIBOBJ(dirent_msvc)
-+  else
-+    AC_MSG_ERROR([dirent is needed (opendir, readdir, ...)])
-+  fi])
-+
-+AH_BOTTOM([/* include internal system specific header */
-+#include "os_internal.h"])
-+
-+
-+dnl ---------------------------------------------
-+dnl cflags and debug cflags
-+dnl ---------------------------------------------
-+ 
-+AC_SUBST(DEBUG_CFLAGS)
-+DEBUG_CFLAGS="-g -DDEBUG $CFLAGS"
-+
-+dnl dummy
-+ASFLAGS="$ASFLAGS"
-+AC_SUBST(ASFLAGS)
-+
-+dnl check for __attribute__ ((aligned ()))
-+dnl WARNING! Do not move this check behind the $(MULTIPASS_CFLAGS)!
-+dnl (the alignment test macro does not like variables in the CFLAGS)
-+AC_C_ATTRIBUTE_ALIGNED
-+
-+dnl Common cflags for all platforms
-+CFLAGS="-DNDEBUG -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DXINE_COMPILE \$(MULTIPASS_CFLAGS) $CFLAGS"
-+DEBUG_CFLAGS="-D_REENTRANT -D_FILE_OFFSET_BITS=64 -DXINE_COMPILE $DEBUG_CFLAGS"
-+
-+AC_OPTIMIZATIONS
-+
-+enable_ffmmx="no"
-+enable_armv4l="no"
-+
-+case "$host_or_hostalias" in
-+  i?86-* | k?-* | athlon-* | pentium*-)
-+    dnl enable x86 specific parts of the code
-+    dnl
-+    dnl all of this stuff needs gcc/gas; it uses gnu c compiler extensions
-+    dnl like the extended asm() or __attribute(__cdecl__), or other direct
-+    dnl mmx/sse/3dnow assembler instructions. 
-+    dnl
-+    AC_DEFINE_UNQUOTED(ARCH_X86,,[Define this if you're running x86 architecture])
-+    AC_DEFINE(FPM_INTEL,1,[Define to select libmad fixed point arithmetic implementation])
-+    enable_ffmmx="yes"
-+    enable_impure_text="yes"
-+
-+    case "$host_or_hostalias" in
-+      *-*-cygwin) 
-+        LIBS="$LIBS @INTLLIBS@ -lkernel32"
-+        ;;
-+    esac
-+    ;;
-+  x86_64-*)
-+    AC_DEFINE_UNQUOTED(ARCH_X86_64,,[Define this if you're running x86 architecture])
-+    AC_DEFINE(FPM_64BIT,1,[Define to select libmad fixed point arithmetic implementation])
-+    enable_ffmmx="yes"
-+    ;;
-+  *darwin*)
-+    HOST_OS_DARWIN=1
-+    AC_DEFINE_UNQUOTED(HOST_OS_DARWIN, 1, [Define this if built on Mac OS X/Darwin])
-+    
-+    dnl avoid ppc compilation crash
-+    AS="$CC"
-+    AC_DEFINE_UNQUOTED(FPM_PPC,,[Define to select libmad fixed point arithmetic implementation])
-+    AC_DEFINE_UNQUOTED(ARCH_PPC,,[Define this if you're running PowerPC architecture])
-+
-+    OBJC=${CC:-gcc}
-+    AC_SUBST(OBJC)
-+    OBJCFLAGS="-D_INTL_REDIRECT_MACROS $CFLAGS $OBJCFLAGS"
-+    AC_SUBST(OBJCFLAGS)
-+    OBJCDEPMODE="depmode=gcc3"
-+    dnl Do not use AC_SUBST(OBJCDEPMODE): we don't need it as long we use
-+    dnl _AM_DEPENDENCIES (below), and doing the AC_SUBST elicits a warning
-+    dnl from automake 1.6.
-+    
-+    AC_CHECK_HEADER([altivec.h], , enable_altivec=no)
-+    
-+    if test x$enable_altivec = xyes; then
-+        AC_DEFINE_UNQUOTED(ENABLE_ALTIVEC,,[Define this if you want to use altivec on PowerPC CPUs])
-+        CFLAGS="$CFLAGS -faltivec"
-+        LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS -force_cpusubtype_ALL -faltivec"
-+    fi
-+    ;;
-+  ppc-*-linux* | powerpc-*) 
-+    dnl avoid ppc compilation crash
-+    AS="$CC"
-+    AC_DEFINE_UNQUOTED(FPM_PPC,,[Define to select libmad fixed point arithmetic implementation])
-+    AC_DEFINE_UNQUOTED(ARCH_PPC,,[Define this if you're running PowerPC architecture])
-+
-+    AC_CHECK_HEADER([altivec.h], , enable_altivec=no)
-+    
-+    if test x$enable_altivec = xyes; then
-+        AC_DEFINE_UNQUOTED(ENABLE_ALTIVEC,,[Define this if you have a Motorola 74xx CPU])
-+        CFLAGS="$CFLAGS -maltivec"
-+        LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS -force_cpusubtype_ALL -maltivec"
-+    fi
-+    ;;
-+  sparc*-*-linux*)
-+    if test x$enable_vis != xno; then
-+      has_vis=yes
-+    fi
-+
-+    AC_DEFINE_UNQUOTED(FPM_SPARC,,[Define to select libmad fixed point arithmetic implementation])
-+    AC_DEFINE_UNQUOTED(ARCH_SPARC,,[Define this if you're running SPARC architecture])
-+    ;;
-+  sparc-*-solaris*)
-+    if test "$GCC" = yes; then
-+      case `$CC --version 2>/dev/null` in
-+	1.*|2.*) ;;
-+        *)
-+          if test x$enable_vis != xno; then
-+	     has_vis=yes
-+          fi
-+	  ;;
-+      esac
-+  
-+      AC_DEFINE_UNQUOTED(FPM_SPARC,,[Define to select libmad fixed point arithmetic implementation])
-+      AC_DEFINE_UNQUOTED(ARCH_SPARC,,[Define this if you're running SPARC architecture])
-+    else
-+      AC_DEFINE_UNQUOTED(FPM_64BIT,,[Define to select libmad fixed point arithmetic implementation])
-+    fi
-+    ;;
-+  mips-*)
-+    AC_DEFINE_UNQUOTED(FPM_MIPS,,[Define to select libmad fixed point arithmetic implementation])
-+    ;;
-+  alphaev56-* | alpha* | ia64-* | hppa*-linux-*)
-+    AC_DEFINE_UNQUOTED(FPM_64BIT,,[Define to select libmad fixed point arithmetic implementation])
-+    ;;
-+  armv4l-*-linux*)
-+    AC_DEFINE_UNQUOTED(FPM_ARM,,[Define to select libmad fixed point arithmetic implementation])
-+    enable_armv4l="yes"
-+    ;;
-+  *)
-+    AC_DEFINE_UNQUOTED(FPM_DEFAULT,,[Define to select libmad fixed point arithmetic implementation])
-+    ;;
-+esac
-+
-+AM_CONDITIONAL(HOST_OS_DARWIN, test x"$HOST_OS_DARWIN" = "x1")
-+
-+if test "x$has_vis" = "xyes"; then
-+   AC_DEFINE_UNQUOTED(ENABLE_VIS,,[Define this if you have Sun UltraSPARC CPU])
-+   case $CFLAGS in
-+     *-mcpu=*) ;;
-+     *) CFLAGS="$CFLAGS -mcpu=v9" ;;
-+   esac
-+fi
-+AM_CONDITIONAL(ENABLE_VIS, test x"$has_vis" = "xyes")
-+
-+AM_CONDITIONAL(HAVE_FFMMX, test x"$enable_ffmmx" = "xyes")
-+
-+dnl ---------------------------------------------
-+dnl Build xine plugins with only the "xine_plugin_info" symbol exported
-+dnl (let the user disable this feature, in case libtool does not offer this
-+dnl feature on the target platform)
-+dnl ---------------------------------------------
-+
-+AC_ARG_ENABLE(min-symtab,
-+   AC_HELP_STRING([--disable-min-symtab], [export all global symbols from xine plugins]),
-+   [
-+     if test "x$enableval" = "xno" ; then
-+       XINE_PLUGIN_MIN_SYMS=""
-+     else
-+       XINE_PLUGIN_MIN_SYMS="-export-symbols-regex xine_plugin_info"
-+     fi
-+   ],
-+   XINE_PLUGIN_MIN_SYMS="-export-symbols-regex xine_plugin_info")
-+
-+if test "$with_gnu_ld" = yes; then
-+   dnl
-+   dnl -export-symbols-regex in libtool 1.4.X is broken, when GNU ld is
-+   dnl used for linking.  libtool / gnu ld does not touch the dynamic
-+   dnl symbol table, but removes the unwanted symbols from the
-+   dnl symbol table => The debug versions of the the xine-lib plugins
-+   dnl cannot be debugged.
-+   dnl
-+   dnl Don't use libtool's -export-symbols-regex on such a platform for now
-+   dnl
-+   XINE_PLUGIN_MIN_SYMS=""
-+fi
-+
-+AC_SUBST(XINE_PLUGIN_MIN_SYMS)
-+
-+dnl ---------------------------------------------
-+dnl Set IMPURE_TEXT_LDFLAGS
-+dnl ---------------------------------------------
-+
-+IMPURE_TEXT_LDFLAGS=""
-+if test x"$enable_impure_text" = xyes; then
-+  case "$host_or_hostalias" in
-+    *solaris*)
-+      if test "$GCC" = yes; then
-+        IMPURE_TEXT_LDFLAGS="-mimpure-text"
-+      else
-+        IMPURE_TEXT_LDFLAGS="-z textoff"
-+      fi
-+    ;;
-+  esac
-+fi
-+AC_SUBST(IMPURE_TEXT_LDFLAGS)
-+
-+dnl ---------------------------------------------
-+dnl HAVE_ARMV4L is currently used in libavcodec makefile.am
-+dnl ---------------------------------------------
-+
-+AM_CONDITIONAL(HAVE_ARMV4L, test x"$enable_armv4l" = "xyes")
-+
-+
-+dnl ---------------------------------------------
-+dnl XINE_ROOTDIR does not work if architecture independent files are 
-+dnl installed to another place than architecture dependent files !!!
-+dnl ---------------------------------------------
-+
-+if test "x$prefix" = xNONE; then
-+   prefix="${ac_default_prefix}"
-+fi
-+if test "x$exec_prefix" = xNONE; then
-+   exec_prefix='${prefix}'
-+fi
-+
-+dnl
-+dnl installation directories and directories relative to prefix
-+dnl
-+dnl Note:
-+dnl   use AC_DEFINE for runtime
-+dnl   use AC_SUBST for installation
-+dnl
-+
-+makeexpand () {
-+  local i
-+  local j
-+  i="$1"
-+  while test "$i" != "$j"; do j="$i"; eval i="$j"; done
-+  echo "$i"
-+}
-+
-+XINE_PLUGINDIR="$libdir/xine/plugins/$XINE_MAJOR.$XINE_MINOR.$XINE_SUB"
-+XINE_FONTDIR="${datadir}/xine/libxine$XINE_MAJOR/fonts"
-+XINE_LOCALEDIR="${datadir}/locale"
-+XINE_REL_PLUGINDIR="`makeexpand "$XINE_PLUGINDIR"`"
-+XINE_REL_PLUGINDIR="`makeexpand "$XINE_REL_PLUGINDIR" | sed -e "s,^${prefix}/,,"`"
-+XINE_REL_FONTDIR="`makeexpand "$XINE_FONTDIR" | sed -e "s,^${prefix}/,,"`"
-+XINE_REL_LOCALEDIR="`makeexpand "$XINE_LOCALEDIR" | sed -e "s,^${prefix}/,,"`"
-+if test x"$SYS" = "xmingw32" -o x"$SYS" = "xcygwin"; then
-+  dnl polish paths (MinGW runtime accepts both \ and / anyway)
-+  XINE_REL_PLUGINDIR="`echo "$XINE_REL_PLUGINDIR" | sed -e 's/\\//\\\\\\\\/g'`"
-+  XINE_REL_FONTDIR="`echo "$XINE_REL_FONTDIR" | sed -e 's/\\//\\\\\\\\/g'`"
-+  XINE_REL_LOCALEDIR="`echo "$XINE_REL_LOCALEDIR" | sed -e 's/\\//\\\\\\\\/g'`"
-+  dnl prefix in xine-config
-+  XINE_CONFIG_PREFIX="\`dirname \$0\`/.."
-+  dnl installation directories (in xine-config)
-+  XINE_PLUGINPATH="$XINE_CONFIG_PREFIX/$XINE_REL_PLUGINDIR"
-+  XINE_FONTPATH="$XINE_CONFIG_PREFIX/$XINE_REL_FONTDIR"
-+  XINE_LOCALEPATH="$XINE_CONFIG_PREFIX/$XINE_REL_LOCALEDIR"
-+  dnl runtime directories
-+  AC_DEFINE(XINE_PLUGINDIR,[xine_get_plugindir()],[Define this to plugins directory location])
-+  AC_DEFINE(XINE_FONTDIR,[xine_get_fontdir()],[Define this to osd fonts dir location])
-+  AC_DEFINE(XINE_LOCALEDIR,[xine_get_localedir()],[Path where catalog files will be.])
-+else
-+  dnl prefix in xine-config
-+  XINE_CONFIG_PREFIX="`makeexpand "${prefix}"`"
-+  dnl directories from xine-config and runtime directories
-+  XINE_PLUGINPATH="`makeexpand "$XINE_PLUGINDIR"`"
-+  XINE_FONTPATH="`makeexpand "$XINE_FONTDIR"`"
-+  XINE_LOCALEPATH="`makeexpand "$XINE_LOCALEDIR"`"
-+  dnl defining runtime directories
-+  AC_DEFINE_UNQUOTED(XINE_PLUGINDIR,"$XINE_PLUGINPATH",[Define this to plugins directory location])
-+  AC_DEFINE_UNQUOTED(XINE_FONTDIR,"$XINE_FONTPATH",[Define this to osd fonts dir location])
-+  AC_DEFINE_UNQUOTED(XINE_LOCALEDIR, "$XINE_LOCALEPATH",[Path where catalog files will be.])
-+fi
-+AC_DEFINE_UNQUOTED(XINE_REL_PLUGINDIR,"$XINE_REL_PLUGINDIR",[Define this to plugin directory relative to execution prefix])
-+AC_DEFINE_UNQUOTED(XINE_REL_FONTDIR,"$XINE_REL_FONTDIR",[Define this to font directory relative to prefix])
-+AC_DEFINE_UNQUOTED(XINE_REL_LOCALEDIR,"$XINE_REL_LOCALEDIR",[Define this to font directory relative to prefix])
-+AC_SUBST(XINE_CONFIG_PREFIX)
-+AC_SUBST(XINE_PLUGINPATH)
-+AC_SUBST(XINE_FONTPATH)
-+AC_SUBST(XINE_LOCALEPATH)
-+AC_SUBST(XINE_PLUGINDIR)
-+AC_SUBST(XINE_FONTDIR)
-+AC_SUBST(XINE_LOCALEDIR)
-+
-+dnl Where aclocal m4 files should be installed
-+XINE_ACFLAGS="-I `makeexpand "${datarootdir:-${datadir}}/aclocal"`"
-+AC_DEFINE_UNQUOTED(XINE_ACFLAGS, "$XINE_ACFLAGS", [Path where aclocal m4 files will be.])
-+AC_SUBST(XINE_ACFLAGS)
-+
-+dnl Where architecture independent data (e.g. logo) will/should be installed
-+XINE_DATADIR="`makeexpand "${datarootdir:-${datadir}}/xine"`"
-+AC_SUBST(XINE_DATADIR)
-+
-+dnl Where scripts will/should be installed.
-+eval XINE_SCRIPTPATH="$XINE_DATADIR/xine/scripts"
-+AC_SUBST(XINE_SCRIPTPATH)
-+
-+
-+dnl ---------------------------------------------
-+dnl Some informations about xine-lib compilation
-+dnl ---------------------------------------------
-+
-+XINE_BUILD_CC="`$CC -v 2>&1 | tail -n 1`"
-+XINE_BUILD_OS="`uname -s -r -m`"
-+XINE_BUILD_DATE="`date \"+%a %d %b %Y %T\"`"
-+AC_SUBST(XINE_BUILD_CC)
-+AC_SUBST(XINE_BUILD_OS)
-+AC_SUBST(XINE_BUILD_DATE)
-+
-+
-+dnl ---------------------------------------------
-+dnl For win32 libraries location, needed by libw32dll.
-+dnl ---------------------------------------------
-+
-+AC_ARG_WITH(w32-path, AC_HELP_STRING([--with-w32-path=path], [location of WIN32 libraries]),
-+            w32_path="$withval", w32_path="/usr/lib/codecs")
-+AC_SUBST(w32_path)
-+
-+
-+dnl ---------------------------------------------
-+dnl some include paths ( !!! DO NOT REMOVE !!! )
-+dnl ---------------------------------------------
-+
-+INCLUDES='-I$(top_srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_builddir)/src/xine-engine -I$(top_srcdir)/src/xine-engine -I$(top_srcdir)/src/xine-utils $(INTLDIR) -I$(top_builddir)/src/input -I$(top_srcdir)/src/input $(WIN32_CPPFLAGS) -I$(top_builddir)/lib -I$(top_srcdir)/lib'
-+AC_SUBST(INCLUDES)
-+
-+
-+dnl ---------------------------------------------
-+dnl Get where .m4 should be installed.
-+dnl ---------------------------------------------
-+
-+dnl if test x"${ACLOCAL_DIR+set}" != xset; then
-+dnl   case "`id`" in
-+dnl     uid=0\(* )
-+dnl       AC_MSG_CHECKING(for aclocal directory)
-+dnl       if (aclocal --version) < /dev/null > /dev/null 2>&1; then
-+dnl         ACLOCAL_DIR="`eval $ACLOCAL --print-ac-dir`"
-+dnl         AC_MSG_RESULT($ACLOCAL_DIR)
-+dnl       else
-+dnl         ACLOCAL_DIR="${prefix}/share/aclocal"
-+dnl         AC_MSG_RESULT(none - will be installed in $ACLOCAL_DIR)
-+dnl       fi
-+dnl       escapedprefix="`echo $prefix | sed -e 's/\\//\\\\\//g'`"
-+dnl       ACLOCAL_DIR="`echo $ACLOCAL_DIR|sed -e 's/^'$escapedprefix/'\${prefix}'/`"
-+dnl       ;;
-+dnl   esac
-+dnl fi
-+AC_SUBST(ACLOCAL_DIR)
-+AM_CONDITIONAL([INSTALL_M4],[test x"$ACLOCAL_DIR" != "x"])
-+
-+
-+dnl ---------------------------------------------
-+dnl It seems automake 1.5 don't take care about this script
-+dnl ---------------------------------------------
-+
-+if test ! -z "$am_depcomp"; then
-+	DEPCOMP="depcomp"
-+fi
-+AC_SUBST(DEPCOMP)
-+
-+
-+dnl ---------------------------------------------
-+dnl Check for documentation formatting tool
-+dnl ---------------------------------------------
-+
-+AC_CHECK_PROG(SGMLTOOLS, sgmltools, sgmltools, no)
-+AM_CONDITIONAL([HAVE_SGMLTOOLS], [test "$SGMLTOOLS" != "no"])
-+
-+AC_CHECK_PROG(FIG2DEV, fig2dev, fig2dev, no)
-+AM_CONDITIONAL([HAVE_FIG2DEV], [test "$FIG2DEV" != "no"])
-+
-+dnl ---------------------------------------------
-+dnl Newest automake workaround
-+dnl ---------------------------------------------
-+
-+AC_SUBST(mkdir_p)
-+if test -n "$ac_aux_dir"; then
-+  case "$ac_aux_dir" in
-+    /*) MKINSTALLDIRS="$ac_aux_dir/install-sh -d" ;;
-+    *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/install-sh -d" ;;
-+  esac
-+else
-+  MKINSTALLDIRS="\$(top_srcdir)/install-sh -d"
-+fi
-+AC_SUBST(MKINSTALLDIRS)
-+
-+dnl this is an internal function we should not use, but
-+dnl as long as neither autoconf nor automake offer an A[CM]_PROG_OBJC
-+dnl check we will have to call it
-+_AM_DEPENDENCIES([OBJC])
-+
-+AM_CONDITIONAL([BUILD_DMX_IMAGE], [test x"$have_imagemagick" = "xyes" -o x"$no_gdkpixbuf" != "xyes"])
-+
-+dnl Important warnings we _don't_ want to skip
-+dnl Don't put these under conditional for optimisations, because these
-+dnl need always to be enabled.
-+AC_TRY_CFLAGS("-Wformat", wformat="-Wformat")
-+AC_TRY_CFLAGS("-Wformat=2", wformat="-Wformat=2")
-+if test "x$wformat" != "x"; then
-+   AC_TRY_CFLAGS("-Wno-format-zero-length", wformat="$wformat -Wno-format-zero-length")
-+fi
-+AC_TRY_CFLAGS("-Wmissing-format-attribute", wformat="$wformat -Wmissing-format-attribute")
-+CFLAGS="$CFLAGS $wformat"
-+
-+AC_TRY_CFLAGS("-Wstrict-aliasing", wsa="-Wstrict-aliasing")
-+AC_TRY_CFLAGS("-Wstrict-aliasing=2", wsa="-Wstrict-aliasing=2")
-+CFLAGS="$CFLAGS $wsa"
-+
-+dnl ---------------------------------------------
-+dnl Output configuration files
-+dnl ---------------------------------------------
-+
-+AC_CONFIG_FILES([
-+Makefile
-+doc/Makefile
-+doc/man/Makefile
-+doc/man/en/Makefile
-+doc/hackersguide/Makefile
-+doc/faq/Makefile
-+include/Makefile
-+include/xine.h
-+lib/Makefile
-+m4/Makefile
-+misc/Makefile
-+misc/SlackBuild
-+misc/build_rpms.sh
-+misc/fonts/Makefile
-+misc/libxine.pc
-+misc/relchk.sh
-+misc/xine-config
-+misc/xine-lib.spec
-+po/Makefile.in
-+src/Makefile
-+src/audio_out/Makefile
-+src/demuxers/Makefile
-+src/dxr3/Makefile
-+src/input/Makefile
-+src/input/libdvdnav/Makefile
-+src/input/dvb/Makefile
-+src/input/librtsp/Makefile
-+src/input/libreal/Makefile
-+src/input/vcd/Makefile
-+src/input/vcd/libcdio/Makefile
-+src/input/vcd/libcdio/cdio/Makefile
-+src/input/vcd/libcdio/MSWindows/Makefile
-+src/input/vcd/libcdio/image/Makefile
-+src/input/vcd/libvcd/Makefile
-+src/input/vcd/libvcd/libvcd/Makefile
-+src/liba52/Makefile
-+src/libdts/Makefile
-+src/libfaad/Makefile
-+src/libfaad/codebook/Makefile
-+src/libffmpeg/Makefile
-+src/libffmpeg/libavcodec/Makefile
-+src/libffmpeg/libavcodec/armv4l/Makefile
-+src/libffmpeg/libavcodec/i386/Makefile
-+src/libffmpeg/libavcodec/mlib/Makefile
-+src/libffmpeg/libavcodec/alpha/Makefile
-+src/libffmpeg/libavcodec/ppc/Makefile
-+src/libffmpeg/libavcodec/sparc/Makefile
-+src/libffmpeg/libavcodec/libpostproc/Makefile
-+src/libffmpeg/libavutil/Makefile
-+src/libflac/Makefile
-+src/liblpcm/Makefile
-+src/libmad/Makefile
-+src/libmpeg2/Makefile
-+src/libmusepack/Makefile
-+src/libmusepack/musepack/Makefile
-+src/libspudec/Makefile
-+src/libspucc/Makefile
-+src/libspucmml/Makefile
-+src/libspudvb/Makefile
-+src/libsputext/Makefile
-+src/libvorbis/Makefile
-+src/libtheora/Makefile
-+src/libspeex/Makefile
-+src/libw32dll/Makefile
-+src/libw32dll/wine/Makefile
-+src/libw32dll/DirectShow/Makefile
-+src/libw32dll/dmo/Makefile
-+src/libw32dll/qtx/Makefile
-+src/libw32dll/qtx/qtxsdk/Makefile
-+src/libxinevdec/Makefile
-+src/libxineadec/Makefile
-+src/libxineadec/gsm610/Makefile
-+src/libxineadec/nosefart/Makefile
-+src/libreal/Makefile
-+src/post/Makefile
-+src/post/planar/Makefile
-+src/post/goom/Makefile
-+src/post/mosaico/Makefile
-+src/post/visualizations/Makefile
-+src/post/audio/Makefile
-+src/post/deinterlace/Makefile
-+src/post/deinterlace/plugins/Makefile
-+src/video_out/Makefile
-+src/video_out/libdha/Makefile
-+src/video_out/libdha/bin/Makefile
-+src/video_out/libdha/kernelhelper/Makefile
-+src/video_out/libdha/oth/Makefile
-+src/video_out/libdha/sysdep/Makefile
-+src/video_out/macosx/Makefile
-+src/video_out/vidix/Makefile
-+src/video_out/vidix/drivers/Makefile
-+src/xine-utils/Makefile
-+src/xine-engine/Makefile
-+win32/Makefile
-+win32/include/Makefile])
-+AC_CONFIG_COMMANDS([default],[[chmod +x ./misc/SlackBuild ./misc/build_rpms.sh ./misc/relchk.sh]],[[]])
-+AC_OUTPUT
-+
-+
-+dnl ---------------------------------------------
-+dnl Hack the libtool script (if required).
-+dnl
-+dnl If user intentionnaly overrided detection, use wish.
-+dnl ---------------------------------------------
-+
-+if test x"$enable_fpic" != x; then
-+   case "${enable_fpic}" in
-+     yes)
-+       no_fpic="no"
-+       ;;
-+     *)
-+       no_fpic="yes"
-+       ;;
-+   esac
-+fi
-+
-+dnl made libtool define BUILD_BASENAME
-+dnl cat libtool | sed -e 's/s/command\=\"\$base_compile\ \$srcfile/command\=\"\$base_compile\ \$srcfile\ \-DBUILD_BASENAME\=\`echo\ \$srcfile\ \|\ sed\ \-e\ '\''s\/\\.\[csS\]\/\/g'\''\`/g' > libtool.tmp
-+dnl cat libtool.tmp > libtool
-+dnl chmod +x libtool
-+
-+dnl make libtool-nofpic silent and not installing plugins's .la files
-+cat libtool | sed -e 's/^.*echo \"---------.*$/exit 0/;s/# Install the pseudo-library.*/continue/' > libtool.tmp
-+
-+dnl Remove fPIC flag, if necessary
-+if test x$no_fpic = "xyes"; then
-+  cat libtool.tmp | sed -e 's/^pic_flag=/#pic_flag=/;s/^ *pic_mode=.*$/pic_mode=no/' > libtool-nofpic
-+else
-+  cat libtool.tmp > libtool-nofpic
-+fi
-+
-+rm -f libtool.tmp
-+chmod +x libtool-nofpic
-+
-+
-+dnl ---------------------------------------------
-+dnl Some infos:
-+dnl ---------------------------------------------
-+
-+echo "xine-lib summary:"
-+echo "----------------"
-+
-+dnl Input
-+echo " * input plugins:"
-+echo "   - file          - net"
-+echo "   - stdin_fifo    - rtp"
-+echo "   - http          - mms"
-+echo "   - pnm           - rtsp"
-+echo "   - dvb"
-+if test x"$external_dvdnav" = "xyes"; then
-+  echo "   - dvd (external libs)"
-+else
-+  echo "   - dvd (internal libs)"
-+fi
-+if test x"$have_cdrom_ioctls" = "xyes"; then
-+  if test x"$enable_vcd" = "xyes"; then
-+    if test x"$internal_vcdnav" = "xno"; then
-+      echo "   - vcd (external libs)"
-+    else
-+      echo "   - vcd (internal libs)"
-+    fi
-+  fi
-+  echo "   - vcdo"
-+  echo "   - cdda"
-+fi
-+if test x"$no_gnome_vfs" = "xno"; then
-+  echo "   - gnome-vfs"
-+fi
-+if test x"$have_v4l" = "xyes"; then
-+  echo "   - v4l"
-+fi
-+if test x"$have_libsmbclient" = "xyes"; then
-+  echo "   - smbclient"
-+fi
-+echo ""
-+
-+dnl Demuxers
-+echo " * demultiplexer plugins:"
-+echo "   - avi           - mpeg"
-+echo "   - mpeg_block    - mpeg_audio"
-+echo "   - mpeg_elem     - mpeg_pes"
-+echo "   - mpeg_ts       - qt/mpeg-4"
-+echo "   - film          - roq"
-+echo "   - fli           - smjpeg"
-+echo "   - idcin         - wav"
-+echo "   - wc3 mve       - voc"
-+echo "   - vqa           - aiff"
-+echo "   - cdda          - snd/au"
-+echo "   - yuv4mpeg2     - real/realaudio"
-+echo "   - ea wve        - raw dv"
-+echo "   - interplay mve - psx str"
-+echo "   - ws aud        - pva"
-+echo "   - vox           - nsf"
-+echo "   - nsv           - 4xm"
-+echo "                   - aac"
-+echo "   - iff           - matroska"
-+echo "   - vmd           - flv"
-+if test x"$enable_asf" = "xyes"; then
-+  echo "   - asf"
-+fi
-+if test x"$no_vorbis" != "xyes"; then
-+  echo "   - ogg"
-+fi
-+if test x"$have_libmng" = "xyes"; then
-+  echo "   - mng"
-+fi
-+if test x"$enable_modplug" != x"no"; then
-+  echo "   - mod"
-+fi
-+if test x"$enable_a52dec" = "xyes"; then
-+  if test x"$have_a52" = "xyes"; then
-+    echo "   - ac3 (external library)"
-+  else
-+    echo "   - ac3 (internal library)"
-+  fi
-+fi
-+echo ""
-+
-+dnl video decoders
-+echo " * video decoder plugins:"
-+echo "   - MPEG 1,2         - Amiga Bitplane"
-+echo "   - Raw RGB          - Raw YUV"
-+if test x"$external_ffmpeg_found" = "xyes"; then
-+  echo "   - ffmpeg (external library):"
-+else
-+  echo "   - ffmpeg (internal library):"
-+fi
-+echo "     - MPEG-4 (ISO, Microsoft, DivX*, XviD)"
-+echo "     - Creative YUV    - Motion JPEG"
-+echo "     - Cinepak         - MS Video-1"
-+echo "     - FLI/FLC         - MS RLE"
-+echo "     - Id RoQ          - Id Cin"
-+echo "     - Apple Graphics  - Apple Video"
-+echo "     - Apple Animation - Interplay Video"
-+echo "     - Westwood VQA    - Origin Xan"
-+echo "     - H.263           - Intel Indeo 3"
-+echo "     - SVQ1            - SVQ3"
-+echo "     - Real Video 1.0  - Real Video 2.0"
-+echo "     - 4X Video        - Sierra Video"
-+echo "     - Asus v1/v2      - HuffYUV"
-+echo "     - On2 VP3         - DV"
-+echo "     - 8BPS            - Duck TrueMotion v1"
-+echo "     - ATI VCR1        - Flash Video"
-+echo "     - ZLIB            - MSZH"
-+if test x"$have_dxr3" = "xyes"; then
-+  echo "   - dxr3_video"
-+fi
-+if test x"$enable_w32dll" = "xyes"; then
-+  echo "   - w32dll"
-+fi
-+if test x"$have_imagemagick" = "xyes"; then
-+  echo "   - image"
-+fi
-+if test x"no_gdkpixbuf" != "xyes"; then
-+  echo "   - gdk-pixbuf"
-+fi
-+if test x"$no_theora" != "xyes"; then
-+  echo "   - theora"
-+fi
-+echo ""
-+
-+dnl audio decoders
-+echo " * audio decoder plugins:"
-+echo "   - GSM 06.10"
-+echo "   - linear PCM      - Nosefart (NSF)"
-+if test x"$external_ffmpeg_found" = "xyes"; then
-+  echo "   - ffmpeg (external library):"
-+else
-+  echo "   - ffmpeg (internal library):"
-+fi
-+echo "     - Windows Media Audio v1/v2"
-+echo "     - DV            - logarithmic PCM"
-+echo "     - 14k4          - 28k8"
-+echo "     - MS ADPCM      - IMA ADPCM"
-+echo "     - XA ADPCM      - Game DPCM/ADPCM"
-+echo "     - Mace 3:13     - Mace 6:1"
-+if test x"no_libFLAC" != "xyes"; then
-+  echo "     - FLAC"
-+fi
-+if test x"$no_vorbis" != "xyes"; then
-+  echo "   - vorbis"
-+fi
-+if test x"$no_speex" != "xyes"; then
-+  echo "   - speex"
-+fi
-+if test x"$enable_w32dll" = "xyes"; then
-+  echo "   - w32dll"
-+fi
-+if test x"$enable_faad" = "xyes"; then
-+  echo "   - faad"
-+fi
-+if test x"$enable_libmad" = "xyes"; then
-+  if test x"$have_mad" = "xyes"; then
-+    echo "   - MAD (MPG 1/2/3) (external library)"
-+  else
-+    echo "   - MAD (MPG 1/2/3) (internal library)"
-+  fi
-+fi
-+if test x"$enable_libdts" = "xyes"; then
-+  if test x"$have_dts" = "xyes"; then
-+    echo "   - DTS (external library)"
-+  else
-+    echo "   - DTS (internal library)"
-+  fi
-+fi
-+if test x"$enable_a52dec" = "xyes"; then
-+  if test x"$have_a52" = "xyes"; then
-+    echo "   - A52/ra-dnet (external library)"
-+  else
-+    echo "   - A52/ra-dnet (internal library)"
-+  fi
-+fi
-+echo ""
-+
-+dnl spu decoders
-+echo " * subtitle decoder plugins:"
-+echo "   - spu             - spucc"
-+echo "   - spucmml         - sputext"
-+echo "   - spudvb"
-+if test x"$have_dxr3" = "xyes"; then
-+  echo "   - dxr3_spu"
-+fi
-+echo ""
-+
-+dnl post plugins
-+echo " * post effect plugins:"
-+echo "  * planar video effects:"
-+echo "   - invert          - expand"
-+echo "   - eq              - eq2"
-+echo "   - boxblur         - denoise3d"
-+echo "   - unsharp         - tvtime"
-+echo "  * SFX:"
-+echo "   - goom            - oscope"
-+echo "   - fftscope        - mosaico"
-+echo ""
-+
-+dnl Video plugins
-+echo " * video driver plugins:"
-+if test x"$no_x" != "xyes"; then
-+  echo "   - XShm (X11 shared memory)"
-+  dnl synfb
-+  if test x$ac_have_syncfb = "xyes"; then
-+    echo "   - SyncFB (for Matrox G200/G400 cards)"
-+  fi
-+  dnl Xv
-+  if test x$ac_have_xv = "xyes"; then
-+    if test x$ac_have_xv_static = "xyes"; then
-+      echo "   - Xv (XVideo *static*)"
-+    else
-+      echo "   - Xv (XVideo *shared*)"
-+    fi
-+  fi
-+  dnl XxMC
-+  if test x$ac_have_xxmc = "xyes"; then
-+    if test "x$ac_have_vldxvmc_h" = "xyes"; then
-+      echo "   - XxMC (XVideo extended motion compensation)"
-+    else
-+      echo "   - XxMC (XVideo motion compensation - vld extensions DISABLED)"
-+    fi
-+  fi
-+  dnl XvMC
-+  if test x$ac_have_xvmc = "xyes"; then
-+    echo "   - XvMC (XVideo motion compensation)"
-+  fi
-+  if test x$ac_have_opengl = "xyes" -a x$ac_have_glut="xyes" -o \
-+	  x$ac_have_opengl = "xyes" -a x$ac_have_glu="xyes"; then	
-+    echo "   - OpenGL"
-+  fi
-+  if test x$ac_have_sunfb = "xyes"; then
-+    if test x$ac_have_sundga = "xyes"; then
-+      echo "   - PGX64 (for Sun XVR100/PGX64/PGX24 cards)"
-+      echo "   - PGX32 (for Sun PGX32 cards)"
-+    fi
-+  fi
-+fi
-+if test x$no_aalib != "xyes"; then
-+  echo "   - aa (Ascii ART)"
-+fi
-+if test x$no_caca != "xyes"; then
-+  echo "   - caca (Color AsCii Art)"
-+fi
-+if test x$have_fb = "xyes"; then
-+  echo "   - fb (Linux framebuffer device)"
-+fi
-+if test x"$no_sdl" != x"yes"; then
-+  echo "   - sdl (Simple DirectMedia Layer)"
-+fi
-+if test x"$have_stk" = "xyes"; then
-+  echo "   - stk (Libstk Set-top Toolkit)"
-+fi
-+if test x"$have_directfb" = "xyes"; then
-+  echo "   - directfb (DirectFB driver)"
-+fi
-+if test x"$have_dxr3" = "xyes"; then
-+  if test x"$have_encoder" = "xyes"; then
-+    echo "   - dxr3 (Hollywood+ and Creative dxr3, both mpeg and non-mpeg video)"
-+  else
-+    echo "   - dxr3 (Hollywood+ and Creative dxr3, mpeg video only)"
-+  fi
-+fi
-+if test x"$enable_vidix" = "xyes"; then
-+  echo $ECHO_N "   - vidix ("
-+  
-+  if test x"$no_x" != "xyes"; then
-+    echo $ECHO_N "X11"
-+    if test x"$have_fb" = "xyes"; then
-+      echo $ECHO_N " and "
-+    fi
-+  fi
-+    
-+  if test x"$have_fb" = "xyes"; then
-+      echo $ECHO_N "framebuffer"
-+  fi
-+  
-+  echo $ECHO_N " support"
-+
-+  if test x"$enable_dha_kmod" = "xyes"; then
-+    echo " with dhahelper)"
-+  else
-+    echo ")"
-+  fi
-+fi
-+if test x"$have_directx" = "xyes"; then
-+  echo "   - directx (DirectX video driver)"
-+fi
-+if test x"$have_macosx_video" = "xyes"; then
-+  echo "   - Mac OS X OpenGL"
-+fi
-+
-+echo ""
-+
-+dnl Audio plugins
-+echo " * audio driver plugins:"
-+if test x"$have_ossaudio" = "xyes"; then
-+  echo "   - oss (Open Sound System)"
-+fi
-+if test x"$no_alsa" != "xyes"; then
-+  if test x"$have_alsa_1_0_9" = "xyes"; then
-+    echo "   - alsa (ALSA >= 1.0.9)"
-+  elif test x"$have_alsa09" = "xyes"; then
-+    echo "   - alsa (ALSA >= 0.9, < 1.0.9)"
-+  fi
-+fi
-+if test x"$no_esd" != "xyes"; then
-+  echo "   - esd (Enlightened Sound Daemon)"
-+fi
-+if test x"$no_arts" != "xyes"; then
-+  echo "   - arts (aRts - KDE soundserver)"
-+fi
-+if test x"$no_fusionsound" != "xyes"; then
-+  echo "   - fusionsound (FusionSound driver)"
-+fi
-+if test x"$have_sunaudio" = "xyes"; then
-+  echo "   - sun ()"
-+fi
-+if test "x$am_cv_have_irixal" = xyes; then
-+  echo "   - irixal (Irix audio library)"
-+fi
-+if test x"$have_directx" = "xyes"; then
-+  echo "   - directx (DirectX audio driver)"
-+fi
-+if test x"$have_coreaudio" = "xyes"; then
-+  echo "   - CoreAudio (Mac OS X audio driver)"
-+fi  
-+if test x"$have_polypaudio" = "xyes"; then
-+  echo "   - polypaudio sound server"
-+fi
-+echo "---"
-+
-+
-+dnl ---------------------------------------------
-+dnl some user warnings
-+dnl ---------------------------------------------
-+
-+dnl some levels of variable expansion to get final install paths
-+final_libdir="`eval eval eval eval echo $libdir`"
-+final_bindir="`eval eval eval eval echo $bindir`"
-+
-+if test -r /etc/ld.so.conf && ! grep -x "$final_libdir" /etc/ld.so.conf >/dev/null ; then
-+  if test "$final_libdir" != "/lib" -a "$final_libdir" != "/usr/lib" ; then
-+    if ! echo $LD_LIBRARY_PATH | egrep "(:|^)$final_libdir(/?:|/?$)" >/dev/null ; then
-+      echo
-+      echo "****************************************************************"
-+      echo "xine-lib will be installed to $final_libdir"
-+      echo
-+      echo "This path is not mentioned among the linker search paths in your"
-+      echo "/etc/ld.so.conf. This means it is possible that xine-lib will"
-+      echo "not be found when you try to compile or run a program using it."
-+      echo "If this happens, you should add $final_libdir to"
-+      echo "the environment variable LD_LIBRARY_PATH like that:"
-+      echo
-+      echo "export LD_LIBRARY_PATH=$final_libdir:\$LD_LIBRARY_PATH"
-+      echo
-+      echo "Alternatively you can add a line \"$final_libdir\""
-+      echo "to your /etc/ld.so.conf."
-+      echo "****************************************************************"
-+      echo
-+    fi
-+  fi
-+fi
-+
-+if ! echo $PATH | egrep "(:|^)$final_bindir(/?:|/?$)" >/dev/null ; then
-+  echo
-+  echo "****************************************************************"
-+  echo "xine-config will be installed to $final_bindir"
-+  echo
-+  echo "This path is not in your search path. This means it is possible"
-+  echo "that xine-config will not be found when you try to compile a"
-+  echo "program using xine-lib. This will result in build failures."
-+  echo "If this happens, you should add $final_bindir to"
-+  echo "the environment variable PATH like that:"
-+  echo
-+  echo "export PATH=$final_bindir:\$PATH"
-+  echo
-+  echo "Note that this is only needed for compilation. It is not needed"
-+  echo "to have xine-config in your search path at runtime. (Although"
-+  echo "it will not cause any harm either.)"
-+  echo "****************************************************************"
-+  echo
-+fi
-+
-+dnl warn if no X11 plugins will be built
-+if test x"$no_x" = "xyes" \
-+        -a x$SYS != "xmingw32" -a x$SYS != "xcygwin" ; then
-+  echo
-+  echo "****************************************************************"
-+  echo "WARNING! No X11 output plugins will be built."
-+  echo
-+  echo "For some reason, the requirements for building the X11 video"
-+  echo "output plugins are not met. That means, that you will NOT be"
-+  echo "able to use the resulting xine-lib to watch videos in a window"
-+  echo "on any X11-based display (e.g. your desktop)."
-+  echo
-+  echo "If this is not what you want, provide the necessary X11 build"
-+  echo "dependencies (usually done by installing a package called"
-+  echo "XFree86-devel or similar) and run configure again."
-+  echo "****************************************************************"
-+  echo
-+fi
-diff -urNad xine-lib-vdr-1.1.2~/src/input/input_dvb.c xine-lib-vdr-1.1.2/src/input/input_dvb.c
---- xine-lib-vdr-1.1.2~/src/input/input_dvb.c	2006-07-09 16:37:35.000000000 +0200
-+++ xine-lib-vdr-1.1.2/src/input/input_dvb.c	2006-08-13 16:45:51.000000000 +0200
-@@ -2512,7 +2512,7 @@
- 
-   /* no data for several seconds - tell the user a possible reason */
-   if(this->read_failcount==5){
--    _x_message(this->stream,1,"DVB Signal Lost.  Please check connections."); 
-+    _x_message(this->stream,1,"DVB Signal Lost.  Please check connections.", NULL); 
-   }
- #ifdef DVB_NO_BUFFERING
-   if(this->newchannel){
-diff -urNad xine-lib-vdr-1.1.2~/src/input/mms.c xine-lib-vdr-1.1.2/src/input/mms.c
---- xine-lib-vdr-1.1.2~/src/input/mms.c	2006-07-09 16:37:35.000000000 +0200
-+++ xine-lib-vdr-1.1.2/src/input/mms.c	2006-08-13 16:45:51.000000000 +0200
-@@ -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: mms.c,v 1.59 2006/06/20 01:46:41 dgp85 Exp $
-+ * $Id: mms.c,v 1.60 2006/07/11 09:37:31 mshopf Exp $
-  *
-  * MMS over TCP protocol
-  *   based on work from major mms
-@@ -138,7 +138,7 @@
-   int           num_stream_ids;
-   int           stream_ids[ASF_MAX_NUM_STREAMS];
-   int           stream_types[ASF_MAX_NUM_STREAMS];
--  int           asf_packet_len;
-+  uint32_t      asf_packet_len;
-   uint64_t      file_len;
-   char          guid[37];
-   uint32_t      bitrates[ASF_MAX_NUM_STREAMS];
-@@ -371,13 +371,17 @@
-       goto error;
-     
-     header->packet_len = LE_32(this->buf + 8) + 4;
-+    if (header->packet_len > BUF_SIZE - 12) {
-+      header->packet_len = 0;
-+      goto error;
-+    }
-     lprintf("mms command\n");
-     packet_type = MMS_PACKET_COMMAND;
-   } else {
-     header->packet_seq     = LE_32(this->buf);
-     header->packet_id_type = this->buf[4];
-     header->flags          = this->buf[5];
--    header->packet_len     = LE_16(this->buf + 6) - 8;
-+    header->packet_len     = (LE_16(this->buf + 6) - 8) & 0xffff;
-     if (header->packet_id_type == ASF_HEADER_PACKET_ID_TYPE) {
-       lprintf("asf header\n");
-       packet_type = MMS_PACKET_ASF_HEADER;
-@@ -497,6 +501,11 @@
-         break;
-       case MMS_PACKET_ASF_HEADER:
-       case MMS_PACKET_ASF_PACKET:
-+	if (header.packet_len + this->asf_header_len > ASF_HEADER_LEN) {
-+	    xprintf (this->stream->xine, XINE_VERBOSITY_LOG,
-+		     "libmms: asf packet too large\n");
-+	    return 0;
-+	}
-         len = _x_io_tcp_read (this->stream, this->s,
-                               (char*)(this->asf_header + this->asf_header_len), header.packet_len);
-         if (len != header.packet_len) {
-@@ -542,6 +551,12 @@
-       case GUID_ASF_FILE_PROPERTIES:
- 
-         this->asf_packet_len = LE_32(this->asf_header + i + 92 - 24);
-+        if (this->asf_packet_len > BUF_SIZE) {
-+          this->asf_packet_len = 0;
-+	  xprintf (this->stream->xine, XINE_VERBOSITY_LOG,
-+		   "libmms: asf packet len too large\n");
-+	  break;
-+        }
-         this->file_len       = LE_64(this->asf_header + i + 40 - 24);
-         lprintf ("file object, file_length = %lld, packet length = %d",
- 		 this->file_len, this->asf_packet_len);
-diff -urNad xine-lib-vdr-1.1.2~/src/input/mmsh.c xine-lib-vdr-1.1.2/src/input/mmsh.c
---- xine-lib-vdr-1.1.2~/src/input/mmsh.c	2006-07-09 16:37:35.000000000 +0200
-+++ xine-lib-vdr-1.1.2/src/input/mmsh.c	2006-08-13 16:45:51.000000000 +0200
-@@ -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: mmsh.c,v 1.37 2006/06/20 01:46:41 dgp85 Exp $
-+ * $Id: mmsh.c,v 1.38 2006/07/11 09:37:31 mshopf Exp $
-  *
-  * MMS over HTTP protocol
-  *   written by Thibaut Mattern
-@@ -182,7 +182,7 @@
-   int           num_stream_ids;
-   int           stream_ids[ASF_MAX_NUM_STREAMS];
-   int           stream_types[ASF_MAX_NUM_STREAMS];
--  int           packet_length;
-+  uint32_t      packet_length;
-   int64_t       file_length;
-   char          guid[37];
-   uint32_t      bitrates[ASF_MAX_NUM_STREAMS];
-@@ -491,6 +491,10 @@
-       case GUID_ASF_FILE_PROPERTIES:
- 
-         this->packet_length = LE_32(this->asf_header + i + 92 - 24);
-+	if (this->packet_length > CHUNK_SIZE) {
-+	  this->packet_length = 0;
-+	  break;
-+	}
-         this->file_length   = LE_64(this->asf_header + i + 40 - 24);
-         /*lprintf ("file object, file_length = %lld, packet length = %d",
- 		 this->file_length, this->packet_count);*/
-diff -urNad xine-lib-vdr-1.1.2~/src/libffmpeg/libavcodec/i386/Makefile.am xine-lib-vdr-1.1.2/src/libffmpeg/libavcodec/i386/Makefile.am
---- xine-lib-vdr-1.1.2~/src/libffmpeg/libavcodec/i386/Makefile.am	2006-07-09 16:39:01.000000000 +0200
-+++ xine-lib-vdr-1.1.2/src/libffmpeg/libavcodec/i386/Makefile.am	2006-08-13 16:45:51.000000000 +0200
-@@ -11,6 +11,9 @@
- # Avoid "can't find register" failures with -O1 and higher
- dsputil_mmx.o dsputil_mmx.lo: CFLAGS=`echo @CFLAGS@ | sed -e 's/-funroll-loops//g; s/-O[0-9]/-Os/g'`
- 
-+# Avoid errors on (at least) amd64 with -O0
-+fdct_mmx.o fdct_mmx.lo: CFLAGS=`echo @CFLAGS@ | sed -e 's/^/-Os /; s/-O0\?\s/-Os /g'`
-+
- ASFLAGS =
- 
- noinst_LTLIBRARIES = libavcodec_mmx.la
-diff -urNad xine-lib-vdr-1.1.2~/src/xine-utils/xine_mutex.c xine-lib-vdr-1.1.2/src/xine-utils/xine_mutex.c
---- xine-lib-vdr-1.1.2~/src/xine-utils/xine_mutex.c	2006-06-23 20:24:22.000000000 +0200
-+++ xine-lib-vdr-1.1.2/src/xine-utils/xine_mutex.c	2006-08-13 16:45:51.000000000 +0200
-@@ -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: xine_mutex.c,v 1.3 2006/06/23 18:24:22 dsalt Exp $
-+ * $Id: xine_mutex.c,v 1.4 2006/07/13 09:49:32 mshopf Exp $
-  *
-  */
- 
-@@ -35,7 +35,7 @@
- 		     const char *id) {
- 
- #ifdef DBG_MUTEX
--  strncpy (mutex->id, sizeof (mutex->id), id);
-+  strncpy (mutex->id, id, sizeof (mutex->id));
-   mutex->id[sizeof (mutex->id) - 1] = 0;
- #endif
- 

Modified: general/xine-lib-vdr/trunk/debian/patches/99_autoconf.dpatch
===================================================================
--- general/xine-lib-vdr/trunk/debian/patches/99_autoconf.dpatch	2006-09-23 16:52:47 UTC (rev 3373)
+++ general/xine-lib-vdr/trunk/debian/patches/99_autoconf.dpatch	2006-09-23 16:59:04 UTC (rev 3374)
@@ -6,8 +6,8 @@
 
 @DPATCH@
 diff -urNad xine-lib-vdr-1.1.2~/Makefile.in xine-lib-vdr-1.1.2/Makefile.in
---- xine-lib-vdr-1.1.2~/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/Makefile.in	2006-07-12 21:55:31.795320816 +0100
+--- xine-lib-vdr-1.1.2~/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/Makefile.in	2006-09-02 14:34:25.008832830 +0100
 @@ -364,6 +364,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -49,8 +49,8 @@
  	rm -f stamp-h1
  	touch $@
 diff -urNad xine-lib-vdr-1.1.2~/aclocal.m4 xine-lib-vdr-1.1.2/aclocal.m4
---- xine-lib-vdr-1.1.2~/aclocal.m4	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/aclocal.m4	2006-07-12 21:54:45.450668945 +0100
+--- xine-lib-vdr-1.1.2~/aclocal.m4	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/aclocal.m4	2006-09-02 14:33:24.603983192 +0100
 @@ -501,6 +501,35 @@
  rmdir .tst 2>/dev/null
  AC_SUBST([am__leading_dot])])
@@ -88,8 +88,8 @@
  
  # Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
 diff -urNad xine-lib-vdr-1.1.2~/config.h.in xine-lib-vdr-1.1.2/config.h.in
---- xine-lib-vdr-1.1.2~/config.h.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/config.h.in	2006-07-12 21:54:52.790772189 +0100
+--- xine-lib-vdr-1.1.2~/config.h.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/config.h.in	2006-09-02 14:32:51.559518398 +0100
 @@ -1,13 +1,5 @@
  /* config.h.in.  Generated from configure.ac by autoheader.  */
  
@@ -145,8 +145,27 @@
  
  /* Define the real type of socklen_t */
 diff -urNad xine-lib-vdr-1.1.2~/configure xine-lib-vdr-1.1.2/configure
---- xine-lib-vdr-1.1.2~/configure	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/configure	2006-07-12 21:55:33.935350917 +0100
+--- xine-lib-vdr-1.1.2~/configure	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/configure	2006-09-02 14:34:26.884859217 +0100
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.59e.
++# Generated by GNU Autoconf 2.60.
+ #
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+ # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@@ -230,8 +230,8 @@
+ 
+ 
+       for as_shell in $as_candidate_shells $SHELL; do
+-	 # Try only shells which exist, to save several forks.
+-	 if test -f "$as_shell" &&
++	 # Try only shells that exist, to save several forks.
++	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+ 		{ ("$as_shell") 2> /dev/null <<\_ASEOF
+ # Be Bourne compatible
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
 @@ -790,6 +790,9 @@
  build_alias
  host_alias
@@ -166,10 +185,28 @@
    --disable-dependency-tracking  speeds up one-time build
    --enable-dependency-tracking   do not reject slow dependency extractors
    --enable-static[=PKGS]  build static libraries [default=no]
-@@ -2373,6 +2378,31 @@
+@@ -2012,7 +2017,7 @@
+ if $ac_init_version; then
+   cat <<\_ACEOF
+ configure
+-generated by GNU Autoconf 2.59e
++generated by GNU Autoconf 2.60
  
+ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@@ -2026,7 +2031,7 @@
+ running configure, to aid debugging if configure makes a mistake.
  
+ It was created by $as_me, which was
+-generated by GNU Autoconf 2.59e.  Invocation command line was
++generated by GNU Autoconf 2.60.  Invocation command line was
  
+   $ $0 $@
+ 
+@@ -2373,6 +2378,56 @@
+ 
+ 
+ 
 +{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
 +echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
 +    # Check whether --enable-maintainer-mode was given.
@@ -195,216 +232,847 @@
 +
 +
 +
++{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
++echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
++    # Check whether --enable-maintainer-mode was given.
++if test "${enable_maintainer_mode+set}" = set; then
++  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
++else
++  USE_MAINTAINER_MODE=no
++fi
++
++  { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
++echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
++
++
++if test $USE_MAINTAINER_MODE = yes; then
++  MAINTAINER_MODE_TRUE=
++  MAINTAINER_MODE_FALSE='#'
++else
++  MAINTAINER_MODE_TRUE='#'
++  MAINTAINER_MODE_FALSE=
++fi
++
++  MAINT=$MAINTAINER_MODE_TRUE
++
++
++
  
  
  XINE_MAJOR=1
-@@ -6718,7 +6748,7 @@
+@@ -2824,7 +2879,7 @@
+ 
+ { echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+ echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
+-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/^a-zA-Z0-9_/_/g'`
++set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+ if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -3760,7 +3815,7 @@
+ 	ac_compiler_gnu=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+@@ -3946,13 +4001,13 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    ac_c_werror_flag=$ac_save_c_werror_flag
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+@@ -4017,6 +4072,11 @@
+    that's true only with -std.  */
+ int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+ 
++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
++   inside strings and character constants.  */
++#define FOO(x) 'x'
++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
++
+ int test (int i, double x);
+ struct s1 {int (*f) (int a);};
+ struct s2 {int (*f) (double a);};
+@@ -4077,7 +4137,7 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext
++rm -f core conftest.err conftest.$ac_objext
+   test "x$ac_cv_prog_cc_c89" != "xno" && break
+ done
+ rm -f conftest.$ac_ext
+@@ -4292,7 +4352,7 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext
+   if test "${ac_cv_search_strerror+set}" = set; then
+   break
+@@ -5015,7 +5075,7 @@
+ 	ac_compiler_gnu=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+@@ -5201,13 +5261,13 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    ac_c_werror_flag=$ac_save_c_werror_flag
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+@@ -5272,6 +5332,11 @@
+    that's true only with -std.  */
+ int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+ 
++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
++   inside strings and character constants.  */
++#define FOO(x) 'x'
++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
++
+ int test (int i, double x);
+ struct s1 {int (*f) (int a);};
+ struct s2 {int (*f) (double a);};
+@@ -5332,7 +5397,7 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext
++rm -f core conftest.err conftest.$ac_objext
+   test "x$ac_cv_prog_cc_c89" != "xno" && break
+ done
+ rm -f conftest.$ac_ext
+@@ -5794,7 +5859,7 @@
+ 	ac_cv_header_stdc=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+@@ -5921,7 +5986,7 @@
+ 
+ { echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+ echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
+-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/^a-zA-Z0-9_/_/g'`
++set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+ if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -6144,7 +6209,7 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   test "$ac_cv_c_inline" != no && break
+ done
+ 
+@@ -6718,7 +6783,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
 -  echo '#line 6721 "configure"' > conftest.$ac_ext
-+  echo '#line 6751 "configure"' > conftest.$ac_ext
++  echo '#line 6786 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -9536,11 +9566,11 @@
+@@ -6871,7 +6936,7 @@
+ 	lt_cv_cc_needs_belf=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+      ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -7254,7 +7319,7 @@
+ 	eval "$as_ac_Header=no"
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_Header'}'`
+ 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+@@ -7337,7 +7402,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -7647,7 +7712,7 @@
+ 	ac_compiler_gnu=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+@@ -7833,13 +7898,13 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+@@ -8439,7 +8504,7 @@
+ 	ac_compiler_gnu=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_f77_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+@@ -8502,7 +8567,7 @@
+ 	ac_cv_prog_f77_g=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
+@@ -9536,11 +9601,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:9539: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9569: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9604: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:9543: \$? = $ac_status" >&5
-+   echo "$as_me:9573: \$? = $ac_status" >&5
++   echo "$as_me:9608: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -9798,11 +9828,11 @@
+@@ -9798,11 +9863,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:9801: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9831: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9866: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:9805: \$? = $ac_status" >&5
-+   echo "$as_me:9835: \$? = $ac_status" >&5
++   echo "$as_me:9870: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -9860,11 +9890,11 @@
+@@ -9860,11 +9925,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:9863: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9893: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9928: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:9867: \$? = $ac_status" >&5
-+   echo "$as_me:9897: \$? = $ac_status" >&5
++   echo "$as_me:9932: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -12207,7 +12237,7 @@
+@@ -10326,7 +10391,7 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+@@ -10401,7 +10466,7 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+@@ -11621,7 +11686,7 @@
+ 	ac_cv_lib_dl_dlopen=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -11732,7 +11797,7 @@
+ 	ac_cv_func_shl_load=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+@@ -11811,7 +11876,7 @@
+ 	ac_cv_lib_dld_shl_load=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -11912,7 +11977,7 @@
+ 	ac_cv_func_dlopen=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+@@ -11991,7 +12056,7 @@
+ 	ac_cv_lib_dl_dlopen=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -12071,7 +12136,7 @@
+ 	ac_cv_lib_svld_dlopen=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -12151,7 +12216,7 @@
+ 	ac_cv_lib_dld_dld_link=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -12207,7 +12272,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 12210 "configure"
-+#line 12240 "configure"
++#line 12275 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -12305,7 +12335,7 @@
+@@ -12305,7 +12370,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 12308 "configure"
-+#line 12338 "configure"
++#line 12373 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -14585,11 +14615,11 @@
+@@ -13412,7 +13477,7 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+@@ -13488,7 +13553,7 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+@@ -14585,11 +14650,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:14588: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14618: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14653: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:14592: \$? = $ac_status" >&5
-+   echo "$as_me:14622: \$? = $ac_status" >&5
++   echo "$as_me:14657: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -14647,11 +14677,11 @@
+@@ -14647,11 +14712,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:14650: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14680: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14715: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:14654: \$? = $ac_status" >&5
-+   echo "$as_me:14684: \$? = $ac_status" >&5
++   echo "$as_me:14719: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -16095,7 +16125,7 @@
+@@ -15509,7 +15574,7 @@
+ 	ac_cv_lib_dl_dlopen=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -15620,7 +15685,7 @@
+ 	ac_cv_func_shl_load=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+@@ -15699,7 +15764,7 @@
+ 	ac_cv_lib_dld_shl_load=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -15800,7 +15865,7 @@
+ 	ac_cv_func_dlopen=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+@@ -15879,7 +15944,7 @@
+ 	ac_cv_lib_dl_dlopen=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -15959,7 +16024,7 @@
+ 	ac_cv_lib_svld_dlopen=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -16039,7 +16104,7 @@
+ 	ac_cv_lib_dld_dld_link=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -16095,7 +16160,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 16098 "configure"
-+#line 16128 "configure"
++#line 16163 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -16193,7 +16223,7 @@
+@@ -16193,7 +16258,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 16196 "configure"
-+#line 16226 "configure"
++#line 16261 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -17078,11 +17108,11 @@
+@@ -17078,11 +17143,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:17081: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:17111: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17146: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:17085: \$? = $ac_status" >&5
-+   echo "$as_me:17115: \$? = $ac_status" >&5
++   echo "$as_me:17150: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -17140,11 +17170,11 @@
+@@ -17140,11 +17205,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:17143: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:17173: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17208: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:17147: \$? = $ac_status" >&5
-+   echo "$as_me:17177: \$? = $ac_status" >&5
++   echo "$as_me:17212: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -19293,11 +19323,11 @@
+@@ -17596,7 +17661,7 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+@@ -17661,7 +17726,7 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+@@ -19293,11 +19358,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:19296: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19326: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19361: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:19300: \$? = $ac_status" >&5
-+   echo "$as_me:19330: \$? = $ac_status" >&5
++   echo "$as_me:19365: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -19555,11 +19585,11 @@
+@@ -19555,11 +19620,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:19558: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19588: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19623: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:19562: \$? = $ac_status" >&5
-+   echo "$as_me:19592: \$? = $ac_status" >&5
++   echo "$as_me:19627: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -19617,11 +19647,11 @@
+@@ -19617,11 +19682,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:19620: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19650: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19685: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:19624: \$? = $ac_status" >&5
-+   echo "$as_me:19654: \$? = $ac_status" >&5
++   echo "$as_me:19689: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -21964,7 +21994,7 @@
+@@ -20083,7 +20148,7 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+@@ -20158,7 +20223,7 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+@@ -21378,7 +21443,7 @@
+ 	ac_cv_lib_dl_dlopen=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -21489,7 +21554,7 @@
+ 	ac_cv_func_shl_load=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+@@ -21568,7 +21633,7 @@
+ 	ac_cv_lib_dld_shl_load=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -21669,7 +21734,7 @@
+ 	ac_cv_func_dlopen=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+@@ -21748,7 +21813,7 @@
+ 	ac_cv_lib_dl_dlopen=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -21828,7 +21893,7 @@
+ 	ac_cv_lib_svld_dlopen=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -21908,7 +21973,7 @@
+ 	ac_cv_lib_dld_dld_link=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -21964,7 +22029,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 21967 "configure"
-+#line 21997 "configure"
++#line 22032 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -22062,7 +22092,7 @@
+@@ -22062,7 +22127,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 22065 "configure"
-+#line 22095 "configure"
++#line 22130 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -26024,190 +26054,6 @@
+@@ -23859,7 +23924,7 @@
  
  fi
  
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+     if test "$am_cv_func_iconv" != yes; then
+       am_save_LIBS="$LIBS"
+@@ -23925,7 +23990,7 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+       LIBS="$am_save_LIBS"
+     fi
+@@ -24029,7 +24094,7 @@
+ 	am_cv_proto_iconv_arg1="const"
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"
+ fi
+ 
+@@ -24439,7 +24504,7 @@
+ 	gt_cv_func_CFPreferencesCopyAppValue=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+      CPPFLAGS="$gt_save_CPPFLAGS"
+      LIBS="$gt_save_LIBS"
+@@ -24519,7 +24584,7 @@
+ 	gt_cv_func_CFLocaleCopyCurrent=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+      CPPFLAGS="$gt_save_CPPFLAGS"
+      LIBS="$gt_save_LIBS"
+@@ -24633,7 +24698,7 @@
+ 	gt_cv_func_gnugettext1_libc=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5
+@@ -24738,7 +24803,7 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+     if test "$am_cv_func_iconv" != yes; then
+       am_save_LIBS="$LIBS"
+@@ -24804,7 +24869,7 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+       LIBS="$am_save_LIBS"
+     fi
+@@ -25284,7 +25349,7 @@
+ 	gt_cv_func_gnugettext1_libintl=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+                         if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then
+               LIBS="$LIBS $LIBICONV"
+@@ -25355,7 +25420,7 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+             fi
+             CPPFLAGS="$gt_save_CPPFLAGS"
+@@ -25599,7 +25664,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -25738,7 +25803,7 @@
+ 	ac_cv_c_bigendian=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -25819,7 +25884,7 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -25880,7 +25945,7 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+ echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
+@@ -26012,7 +26077,7 @@
+ 	ac_cv_c_const=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6; }
+@@ -26024,190 +26089,6 @@
+ 
+ fi
+ 
 -{ echo "$as_me:$LINENO: checking for inline" >&5
 -echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
 -if test "${ac_cv_c_inline+set}" = set; then
@@ -592,7 +1260,1796 @@
  { echo "$as_me:$LINENO: checking for off_t" >&5
  echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
  if test "${ac_cv_type_off_t+set}" = set; then
-@@ -54193,7 +54039,7 @@
+@@ -26274,7 +26155,7 @@
+ 	ac_cv_type_off_t=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
+ echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
+@@ -26354,7 +26235,7 @@
+ 	ac_cv_type_size_t=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+ echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
+@@ -26434,7 +26315,7 @@
+ 	ac_cv_type_long=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
+ echo "${ECHO_T}$ac_cv_type_long" >&6; }
+@@ -26570,7 +26451,7 @@
+ 			ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -26695,7 +26576,7 @@
+ 			ac_mid=`expr 2 '*' $ac_mid`
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -26704,10 +26585,10 @@
+ 	ac_lo= ac_hi=
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -26771,7 +26652,7 @@
+ 	ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_long=$ac_lo;;
+@@ -26931,7 +26812,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -27084,7 +26965,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -27241,7 +27122,7 @@
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+             { echo "$as_me:$LINENO: checking that size of short is 2" >&5
+@@ -27305,7 +27186,7 @@
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+             { echo "$as_me:$LINENO: checking that size of int is 4" >&5
+@@ -27369,7 +27250,7 @@
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+             { echo "$as_me:$LINENO: checking that size of long long is 8" >&5
+@@ -27433,7 +27314,7 @@
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+         cat >lib/inttypes.h << EOF
+@@ -27671,7 +27552,7 @@
+ 	ac_cv_type_ssize_t=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
+ echo "${ECHO_T}$ac_cv_type_ssize_t" >&6; }
+@@ -27818,7 +27699,7 @@
+ 	ac_cv_lib_pthread_pthread_create=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -27915,7 +27796,7 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ LIBS="$ac_save_LIBS"
+ 
+ { echo "$as_me:$LINENO: result: $have_recursive_mutex" >&5
+@@ -28044,7 +27925,7 @@
+ 	ac_cv_lib_c_dlopen=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -28128,7 +28009,7 @@
+ 	ac_cv_lib_dl_dlopen=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -28214,7 +28095,7 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+     CPPFLAGS=$ac_save_CPPFLAGS
+     LIBS=$ac_save_LIBS
+@@ -28350,7 +28231,7 @@
+ 	ac_cv_have_decl_lrintf=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_have_decl_lrintf" >&5
+ echo "${ECHO_T}$ac_cv_have_decl_lrintf" >&6; }
+@@ -28438,7 +28319,7 @@
+ 	ac_cv_have_decl_rintf=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_have_decl_rintf" >&5
+ echo "${ECHO_T}$ac_cv_have_decl_rintf" >&6; }
+@@ -28519,7 +28400,7 @@
+ 	ac_cv_type_int_fast8_t=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_type_int_fast8_t" >&5
+ echo "${ECHO_T}$ac_cv_type_int_fast8_t" >&6; }
+@@ -28643,7 +28524,7 @@
+ 	ac_cv_lib_mlib_mlib_VideoAddBlock_U8_S16=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -28715,7 +28596,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -28971,7 +28852,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -29127,7 +29008,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -29293,7 +29174,7 @@
+ 	ac_cv_lib_postproc_pp_get_context=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -29374,7 +29255,7 @@
+ 	ac_cv_lib_avcodec_pp_get_context=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -29460,7 +29341,7 @@
+ 	ac_cv_lib_avcodec_register_avcodec=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -29554,7 +29435,7 @@
+ 	external_ffmpeg_found=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+             if test x"$external_ffmpeg_found" = "xyes"; then
+@@ -29873,7 +29754,7 @@
+ done
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi # $ac_x_libraries = no
+ 
+@@ -29990,7 +29871,7 @@
+ 	ac_R_nospace=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+       if test $ac_R_nospace = yes; then
+ 	{ echo "$as_me:$LINENO: result: no" >&5
+@@ -30055,7 +29936,7 @@
+ 	ac_R_space=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ 	if test $ac_R_space = yes; then
+ 	  { echo "$as_me:$LINENO: result: yes" >&5
+@@ -30213,7 +30094,7 @@
+ 	ac_cv_lib_dnet_dnet_ntoa=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -30295,7 +30176,7 @@
+ 	ac_cv_lib_dnet_stub_dnet_ntoa=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -30308,7 +30189,7 @@
+     fi
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+     LIBS="$ac_xsave_LIBS"
+ 
+@@ -30412,7 +30293,7 @@
+ 	ac_cv_func_gethostbyname=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
+@@ -30490,7 +30371,7 @@
+ 	ac_cv_lib_nsl_gethostbyname=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -30572,7 +30453,7 @@
+ 	ac_cv_lib_bsd_gethostbyname=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -30684,7 +30565,7 @@
+ 	ac_cv_func_connect=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+@@ -30762,7 +30643,7 @@
+ 	ac_cv_lib_socket_connect=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -30867,7 +30748,7 @@
+ 	ac_cv_func_remove=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
+@@ -30945,7 +30826,7 @@
+ 	ac_cv_lib_posix_remove=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -31050,7 +30931,7 @@
+ 	ac_cv_func_shmat=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
+@@ -31128,7 +31009,7 @@
+ 	ac_cv_lib_ipc_shmat=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -31221,7 +31102,7 @@
+ 	ac_cv_lib_ICE_IceConnectionNumber=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -31347,7 +31228,7 @@
+ 	ac_cv_lib_socket_socket=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -31428,7 +31309,7 @@
+ 	ac_cv_lib_nsl_gethostbyname=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -31576,11 +31457,11 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+@@ -31714,7 +31595,7 @@
+ 	ac_cv_lib_z_gzsetparams=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -31784,7 +31665,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -31962,7 +31843,7 @@
+ 	ac_cv_lib_rt_clock_getres=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -32075,7 +31956,7 @@
+ 	ac_cv_lib_GL_glBegin=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -32154,7 +32035,7 @@
+ 	ac_cv_lib_m_tan=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -32224,7 +32105,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -32391,7 +32272,7 @@
+ 	ac_cv_lib_GLU_gluPerspective=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -32461,7 +32342,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -32620,7 +32501,7 @@
+                         echo "*** GLU doesn't link with GL; GLU is disabled ***"
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+                     LIBS="$ac_save_LIBS"
+ 
+@@ -32766,7 +32647,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -33063,7 +32944,7 @@
+ 	ac_cv_lib_Xv_XvShmCreateImage=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -33265,7 +33146,7 @@
+ 	eval "$as_ac_Lib=no"
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -33354,7 +33235,7 @@
+ 	eval "$as_ac_Lib=no"
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -33444,7 +33325,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -33624,7 +33505,7 @@
+ 	eval "$as_ac_Lib=no"
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -33713,7 +33594,7 @@
+ 	eval "$as_ac_Lib=no"
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -33803,7 +33684,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -34040,7 +33921,7 @@
+ 	eval "$as_ac_Lib=no"
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -34129,7 +34010,7 @@
+ 	eval "$as_ac_Lib=no"
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -34218,7 +34099,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -34426,7 +34307,7 @@
+ 	ac_cv_lib_Xinerama_XineramaQueryExtension=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -34837,7 +34718,7 @@
+ 	no_aalib=yes
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -35017,7 +34898,7 @@
+ 	no_aalib=yes
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -35201,7 +35082,7 @@
+           echo "*** or that you have moved AALIB since it was installed."
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+           CFLAGS="$ac_save_CFLAGS"
+           LIBS="$ac_save_LIBS"
+@@ -35482,7 +35363,7 @@
+ 	no_caca=yes
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -35657,7 +35538,7 @@
+           echo "*** or that you have moved CACA since it was installed."
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+           CFLAGS="$ac_save_CFLAGS"
+           LIBS="$ac_save_LIBS"
+@@ -35756,7 +35637,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -35935,7 +35816,7 @@
+ 	ac_cv_lib_dga_XDgaGrabDrawable=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -36006,7 +35887,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -36184,7 +36065,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -36720,7 +36601,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -36888,7 +36769,7 @@
+ 	no_sdl=yes
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -37101,7 +36982,7 @@
+           echo "*** may want to edit the sdl-config script: $SDL_CONFIG"
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+           CFLAGS="$ac_save_CFLAGS"
+           LIBS="$ac_save_LIBS"
+@@ -37309,7 +37190,7 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CPPFLAGS=$ac_save_CPPFLAGS
+ LIBS=$ac_save_LIBS
+ ac_ext=c
+@@ -37440,7 +37321,7 @@
+ 	ac_cv_lib_fame_fame_open=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -37510,7 +37391,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -37686,7 +37567,7 @@
+ 	ac_cv_lib_rte_rte_init=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -37756,7 +37637,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -38102,7 +37983,7 @@
+ 	no_libfame=yes
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -38319,7 +38200,7 @@
+           echo "*** may want to edit the libfame-config script: $LIBFAME_CONFIG"
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+           CFLAGS="$ac_save_CFLAGS"
+           LIBS="$ac_save_LIBS"
+@@ -38649,7 +38530,7 @@
+ 	no_ogg=yes
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -38810,7 +38691,7 @@
+ 	no_vorbis=yes
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -38953,7 +38834,7 @@
+        echo "*** or that you have moved Vorbis since it was installed."
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+        CFLAGS="$ac_save_CFLAGS"
+        LIBS="$ac_save_LIBS"
+@@ -39052,7 +38933,7 @@
+        echo "*** may want to edit the ogg-config script: $OGG_CONFIG"
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+        CFLAGS="$ac_save_CFLAGS"
+        LIBS="$ac_save_LIBS"
+@@ -39175,7 +39056,7 @@
+ 	no_ogg=yes
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -39334,7 +39215,7 @@
+ 	no_theora=yes
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -39481,7 +39362,7 @@
+        echo "*** or that you have moved Theora since it was installed."
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+        CFLAGS="$ac_save_CFLAGS"
+        LIBS="$ac_save_LIBS"
+@@ -39580,7 +39461,7 @@
+        echo "*** may want to edit the ogg-config script: $OGG_CONFIG"
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+        CFLAGS="$ac_save_CFLAGS"
+        LIBS="$ac_save_LIBS"
+@@ -39842,7 +39723,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -40099,7 +39980,7 @@
+ 	no_libFLAC=yes
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -40243,7 +40124,7 @@
+        echo "*** may want to edit the libFLAC-config script: $LIBFLAC_CONFIG"
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+        CFLAGS="$ac_save_CFLAGS"
+        LIBS="$ac_save_LIBS"
+@@ -40369,7 +40250,7 @@
+ 	eval "$as_ac_Header=no"
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_Header'}'`
+ 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+@@ -40458,7 +40339,7 @@
+ 	ac_cv_lib_a52_a52_init=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -40756,7 +40637,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -40965,7 +40846,7 @@
+ 	ac_cv_lib_mng_mng_initialize=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -41035,7 +40916,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -41517,7 +41398,7 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   { echo "$as_me:$LINENO: result: $have_ossaudio" >&5
+ echo "${ECHO_T}$have_ossaudio" >&6; }
+ else
+@@ -41658,7 +41539,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -41818,7 +41699,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -42304,7 +42185,7 @@
+         echo "*** exact error that occured. This usually means ALSA was incorrectly installed."
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+@@ -42584,7 +42465,7 @@
+ 	no_esd=yes
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -42780,7 +42661,7 @@
+           echo "*** may want to edit the esd-config script: $ESD_CONFIG"
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+           CFLAGS="$ac_save_CFLAGS"
+           LIBS="$ac_save_LIBS"
+@@ -43039,7 +42920,7 @@
+ 	ac_cv_lib_artsc_arts_init=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -43119,7 +43000,7 @@
+ 	no_arts=yes
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -43315,7 +43196,7 @@
+           echo "*** may want to edit the artsc-config script: $ARTS_CONFIG"
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+           CFLAGS="$ac_save_CFLAGS"
+           LIBS="$ac_save_LIBS"
+@@ -44004,7 +43885,7 @@
+ 	ac_cv_lib_smbclient_smbc_init=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -44074,7 +43955,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -44257,7 +44138,7 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $have_sunaudio" >&5
+ echo "${ECHO_T}$have_sunaudio" >&6; }
+ 
+@@ -44341,7 +44222,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -44537,7 +44418,7 @@
+ 	ac_cv_lib_kstat_kstat_open=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -44625,7 +44506,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -45055,7 +44936,7 @@
+ 	no_dvdnav=yes
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -45241,7 +45122,7 @@
+           echo "*** may want to edit the dvdnav-config script: $DVDNAV_CONFIG"
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+           CFLAGS="$ac_save_CFLAGS"
+           LIBS="$ac_save_LIBS"
+@@ -45361,7 +45242,7 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+   if test "x$empty_array_size" = "xxxx";then
+    cat >conftest.$ac_ext <<_ACEOF
+@@ -45421,7 +45302,7 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   fi
+ 
+   if test "x$empty_array_size" = "xxxx"
+@@ -45583,7 +45464,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -45678,7 +45559,7 @@
+ 	ac_cv_header_stdc=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+@@ -45875,7 +45756,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -46040,7 +45921,7 @@
+ 	ac_cv_type_int=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
+ echo "${ECHO_T}$ac_cv_type_int" >&6; }
+@@ -46176,7 +46057,7 @@
+ 			ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -46301,7 +46182,7 @@
+ 			ac_mid=`expr 2 '*' $ac_mid`
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -46310,10 +46191,10 @@
+ 	ac_lo= ac_hi=
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -46377,7 +46258,7 @@
+ 	ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_int=$ac_lo;;
+@@ -46540,7 +46421,7 @@
+ 	ac_cv_type_long=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
+ echo "${ECHO_T}$ac_cv_type_long" >&6; }
+@@ -46676,7 +46557,7 @@
+ 			ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -46801,7 +46682,7 @@
+ 			ac_mid=`expr 2 '*' $ac_mid`
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -46810,10 +46691,10 @@
+ 	ac_lo= ac_hi=
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -46877,7 +46758,7 @@
+ 	ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_long=$ac_lo;;
+@@ -47040,7 +46921,7 @@
+ 	ac_cv_type_long_long=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
+ echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
+@@ -47176,7 +47057,7 @@
+ 			ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -47301,7 +47182,7 @@
+ 			ac_mid=`expr 2 '*' $ac_mid`
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -47310,10 +47191,10 @@
+ 	ac_lo= ac_hi=
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -47377,7 +47258,7 @@
+ 	ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_long_long=$ac_lo;;
+@@ -47542,7 +47423,7 @@
+ 	ISOC99_PRAGMA=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     { echo "$as_me:$LINENO: result: $ISOC99_PRAGMA" >&5
+ echo "${ECHO_T}$ISOC99_PRAGMA" >&6; }
+ 
+@@ -47606,7 +47487,7 @@
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ 
+         if test "$cross_compiling" = yes; then
+@@ -47838,7 +47719,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -48013,7 +47894,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -48186,7 +48067,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -48350,7 +48231,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -48511,7 +48392,7 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_LINUX_CDROM 1
+@@ -48588,7 +48469,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -48761,7 +48642,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -49010,7 +48891,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -49147,10 +49028,10 @@
+ 	ac_cv_member_struct_tm_tm_gmtoff=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_gmtoff" >&5
+ echo "${ECHO_T}$ac_cv_member_struct_tm_tm_gmtoff" >&6; }
+@@ -49486,7 +49367,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -49963,7 +49844,7 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext
++rm -f core conftest.err conftest.$ac_objext
+ 	 CC="$CC -n32"
+ 	 rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+@@ -50007,7 +49888,7 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext
++rm -f core conftest.err conftest.$ac_objext
+ 	 break
+        done
+        CC=$ac_save_CC
+@@ -50092,7 +49973,7 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -50159,7 +50040,7 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   break
+ done
+ fi
+@@ -50245,7 +50126,7 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -50312,7 +50193,7 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   break
+ done
+ fi
+@@ -50400,7 +50281,7 @@
+ 	ac_cv_lib_posix4_sched_get_priority_min=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -50525,7 +50406,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -50603,7 +50484,7 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -50662,7 +50543,7 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   break
+ done
+ fi
+@@ -50742,7 +50623,7 @@
+ 	ac_cv_func_fseeko=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_fseeko" >&5
+@@ -50839,7 +50720,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -51039,7 +50920,7 @@
+ 	eval "$as_ac_var=no"
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -51111,7 +50992,7 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ { echo "$as_me:$LINENO: checking for hstrerror in -lresolv" >&5
+ echo $ECHO_N "checking for hstrerror in -lresolv... $ECHO_C" >&6; }
+@@ -51184,7 +51065,7 @@
+ 	ac_cv_lib_resolv_hstrerror=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -51302,7 +51183,7 @@
+ 	ac_cv_func_opendir=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_opendir" >&5
+@@ -51405,7 +51286,7 @@
+ 
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+         done
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_c_attribute_aligned" >&5
+@@ -51493,7 +51374,7 @@
+ 	ac_cv_try_cflags_ok=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     CFLAGS="$SAVE_CFLAGS"
+     { echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
+ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6; }
+@@ -51563,7 +51444,7 @@
+ 	ac_cv_try_cflags_ok=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     CFLAGS="$SAVE_CFLAGS"
+     { echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
+ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6; }
+@@ -51633,7 +51514,7 @@
+ 	ac_cv_try_cflags_ok=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     CFLAGS="$SAVE_CFLAGS"
+     { echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
+ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6; }
+@@ -51703,7 +51584,7 @@
+ 	ac_cv_try_cflags_ok=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     CFLAGS="$SAVE_CFLAGS"
+     { echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
+ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6; }
+@@ -51773,7 +51654,7 @@
+ 	ac_cv_try_cflags_ok=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     CFLAGS="$SAVE_CFLAGS"
+     { echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
+ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6; }
+@@ -51843,7 +51724,7 @@
+ 	ac_cv_try_cflags_ok=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     CFLAGS="$SAVE_CFLAGS"
+     { echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
+ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6; }
+@@ -51913,7 +51794,7 @@
+ 	ac_cv_try_cflags_ok=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     CFLAGS="$SAVE_CFLAGS"
+     { echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
+ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6; }
+@@ -51983,7 +51864,7 @@
+ 	ac_cv_try_cflags_ok=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     CFLAGS="$SAVE_CFLAGS"
+     { echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
+ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6; }
+@@ -52053,7 +51934,7 @@
+ 	ac_cv_try_cflags_ok=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     CFLAGS="$SAVE_CFLAGS"
+     { echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
+ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6; }
+@@ -52124,7 +52005,7 @@
+ 	ac_cv_try_cflags_ok=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     CFLAGS="$SAVE_CFLAGS"
+     { echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
+ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6; }
+@@ -52194,7 +52075,7 @@
+ 	ac_cv_try_cflags_ok=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     CFLAGS="$SAVE_CFLAGS"
+     { echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
+ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6; }
+@@ -52270,7 +52151,7 @@
+ echo "${ECHO_T}no" >&6; };  CFLAGS="$SAVE_CFLAGS"
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext;
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext;
+ 
+ 
+         { echo "$as_me:$LINENO: checking for gcc 3.4.0 or later" >&5
+@@ -52345,7 +52226,7 @@
+ 	ac_cv_try_cflags_ok=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     CFLAGS="$SAVE_CFLAGS"
+     { echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
+ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6; }
+@@ -52424,7 +52305,7 @@
+ 	ac_cv_try_cflags_ok=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     CFLAGS="$SAVE_CFLAGS"
+     { echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
+ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6; }
+@@ -52492,7 +52373,7 @@
+ 	ac_cv_try_cflags_ok=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     CFLAGS="$SAVE_CFLAGS"
+     { echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
+ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6; }
+@@ -52560,7 +52441,7 @@
+ 	ac_cv_try_cflags_ok=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     CFLAGS="$SAVE_CFLAGS"
+     { echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
+ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6; }
+@@ -52639,7 +52520,7 @@
+ 	ac_cv_try_cflags_ok=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     CFLAGS="$SAVE_CFLAGS"
+     { echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
+ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6; }
+@@ -52927,7 +52808,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -53107,7 +52988,7 @@
+ 	ac_header_compiler=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+@@ -53827,7 +53708,7 @@
+ 	ac_cv_try_cflags_ok=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     CFLAGS="$SAVE_CFLAGS"
+     { echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
+ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6; }
+@@ -53897,7 +53778,7 @@
+ 	ac_cv_try_cflags_ok=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     CFLAGS="$SAVE_CFLAGS"
+     { echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
+ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6; }
+@@ -53968,7 +53849,7 @@
+ 	ac_cv_try_cflags_ok=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     CFLAGS="$SAVE_CFLAGS"
+     { echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
+ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6; }
+@@ -54039,7 +53920,7 @@
+ 	ac_cv_try_cflags_ok=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     CFLAGS="$SAVE_CFLAGS"
+     { echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
+ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6; }
+@@ -54111,7 +53992,7 @@
+ 	ac_cv_try_cflags_ok=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     CFLAGS="$SAVE_CFLAGS"
+     { echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
+ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6; }
+@@ -54181,7 +54062,7 @@
+ 	ac_cv_try_cflags_ok=no
+ fi
+ 
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     CFLAGS="$SAVE_CFLAGS"
+     { echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
+ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6; }
+@@ -54193,7 +54074,7 @@
  CFLAGS="$CFLAGS $wsa"
  
  
@@ -601,7 +3058,7 @@
  
  ac_config_commands="$ac_config_commands default"
  
-@@ -54293,6 +54139,13 @@
+@@ -54293,6 +54174,20 @@
  LTLIBOBJS=$ac_ltlibobjs
  
  
@@ -612,10 +3069,35 @@
 +Usually this means the macro was only invoked conditionally." >&2;}
 +   { (exit 1); exit 1; }; }
 +fi
++if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
  if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
    { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
-@@ -55368,6 +55221,7 @@
+@@ -55099,7 +54994,7 @@
+ # values after options handling.
+ ac_log="
+ This file was extended by $as_me, which was
+-generated by GNU Autoconf 2.59e.  Invocation command line was
++generated by GNU Autoconf 2.60.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+@@ -55152,7 +55047,7 @@
+ cat >>$CONFIG_STATUS <<_ACEOF
+ ac_cs_version="\\
+ config.status
+-configured by $0, generated by GNU Autoconf 2.59e,
++configured by $0, generated by GNU Autoconf 2.60,
+   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+ 
+ Copyright (C) 2006 Free Software Foundation, Inc.
+@@ -55368,6 +55263,7 @@
      "src/video_out/vidix/drivers/Makefile") CONFIG_FILES="$CONFIG_FILES src/video_out/vidix/drivers/Makefile" ;;
      "src/xine-utils/Makefile") CONFIG_FILES="$CONFIG_FILES src/xine-utils/Makefile" ;;
      "src/xine-engine/Makefile") CONFIG_FILES="$CONFIG_FILES src/xine-engine/Makefile" ;;
@@ -623,7 +3105,7 @@
      "win32/Makefile") CONFIG_FILES="$CONFIG_FILES win32/Makefile" ;;
      "win32/include/Makefile") CONFIG_FILES="$CONFIG_FILES win32/include/Makefile" ;;
      "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-@@ -55470,6 +55324,9 @@
+@@ -55470,6 +55366,9 @@
  build_alias!$build_alias$ac_delim
  host_alias!$host_alias$ac_delim
  target_alias!$target_alias$ac_delim
@@ -633,7 +3115,7 @@
  XINE_MAJOR!$XINE_MAJOR$ac_delim
  XINE_MINOR!$XINE_MINOR$ac_delim
  XINE_SUB!$XINE_SUB$ac_delim
-@@ -55527,9 +55384,6 @@
+@@ -55527,9 +55426,6 @@
  AMDEP_TRUE!$AMDEP_TRUE$ac_delim
  AMDEP_FALSE!$AMDEP_FALSE$ac_delim
  AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
@@ -643,7 +3125,7 @@
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -55571,6 +55425,9 @@
+@@ -55571,6 +55467,9 @@
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
@@ -653,7 +3135,7 @@
  GREP!$GREP$ac_delim
  EGREP!$EGREP$ac_delim
  CPP!$CPP$ac_delim
-@@ -55665,9 +55522,6 @@
+@@ -55665,9 +55564,6 @@
  XXMC_LIB!$XXMC_LIB$ac_delim
  HAVE_XVMC_TRUE!$HAVE_XVMC_TRUE$ac_delim
  HAVE_XVMC_FALSE!$HAVE_XVMC_FALSE$ac_delim
@@ -663,7 +3145,7 @@
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -55709,6 +55563,9 @@
+@@ -55709,6 +55605,9 @@
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
@@ -673,7 +3155,7 @@
  AALIB_CFLAGS!$AALIB_CFLAGS$ac_delim
  AALIB_LIBS!$AALIB_LIBS$ac_delim
  HAVE_AA_TRUE!$HAVE_AA_TRUE$ac_delim
-@@ -55803,9 +55660,6 @@
+@@ -55803,9 +55702,6 @@
  MAD_FALSE!$MAD_FALSE$ac_delim
  EXTERNAL_LIBMAD_TRUE!$EXTERNAL_LIBMAD_TRUE$ac_delim
  EXTERNAL_LIBMAD_FALSE!$EXTERNAL_LIBMAD_FALSE$ac_delim
@@ -683,7 +3165,7 @@
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -55847,6 +55701,9 @@
+@@ -55847,6 +55743,9 @@
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
@@ -693,7 +3175,7 @@
  WAND_CONFIG!$WAND_CONFIG$ac_delim
  HAVE_WAND_TRUE!$HAVE_WAND_TRUE$ac_delim
  HAVE_WAND_FALSE!$HAVE_WAND_FALSE$ac_delim
-@@ -55941,9 +55798,6 @@
+@@ -55941,9 +55840,6 @@
  W32DLL_DEP!$W32DLL_DEP$ac_delim
  LIBOBJS!$LIBOBJS$ac_delim
  DEBUG_CFLAGS!$DEBUG_CFLAGS$ac_delim
@@ -703,7 +3185,7 @@
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -55985,6 +55839,9 @@
+@@ -55985,6 +55881,9 @@
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
@@ -713,7 +3195,7 @@
  PASS2_CFLAGS!$PASS2_CFLAGS$ac_delim
  OBJC!$OBJC$ac_delim
  OBJCFLAGS!$OBJCFLAGS$ac_delim
-@@ -56031,7 +55888,7 @@
+@@ -56031,7 +55930,7 @@
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
@@ -722,7 +3204,15 @@
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -56770,7 +56627,7 @@
+@@ -56316,6 +56215,7 @@
+ 
+ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
++  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+   { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ which seems to be undefined.  Please make sure it is defined." >&5
+ echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+@@ -56770,7 +56670,7 @@
  echo "   - stdin_fifo    - rtp"
  echo "   - http          - mms"
  echo "   - pnm           - rtsp"
@@ -731,7 +3221,7 @@
  if test x"$external_dvdnav" = "xyes"; then
    echo "   - dvd (external libs)"
  else
-@@ -56948,6 +56805,7 @@
+@@ -56948,6 +56848,7 @@
  echo "   - eq              - eq2"
  echo "   - boxblur         - denoise3d"
  echo "   - unsharp         - tvtime"
@@ -740,8 +3230,8 @@
  echo "   - goom            - oscope"
  echo "   - fftscope        - mosaico"
 diff -urNad xine-lib-vdr-1.1.2~/doc/Makefile.in xine-lib-vdr-1.1.2/doc/Makefile.in
---- xine-lib-vdr-1.1.2~/doc/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/doc/Makefile.in	2006-07-12 21:55:00.102875039 +0100
+--- xine-lib-vdr-1.1.2~/doc/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/doc/Makefile.in	2006-09-02 14:33:55.044411358 +0100
 @@ -357,6 +357,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -752,7 +3242,17 @@
  MAKEINFO = @MAKEINFO@
  MKINSTALLDIRS = @MKINSTALLDIRS@
  MKNOD = @MKNOD@
-@@ -527,7 +530,7 @@
+@@ -518,16 +521,14 @@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
+ SUBDIRS = man hackersguide faq
+ docs_DATA = README README.dvb README.dxr3 \
+-	    README.freebsd README.irix README.network_dvd README.opengl \
+-	    README.solaris README.syncfb README_xxmc.html README.MINGWCROSS \
+-	    README.WIN32
++	    README.opengl README_xxmc.html 
+ 
+ EXTRA_DIST = $(docs_DATA)
+ docsdir = $(prefix)/share/doc/xine
  all: all-recursive
  
  .SUFFIXES:
@@ -761,7 +3261,7 @@
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
  	    *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -552,9 +553,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -774,8 +3274,8 @@
  
  mostlyclean-libtool:
 diff -urNad xine-lib-vdr-1.1.2~/doc/faq/Makefile.in xine-lib-vdr-1.1.2/doc/faq/Makefile.in
---- xine-lib-vdr-1.1.2~/doc/faq/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/doc/faq/Makefile.in	2006-07-12 21:55:00.362878696 +0100
+--- xine-lib-vdr-1.1.2~/doc/faq/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/doc/faq/Makefile.in	2006-09-02 14:33:55.412416535 +0100
 @@ -348,6 +348,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -808,8 +3308,8 @@
  
  mostlyclean-libtool:
 diff -urNad xine-lib-vdr-1.1.2~/doc/hackersguide/Makefile.in xine-lib-vdr-1.1.2/doc/hackersguide/Makefile.in
---- xine-lib-vdr-1.1.2~/doc/hackersguide/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/doc/hackersguide/Makefile.in	2006-07-12 21:55:00.650882747 +0100
+--- xine-lib-vdr-1.1.2~/doc/hackersguide/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/doc/hackersguide/Makefile.in	2006-09-02 14:33:55.680420304 +0100
 @@ -348,6 +348,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -842,8 +3342,8 @@
  
  mostlyclean-libtool:
 diff -urNad xine-lib-vdr-1.1.2~/doc/man/Makefile.in xine-lib-vdr-1.1.2/doc/man/Makefile.in
---- xine-lib-vdr-1.1.2~/doc/man/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/doc/man/Makefile.in	2006-07-12 21:55:00.910886404 +0100
+--- xine-lib-vdr-1.1.2~/doc/man/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/doc/man/Makefile.in	2006-09-02 14:33:55.948424074 +0100
 @@ -347,6 +347,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -876,8 +3376,8 @@
  
  mostlyclean-libtool:
 diff -urNad xine-lib-vdr-1.1.2~/doc/man/en/Makefile.in xine-lib-vdr-1.1.2/doc/man/en/Makefile.in
---- xine-lib-vdr-1.1.2~/doc/man/en/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/doc/man/en/Makefile.in	2006-07-12 21:55:01.174890118 +0100
+--- xine-lib-vdr-1.1.2~/doc/man/en/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/doc/man/en/Makefile.in	2006-09-02 14:33:56.212427787 +0100
 @@ -343,6 +343,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -910,8 +3410,8 @@
  
  mostlyclean-libtool:
 diff -urNad xine-lib-vdr-1.1.2~/include/Makefile.in xine-lib-vdr-1.1.2/include/Makefile.in
---- xine-lib-vdr-1.1.2~/include/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/include/Makefile.in	2006-07-12 21:55:01.446893943 +0100
+--- xine-lib-vdr-1.1.2~/include/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/include/Makefile.in	2006-09-02 14:33:56.484431613 +0100
 @@ -349,6 +349,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -944,8 +3444,8 @@
  xine.h: $(top_builddir)/config.status $(srcdir)/xine.h.in
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 diff -urNad xine-lib-vdr-1.1.2~/lib/Makefile.in xine-lib-vdr-1.1.2/lib/Makefile.in
---- xine-lib-vdr-1.1.2~/lib/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/lib/Makefile.in	2006-07-12 21:55:01.782898670 +0100
+--- xine-lib-vdr-1.1.2~/lib/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/lib/Makefile.in	2006-09-02 14:33:56.816436283 +0100
 @@ -369,6 +369,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -978,8 +3478,8 @@
  
  clean-noinstLTLIBRARIES:
 diff -urNad xine-lib-vdr-1.1.2~/m4/Makefile.in xine-lib-vdr-1.1.2/m4/Makefile.in
---- xine-lib-vdr-1.1.2~/m4/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/m4/Makefile.in	2006-07-12 21:55:02.210904690 +0100
+--- xine-lib-vdr-1.1.2~/m4/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/m4/Makefile.in	2006-09-02 14:33:57.088440109 +0100
 @@ -348,6 +348,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -1012,8 +3512,8 @@
  
  mostlyclean-libtool:
 diff -urNad xine-lib-vdr-1.1.2~/misc/Makefile.in xine-lib-vdr-1.1.2/misc/Makefile.in
---- xine-lib-vdr-1.1.2~/misc/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/misc/Makefile.in	2006-07-12 21:55:02.506908853 +0100
+--- xine-lib-vdr-1.1.2~/misc/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/misc/Makefile.in	2006-09-02 14:33:57.384444273 +0100
 @@ -364,6 +364,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -1046,8 +3546,8 @@
  SlackBuild: $(top_builddir)/config.status $(srcdir)/SlackBuild.in
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 diff -urNad xine-lib-vdr-1.1.2~/misc/fonts/Makefile.in xine-lib-vdr-1.1.2/misc/fonts/Makefile.in
---- xine-lib-vdr-1.1.2~/misc/fonts/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/misc/fonts/Makefile.in	2006-07-12 21:55:02.786912792 +0100
+--- xine-lib-vdr-1.1.2~/misc/fonts/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/misc/fonts/Makefile.in	2006-09-02 14:33:57.700448717 +0100
 @@ -348,6 +348,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -1080,8 +3580,8 @@
  
  mostlyclean-libtool:
 diff -urNad xine-lib-vdr-1.1.2~/src/Makefile.in xine-lib-vdr-1.1.2/src/Makefile.in
---- xine-lib-vdr-1.1.2~/src/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/Makefile.in	2006-07-12 21:55:03.058916618 +0100
+--- xine-lib-vdr-1.1.2~/src/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/Makefile.in	2006-09-02 14:33:58.024453275 +0100
 @@ -347,6 +347,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -1121,8 +3621,8 @@
  
  mostlyclean-libtool:
 diff -urNad xine-lib-vdr-1.1.2~/src/audio_out/Makefile.in xine-lib-vdr-1.1.2/src/audio_out/Makefile.in
---- xine-lib-vdr-1.1.2~/src/audio_out/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/audio_out/Makefile.in	2006-07-12 21:55:03.550923538 +0100
+--- xine-lib-vdr-1.1.2~/src/audio_out/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/audio_out/Makefile.in	2006-09-02 14:33:58.500459970 +0100
 @@ -455,6 +455,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -1155,8 +3655,8 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -urNad xine-lib-vdr-1.1.2~/src/demuxers/Makefile.in xine-lib-vdr-1.1.2/src/demuxers/Makefile.in
---- xine-lib-vdr-1.1.2~/src/demuxers/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/demuxers/Makefile.in	2006-07-12 21:55:04.174932315 +0100
+--- xine-lib-vdr-1.1.2~/src/demuxers/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/demuxers/Makefile.in	2006-09-02 14:33:59.136468916 +0100
 @@ -504,6 +504,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -1189,8 +3689,8 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -urNad xine-lib-vdr-1.1.2~/src/dxr3/Makefile.in xine-lib-vdr-1.1.2/src/dxr3/Makefile.in
---- xine-lib-vdr-1.1.2~/src/dxr3/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/dxr3/Makefile.in	2006-07-12 21:55:04.554937660 +0100
+--- xine-lib-vdr-1.1.2~/src/dxr3/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/dxr3/Makefile.in	2006-09-02 14:33:59.588475274 +0100
 @@ -399,6 +399,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -1223,8 +3723,8 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -urNad xine-lib-vdr-1.1.2~/src/input/Makefile.in xine-lib-vdr-1.1.2/src/input/Makefile.in
---- xine-lib-vdr-1.1.2~/src/input/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/input/Makefile.in	2006-07-12 21:55:05.114945537 +0100
+--- xine-lib-vdr-1.1.2~/src/input/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/input/Makefile.in	2006-09-02 14:34:00.144483095 +0100
 @@ -471,6 +471,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -1257,8 +3757,8 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -urNad xine-lib-vdr-1.1.2~/src/input/dvb/Makefile.in xine-lib-vdr-1.1.2/src/input/dvb/Makefile.in
---- xine-lib-vdr-1.1.2~/src/input/dvb/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/input/dvb/Makefile.in	2006-07-12 21:55:05.390949419 +0100
+--- xine-lib-vdr-1.1.2~/src/input/dvb/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/input/dvb/Makefile.in	2006-09-02 14:34:00.420486977 +0100
 @@ -342,6 +342,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -1291,8 +3791,8 @@
  
  mostlyclean-libtool:
 diff -urNad xine-lib-vdr-1.1.2~/src/input/libdvdnav/Makefile.in xine-lib-vdr-1.1.2/src/input/libdvdnav/Makefile.in
---- xine-lib-vdr-1.1.2~/src/input/libdvdnav/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/input/libdvdnav/Makefile.in	2006-07-12 21:55:05.722954089 +0100
+--- xine-lib-vdr-1.1.2~/src/input/libdvdnav/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/input/libdvdnav/Makefile.in	2006-09-02 14:34:00.748491590 +0100
 @@ -362,6 +362,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -1325,8 +3825,8 @@
  
  clean-noinstLTLIBRARIES:
 diff -urNad xine-lib-vdr-1.1.2~/src/input/libreal/Makefile.in xine-lib-vdr-1.1.2/src/input/libreal/Makefile.in
---- xine-lib-vdr-1.1.2~/src/input/libreal/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/input/libreal/Makefile.in	2006-07-12 21:55:06.050958703 +0100
+--- xine-lib-vdr-1.1.2~/src/input/libreal/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/input/libreal/Makefile.in	2006-09-02 14:34:01.076496204 +0100
 @@ -358,6 +358,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -1359,8 +3859,8 @@
  
  clean-noinstLTLIBRARIES:
 diff -urNad xine-lib-vdr-1.1.2~/src/input/librtsp/Makefile.in xine-lib-vdr-1.1.2/src/input/librtsp/Makefile.in
---- xine-lib-vdr-1.1.2~/src/input/librtsp/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/input/librtsp/Makefile.in	2006-07-12 21:55:06.382963373 +0100
+--- xine-lib-vdr-1.1.2~/src/input/librtsp/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/input/librtsp/Makefile.in	2006-09-02 14:34:01.396500705 +0100
 @@ -358,6 +358,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -1393,8 +3893,8 @@
  
  clean-noinstLTLIBRARIES:
 diff -urNad xine-lib-vdr-1.1.2~/src/input/vcd/Makefile.in xine-lib-vdr-1.1.2/src/input/vcd/Makefile.in
---- xine-lib-vdr-1.1.2~/src/input/vcd/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/input/vcd/Makefile.in	2006-07-12 21:55:06.874970293 +0100
+--- xine-lib-vdr-1.1.2~/src/input/vcd/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/input/vcd/Makefile.in	2006-09-02 14:34:01.752505713 +0100
 @@ -386,6 +386,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -1427,8 +3927,8 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -urNad xine-lib-vdr-1.1.2~/src/input/vcd/libcdio/MSWindows/Makefile.in xine-lib-vdr-1.1.2/src/input/vcd/libcdio/MSWindows/Makefile.in
---- xine-lib-vdr-1.1.2~/src/input/vcd/libcdio/MSWindows/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/input/vcd/libcdio/MSWindows/Makefile.in	2006-07-12 21:55:07.134973950 +0100
+--- xine-lib-vdr-1.1.2~/src/input/vcd/libcdio/MSWindows/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/input/vcd/libcdio/MSWindows/Makefile.in	2006-09-02 14:34:02.016509426 +0100
 @@ -338,6 +338,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -1461,8 +3961,8 @@
  
  mostlyclean-libtool:
 diff -urNad xine-lib-vdr-1.1.2~/src/input/vcd/libcdio/Makefile.in xine-lib-vdr-1.1.2/src/input/vcd/libcdio/Makefile.in
---- xine-lib-vdr-1.1.2~/src/input/vcd/libcdio/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/input/vcd/libcdio/Makefile.in	2006-07-12 21:55:07.558979914 +0100
+--- xine-lib-vdr-1.1.2~/src/input/vcd/libcdio/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/input/vcd/libcdio/Makefile.in	2006-09-02 14:34:02.440515390 +0100
 @@ -392,6 +392,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -1495,8 +3995,8 @@
  
  clean-noinstLTLIBRARIES:
 diff -urNad xine-lib-vdr-1.1.2~/src/input/vcd/libcdio/cdio/Makefile.in xine-lib-vdr-1.1.2/src/input/vcd/libcdio/cdio/Makefile.in
---- xine-lib-vdr-1.1.2~/src/input/vcd/libcdio/cdio/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/input/vcd/libcdio/cdio/Makefile.in	2006-07-12 21:55:07.842983909 +0100
+--- xine-lib-vdr-1.1.2~/src/input/vcd/libcdio/cdio/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/input/vcd/libcdio/cdio/Makefile.in	2006-09-02 14:34:02.724519385 +0100
 @@ -342,6 +342,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -1529,8 +4029,8 @@
  
  mostlyclean-libtool:
 diff -urNad xine-lib-vdr-1.1.2~/src/input/vcd/libcdio/image/Makefile.in xine-lib-vdr-1.1.2/src/input/vcd/libcdio/image/Makefile.in
---- xine-lib-vdr-1.1.2~/src/input/vcd/libcdio/image/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/input/vcd/libcdio/image/Makefile.in	2006-07-12 21:55:08.102987566 +0100
+--- xine-lib-vdr-1.1.2~/src/input/vcd/libcdio/image/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/input/vcd/libcdio/image/Makefile.in	2006-09-02 14:34:02.992523154 +0100
 @@ -338,6 +338,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -1563,8 +4063,8 @@
  
  mostlyclean-libtool:
 diff -urNad xine-lib-vdr-1.1.2~/src/input/vcd/libvcd/Makefile.in xine-lib-vdr-1.1.2/src/input/vcd/libvcd/Makefile.in
---- xine-lib-vdr-1.1.2~/src/input/vcd/libvcd/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/input/vcd/libvcd/Makefile.in	2006-07-12 21:55:08.462992630 +0100
+--- xine-lib-vdr-1.1.2~/src/input/vcd/libvcd/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/input/vcd/libvcd/Makefile.in	2006-09-02 14:34:03.348528162 +0100
 @@ -387,6 +387,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -1597,8 +4097,8 @@
  
  clean-noinstLTLIBRARIES:
 diff -urNad xine-lib-vdr-1.1.2~/src/input/vcd/libvcd/libvcd/Makefile.in xine-lib-vdr-1.1.2/src/input/vcd/libvcd/libvcd/Makefile.in
---- xine-lib-vdr-1.1.2~/src/input/vcd/libvcd/libvcd/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/input/vcd/libvcd/libvcd/Makefile.in	2006-07-12 21:55:08.738996512 +0100
+--- xine-lib-vdr-1.1.2~/src/input/vcd/libvcd/libvcd/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/input/vcd/libvcd/libvcd/Makefile.in	2006-09-02 14:34:03.624532044 +0100
 @@ -342,6 +342,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -1631,8 +4131,8 @@
  
  mostlyclean-libtool:
 diff -urNad xine-lib-vdr-1.1.2~/src/liba52/Makefile.in xine-lib-vdr-1.1.2/src/liba52/Makefile.in
---- xine-lib-vdr-1.1.2~/src/liba52/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/liba52/Makefile.in	2006-07-12 21:55:09.087001407 +0100
+--- xine-lib-vdr-1.1.2~/src/liba52/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/liba52/Makefile.in	2006-09-02 14:34:03.972536939 +0100
 @@ -375,6 +375,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -1665,8 +4165,8 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -urNad xine-lib-vdr-1.1.2~/src/libdts/Makefile.in xine-lib-vdr-1.1.2/src/libdts/Makefile.in
---- xine-lib-vdr-1.1.2~/src/libdts/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libdts/Makefile.in	2006-07-12 21:55:09.467006752 +0100
+--- xine-lib-vdr-1.1.2~/src/libdts/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libdts/Makefile.in	2006-09-02 14:34:04.344542171 +0100
 @@ -380,6 +380,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -1699,8 +4199,8 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -urNad xine-lib-vdr-1.1.2~/src/libfaad/Makefile.in xine-lib-vdr-1.1.2/src/libfaad/Makefile.in
---- xine-lib-vdr-1.1.2~/src/libfaad/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libfaad/Makefile.in	2006-07-12 21:55:10.135016148 +0100
+--- xine-lib-vdr-1.1.2~/src/libfaad/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libfaad/Makefile.in	2006-09-02 14:34:05.004551455 +0100
 @@ -413,6 +413,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -1733,8 +4233,8 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -urNad xine-lib-vdr-1.1.2~/src/libfaad/codebook/Makefile.in xine-lib-vdr-1.1.2/src/libfaad/codebook/Makefile.in
---- xine-lib-vdr-1.1.2~/src/libfaad/codebook/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libfaad/codebook/Makefile.in	2006-07-12 21:55:10.395019805 +0100
+--- xine-lib-vdr-1.1.2~/src/libfaad/codebook/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libfaad/codebook/Makefile.in	2006-09-02 14:34:05.272555225 +0100
 @@ -338,6 +338,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -1767,8 +4267,8 @@
  
  mostlyclean-libtool:
 diff -urNad xine-lib-vdr-1.1.2~/src/libffmpeg/Makefile.in xine-lib-vdr-1.1.2/src/libffmpeg/Makefile.in
---- xine-lib-vdr-1.1.2~/src/libffmpeg/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libffmpeg/Makefile.in	2006-07-12 21:55:10.771025094 +0100
+--- xine-lib-vdr-1.1.2~/src/libffmpeg/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libffmpeg/Makefile.in	2006-09-02 14:34:05.640560401 +0100
 @@ -395,6 +395,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -1801,8 +4301,8 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -urNad xine-lib-vdr-1.1.2~/src/libffmpeg/libavcodec/Makefile.in xine-lib-vdr-1.1.2/src/libffmpeg/libavcodec/Makefile.in
---- xine-lib-vdr-1.1.2~/src/libffmpeg/libavcodec/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libffmpeg/libavcodec/Makefile.in	2006-07-12 21:55:11.135030214 +0100
+--- xine-lib-vdr-1.1.2~/src/libffmpeg/libavcodec/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libffmpeg/libavcodec/Makefile.in	2006-09-02 14:34:06.004565521 +0100
 @@ -379,6 +379,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -1835,8 +4335,8 @@
  
  clean-noinstLTLIBRARIES:
 diff -urNad xine-lib-vdr-1.1.2~/src/libffmpeg/libavcodec/alpha/Makefile.in xine-lib-vdr-1.1.2/src/libffmpeg/libavcodec/alpha/Makefile.in
---- xine-lib-vdr-1.1.2~/src/libffmpeg/libavcodec/alpha/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libffmpeg/libavcodec/alpha/Makefile.in	2006-07-12 21:55:11.399033927 +0100
+--- xine-lib-vdr-1.1.2~/src/libffmpeg/libavcodec/alpha/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libffmpeg/libavcodec/alpha/Makefile.in	2006-09-02 14:34:06.268569234 +0100
 @@ -338,6 +338,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -1869,8 +4369,8 @@
  
  mostlyclean-libtool:
 diff -urNad xine-lib-vdr-1.1.2~/src/libffmpeg/libavcodec/armv4l/Makefile.in xine-lib-vdr-1.1.2/src/libffmpeg/libavcodec/armv4l/Makefile.in
---- xine-lib-vdr-1.1.2~/src/libffmpeg/libavcodec/armv4l/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libffmpeg/libavcodec/armv4l/Makefile.in	2006-07-12 21:55:11.715038372 +0100
+--- xine-lib-vdr-1.1.2~/src/libffmpeg/libavcodec/armv4l/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libffmpeg/libavcodec/armv4l/Makefile.in	2006-09-02 14:34:06.592573792 +0100
 @@ -358,6 +358,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -1903,8 +4403,8 @@
  
  clean-noinstLTLIBRARIES:
 diff -urNad xine-lib-vdr-1.1.2~/src/libffmpeg/libavcodec/i386/Makefile.in xine-lib-vdr-1.1.2/src/libffmpeg/libavcodec/i386/Makefile.in
---- xine-lib-vdr-1.1.2~/src/libffmpeg/libavcodec/i386/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libffmpeg/libavcodec/i386/Makefile.in	2006-07-12 21:55:12.087043605 +0100
+--- xine-lib-vdr-1.1.2~/src/libffmpeg/libavcodec/i386/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libffmpeg/libavcodec/i386/Makefile.in	2006-09-02 14:34:06.932578574 +0100
 @@ -370,6 +370,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -1947,8 +4447,8 @@
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
 diff -urNad xine-lib-vdr-1.1.2~/src/libffmpeg/libavcodec/libpostproc/Makefile.in xine-lib-vdr-1.1.2/src/libffmpeg/libavcodec/libpostproc/Makefile.in
---- xine-lib-vdr-1.1.2~/src/libffmpeg/libavcodec/libpostproc/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libffmpeg/libavcodec/libpostproc/Makefile.in	2006-07-12 21:55:12.583050582 +0100
+--- xine-lib-vdr-1.1.2~/src/libffmpeg/libavcodec/libpostproc/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libffmpeg/libavcodec/libpostproc/Makefile.in	2006-09-02 14:34:07.260583188 +0100
 @@ -358,6 +358,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -1981,8 +4481,8 @@
  
  clean-noinstLTLIBRARIES:
 diff -urNad xine-lib-vdr-1.1.2~/src/libffmpeg/libavcodec/mlib/Makefile.in xine-lib-vdr-1.1.2/src/libffmpeg/libavcodec/mlib/Makefile.in
---- xine-lib-vdr-1.1.2~/src/libffmpeg/libavcodec/mlib/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libffmpeg/libavcodec/mlib/Makefile.in	2006-07-12 21:55:12.935055533 +0100
+--- xine-lib-vdr-1.1.2~/src/libffmpeg/libavcodec/mlib/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libffmpeg/libavcodec/mlib/Makefile.in	2006-09-02 14:34:07.580587689 +0100
 @@ -361,6 +361,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -2015,8 +4515,8 @@
  
  clean-noinstLTLIBRARIES:
 diff -urNad xine-lib-vdr-1.1.2~/src/libffmpeg/libavcodec/ppc/Makefile.in xine-lib-vdr-1.1.2/src/libffmpeg/libavcodec/ppc/Makefile.in
---- xine-lib-vdr-1.1.2~/src/libffmpeg/libavcodec/ppc/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libffmpeg/libavcodec/ppc/Makefile.in	2006-07-12 21:55:13.547064141 +0100
+--- xine-lib-vdr-1.1.2~/src/libffmpeg/libavcodec/ppc/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libffmpeg/libavcodec/ppc/Makefile.in	2006-09-02 14:34:07.912592359 +0100
 @@ -361,6 +361,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -2049,8 +4549,8 @@
  
  clean-noinstLTLIBRARIES:
 diff -urNad xine-lib-vdr-1.1.2~/src/libffmpeg/libavcodec/sparc/Makefile.in xine-lib-vdr-1.1.2/src/libffmpeg/libavcodec/sparc/Makefile.in
---- xine-lib-vdr-1.1.2~/src/libffmpeg/libavcodec/sparc/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libffmpeg/libavcodec/sparc/Makefile.in	2006-07-12 21:55:13.879068811 +0100
+--- xine-lib-vdr-1.1.2~/src/libffmpeg/libavcodec/sparc/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libffmpeg/libavcodec/sparc/Makefile.in	2006-09-02 14:34:08.240596972 +0100
 @@ -361,6 +361,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -2083,8 +4583,8 @@
  
  clean-noinstLTLIBRARIES:
 diff -urNad xine-lib-vdr-1.1.2~/src/libffmpeg/libavutil/Makefile.in xine-lib-vdr-1.1.2/src/libffmpeg/libavutil/Makefile.in
---- xine-lib-vdr-1.1.2~/src/libffmpeg/libavutil/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libffmpeg/libavutil/Makefile.in	2006-07-12 21:55:14.207073425 +0100
+--- xine-lib-vdr-1.1.2~/src/libffmpeg/libavutil/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libffmpeg/libavutil/Makefile.in	2006-09-02 14:34:08.564601530 +0100
 @@ -358,6 +358,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -2117,8 +4617,8 @@
  
  clean-noinstLTLIBRARIES:
 diff -urNad xine-lib-vdr-1.1.2~/src/libflac/Makefile.in xine-lib-vdr-1.1.2/src/libflac/Makefile.in
---- xine-lib-vdr-1.1.2~/src/libflac/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libflac/Makefile.in	2006-07-12 21:55:14.543078151 +0100
+--- xine-lib-vdr-1.1.2~/src/libflac/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libflac/Makefile.in	2006-09-02 14:34:08.904606312 +0100
 @@ -370,6 +370,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -2151,8 +4651,8 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -urNad xine-lib-vdr-1.1.2~/src/liblpcm/Makefile.in xine-lib-vdr-1.1.2/src/liblpcm/Makefile.in
---- xine-lib-vdr-1.1.2~/src/liblpcm/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/liblpcm/Makefile.in	2006-07-12 21:55:14.867082708 +0100
+--- xine-lib-vdr-1.1.2~/src/liblpcm/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/liblpcm/Makefile.in	2006-09-02 14:34:09.232610926 +0100
 @@ -366,6 +366,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -2185,8 +4685,8 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -urNad xine-lib-vdr-1.1.2~/src/libmad/Makefile.in xine-lib-vdr-1.1.2/src/libmad/Makefile.in
---- xine-lib-vdr-1.1.2~/src/libmad/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libmad/Makefile.in	2006-07-12 21:55:15.303088841 +0100
+--- xine-lib-vdr-1.1.2~/src/libmad/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libmad/Makefile.in	2006-09-02 14:34:09.660616946 +0100
 @@ -387,6 +387,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -2219,8 +4719,8 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -urNad xine-lib-vdr-1.1.2~/src/libmpeg2/Makefile.in xine-lib-vdr-1.1.2/src/libmpeg2/Makefile.in
---- xine-lib-vdr-1.1.2~/src/libmpeg2/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libmpeg2/Makefile.in	2006-07-12 21:55:15.639093567 +0100
+--- xine-lib-vdr-1.1.2~/src/libmpeg2/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libmpeg2/Makefile.in	2006-09-02 14:34:10.000621728 +0100
 @@ -374,6 +374,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -2253,8 +4753,8 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -urNad xine-lib-vdr-1.1.2~/src/libmusepack/Makefile.in xine-lib-vdr-1.1.2/src/libmusepack/Makefile.in
---- xine-lib-vdr-1.1.2~/src/libmusepack/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libmusepack/Makefile.in	2006-07-12 21:55:15.987098462 +0100
+--- xine-lib-vdr-1.1.2~/src/libmusepack/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libmusepack/Makefile.in	2006-09-02 14:34:10.336626454 +0100
 @@ -374,6 +374,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -2287,8 +4787,8 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -urNad xine-lib-vdr-1.1.2~/src/libmusepack/musepack/Makefile.in xine-lib-vdr-1.1.2/src/libmusepack/musepack/Makefile.in
---- xine-lib-vdr-1.1.2~/src/libmusepack/musepack/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libmusepack/musepack/Makefile.in	2006-07-12 21:55:16.283102625 +0100
+--- xine-lib-vdr-1.1.2~/src/libmusepack/musepack/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libmusepack/musepack/Makefile.in	2006-09-02 14:34:10.616630393 +0100
 @@ -342,6 +342,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -2321,8 +4821,8 @@
  
  mostlyclean-libtool:
 diff -urNad xine-lib-vdr-1.1.2~/src/libreal/Makefile.in xine-lib-vdr-1.1.2/src/libreal/Makefile.in
---- xine-lib-vdr-1.1.2~/src/libreal/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libreal/Makefile.in	2006-07-12 21:55:16.611107239 +0100
+--- xine-lib-vdr-1.1.2~/src/libreal/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libreal/Makefile.in	2006-09-02 14:34:10.952635119 +0100
 @@ -375,6 +375,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -2355,8 +4855,8 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -urNad xine-lib-vdr-1.1.2~/src/libspeex/Makefile.in xine-lib-vdr-1.1.2/src/libspeex/Makefile.in
---- xine-lib-vdr-1.1.2~/src/libspeex/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libspeex/Makefile.in	2006-07-12 21:55:16.979112415 +0100
+--- xine-lib-vdr-1.1.2~/src/libspeex/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libspeex/Makefile.in	2006-09-02 14:34:11.284639789 +0100
 @@ -369,6 +369,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -2389,8 +4889,8 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -urNad xine-lib-vdr-1.1.2~/src/libspucc/Makefile.in xine-lib-vdr-1.1.2/src/libspucc/Makefile.in
---- xine-lib-vdr-1.1.2~/src/libspucc/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libspucc/Makefile.in	2006-07-12 21:55:17.331117366 +0100
+--- xine-lib-vdr-1.1.2~/src/libspucc/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libspucc/Makefile.in	2006-09-02 14:34:11.636644740 +0100
 @@ -370,6 +370,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -2423,8 +4923,8 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -urNad xine-lib-vdr-1.1.2~/src/libspucmml/Makefile.in xine-lib-vdr-1.1.2/src/libspucmml/Makefile.in
---- xine-lib-vdr-1.1.2~/src/libspucmml/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libspucmml/Makefile.in	2006-07-12 21:55:17.655121924 +0100
+--- xine-lib-vdr-1.1.2~/src/libspucmml/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libspucmml/Makefile.in	2006-09-02 14:34:11.964649354 +0100
 @@ -366,6 +366,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -2457,8 +4957,8 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -urNad xine-lib-vdr-1.1.2~/src/libspudec/Makefile.in xine-lib-vdr-1.1.2/src/libspudec/Makefile.in
---- xine-lib-vdr-1.1.2~/src/libspudec/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libspudec/Makefile.in	2006-07-12 21:55:18.003126819 +0100
+--- xine-lib-vdr-1.1.2~/src/libspudec/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libspudec/Makefile.in	2006-09-02 14:34:12.308654192 +0100
 @@ -377,6 +377,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -2491,8 +4991,8 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -urNad xine-lib-vdr-1.1.2~/src/libspudvb/Makefile.in xine-lib-vdr-1.1.2/src/libspudvb/Makefile.in
---- xine-lib-vdr-1.1.2~/src/libspudvb/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libspudvb/Makefile.in	2006-07-12 21:55:18.327131376 +0100
+--- xine-lib-vdr-1.1.2~/src/libspudvb/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libspudvb/Makefile.in	2006-09-02 14:34:12.636658806 +0100
 @@ -368,6 +368,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -2525,8 +5025,8 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -urNad xine-lib-vdr-1.1.2~/src/libsputext/Makefile.in xine-lib-vdr-1.1.2/src/libsputext/Makefile.in
---- xine-lib-vdr-1.1.2~/src/libsputext/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libsputext/Makefile.in	2006-07-12 21:55:18.659136046 +0100
+--- xine-lib-vdr-1.1.2~/src/libsputext/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libsputext/Makefile.in	2006-09-02 14:34:12.976663588 +0100
 @@ -372,6 +372,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -2559,8 +5059,8 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -urNad xine-lib-vdr-1.1.2~/src/libtheora/Makefile.in xine-lib-vdr-1.1.2/src/libtheora/Makefile.in
---- xine-lib-vdr-1.1.2~/src/libtheora/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libtheora/Makefile.in	2006-07-12 21:55:18.987140660 +0100
+--- xine-lib-vdr-1.1.2~/src/libtheora/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libtheora/Makefile.in	2006-09-02 14:34:13.304668202 +0100
 @@ -370,6 +370,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -2593,8 +5093,8 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -urNad xine-lib-vdr-1.1.2~/src/libvorbis/Makefile.in xine-lib-vdr-1.1.2/src/libvorbis/Makefile.in
---- xine-lib-vdr-1.1.2~/src/libvorbis/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libvorbis/Makefile.in	2006-07-12 21:55:19.319145330 +0100
+--- xine-lib-vdr-1.1.2~/src/libvorbis/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libvorbis/Makefile.in	2006-09-02 14:34:13.632672816 +0100
 @@ -370,6 +370,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -2627,8 +5127,8 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -urNad xine-lib-vdr-1.1.2~/src/libw32dll/DirectShow/Makefile.in xine-lib-vdr-1.1.2/src/libw32dll/DirectShow/Makefile.in
---- xine-lib-vdr-1.1.2~/src/libw32dll/DirectShow/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libw32dll/DirectShow/Makefile.in	2006-07-12 21:55:19.655150056 +0100
+--- xine-lib-vdr-1.1.2~/src/libw32dll/DirectShow/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libw32dll/DirectShow/Makefile.in	2006-09-02 14:34:13.968677542 +0100
 @@ -361,6 +361,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -2661,8 +5161,8 @@
  
  clean-noinstLTLIBRARIES:
 diff -urNad xine-lib-vdr-1.1.2~/src/libw32dll/Makefile.in xine-lib-vdr-1.1.2/src/libw32dll/Makefile.in
---- xine-lib-vdr-1.1.2~/src/libw32dll/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libw32dll/Makefile.in	2006-07-12 21:55:20.015155119 +0100
+--- xine-lib-vdr-1.1.2~/src/libw32dll/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libw32dll/Makefile.in	2006-09-02 14:34:14.328682606 +0100
 @@ -389,6 +389,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -2695,8 +5195,8 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -urNad xine-lib-vdr-1.1.2~/src/libw32dll/dmo/Makefile.in xine-lib-vdr-1.1.2/src/libw32dll/dmo/Makefile.in
---- xine-lib-vdr-1.1.2~/src/libw32dll/dmo/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libw32dll/dmo/Makefile.in	2006-07-12 21:55:20.347159789 +0100
+--- xine-lib-vdr-1.1.2~/src/libw32dll/dmo/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libw32dll/dmo/Makefile.in	2006-09-02 14:34:14.664687332 +0100
 @@ -360,6 +360,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -2729,8 +5229,8 @@
  
  clean-noinstLTLIBRARIES:
 diff -urNad xine-lib-vdr-1.1.2~/src/libw32dll/qtx/Makefile.in xine-lib-vdr-1.1.2/src/libw32dll/qtx/Makefile.in
---- xine-lib-vdr-1.1.2~/src/libw32dll/qtx/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libw32dll/qtx/Makefile.in	2006-07-12 21:55:20.615163559 +0100
+--- xine-lib-vdr-1.1.2~/src/libw32dll/qtx/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libw32dll/qtx/Makefile.in	2006-09-02 14:34:14.936691158 +0100
 @@ -347,6 +347,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -2763,8 +5263,8 @@
  
  mostlyclean-libtool:
 diff -urNad xine-lib-vdr-1.1.2~/src/libw32dll/qtx/qtxsdk/Makefile.in xine-lib-vdr-1.1.2/src/libw32dll/qtx/qtxsdk/Makefile.in
---- xine-lib-vdr-1.1.2~/src/libw32dll/qtx/qtxsdk/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libw32dll/qtx/qtxsdk/Makefile.in	2006-07-12 21:55:20.895167497 +0100
+--- xine-lib-vdr-1.1.2~/src/libw32dll/qtx/qtxsdk/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libw32dll/qtx/qtxsdk/Makefile.in	2006-09-02 14:34:15.216695096 +0100
 @@ -342,6 +342,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -2797,8 +5297,8 @@
  
  mostlyclean-libtool:
 diff -urNad xine-lib-vdr-1.1.2~/src/libw32dll/wine/Makefile.in xine-lib-vdr-1.1.2/src/libw32dll/wine/Makefile.in
---- xine-lib-vdr-1.1.2~/src/libw32dll/wine/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libw32dll/wine/Makefile.in	2006-07-12 21:55:21.263172674 +0100
+--- xine-lib-vdr-1.1.2~/src/libw32dll/wine/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libw32dll/wine/Makefile.in	2006-09-02 14:34:15.580700216 +0100
 @@ -367,6 +367,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -2831,8 +5331,8 @@
  
  clean-noinstLTLIBRARIES:
 diff -urNad xine-lib-vdr-1.1.2~/src/libxineadec/Makefile.in xine-lib-vdr-1.1.2/src/libxineadec/Makefile.in
---- xine-lib-vdr-1.1.2~/src/libxineadec/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libxineadec/Makefile.in	2006-07-12 21:55:21.667178356 +0100
+--- xine-lib-vdr-1.1.2~/src/libxineadec/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libxineadec/Makefile.in	2006-09-02 14:34:15.940705280 +0100
 @@ -380,6 +380,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -2865,8 +5365,8 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -urNad xine-lib-vdr-1.1.2~/src/libxineadec/gsm610/Makefile.in xine-lib-vdr-1.1.2/src/libxineadec/gsm610/Makefile.in
---- xine-lib-vdr-1.1.2~/src/libxineadec/gsm610/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libxineadec/gsm610/Makefile.in	2006-07-12 21:55:22.107184545 +0100
+--- xine-lib-vdr-1.1.2~/src/libxineadec/gsm610/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libxineadec/gsm610/Makefile.in	2006-09-02 14:34:16.272709950 +0100
 @@ -360,6 +360,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -2899,8 +5399,8 @@
  
  clean-noinstLTLIBRARIES:
 diff -urNad xine-lib-vdr-1.1.2~/src/libxineadec/nosefart/Makefile.in xine-lib-vdr-1.1.2/src/libxineadec/nosefart/Makefile.in
---- xine-lib-vdr-1.1.2~/src/libxineadec/nosefart/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libxineadec/nosefart/Makefile.in	2006-07-12 21:55:22.531190509 +0100
+--- xine-lib-vdr-1.1.2~/src/libxineadec/nosefart/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libxineadec/nosefart/Makefile.in	2006-09-02 14:34:16.604714620 +0100
 @@ -360,6 +360,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -2933,8 +5433,8 @@
  
  clean-noinstLTLIBRARIES:
 diff -urNad xine-lib-vdr-1.1.2~/src/libxinevdec/Makefile.in xine-lib-vdr-1.1.2/src/libxinevdec/Makefile.in
---- xine-lib-vdr-1.1.2~/src/libxinevdec/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/libxinevdec/Makefile.in	2006-07-12 21:55:22.927196079 +0100
+--- xine-lib-vdr-1.1.2~/src/libxinevdec/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/libxinevdec/Makefile.in	2006-09-02 14:34:17.004720246 +0100
 @@ -396,6 +396,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -2967,8 +5467,8 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -urNad xine-lib-vdr-1.1.2~/src/post/Makefile.in xine-lib-vdr-1.1.2/src/post/Makefile.in
---- xine-lib-vdr-1.1.2~/src/post/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/post/Makefile.in	2006-07-12 21:55:23.211200074 +0100
+--- xine-lib-vdr-1.1.2~/src/post/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/post/Makefile.in	2006-09-02 14:34:17.284724184 +0100
 @@ -347,6 +347,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -3001,8 +5501,8 @@
  
  mostlyclean-libtool:
 diff -urNad xine-lib-vdr-1.1.2~/src/post/audio/Makefile.in xine-lib-vdr-1.1.2/src/post/audio/Makefile.in
---- xine-lib-vdr-1.1.2~/src/post/audio/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/post/audio/Makefile.in	2006-07-12 21:55:23.551204856 +0100
+--- xine-lib-vdr-1.1.2~/src/post/audio/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/post/audio/Makefile.in	2006-09-02 14:34:17.620728911 +0100
 @@ -371,6 +371,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -3035,8 +5535,8 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -urNad xine-lib-vdr-1.1.2~/src/post/deinterlace/Makefile.in xine-lib-vdr-1.1.2/src/post/deinterlace/Makefile.in
---- xine-lib-vdr-1.1.2~/src/post/deinterlace/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/post/deinterlace/Makefile.in	2006-07-12 21:55:24.067212115 +0100
+--- xine-lib-vdr-1.1.2~/src/post/deinterlace/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/post/deinterlace/Makefile.in	2006-09-02 14:34:17.972733862 +0100
 @@ -377,6 +377,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -3069,8 +5569,8 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -urNad xine-lib-vdr-1.1.2~/src/post/deinterlace/plugins/Makefile.in xine-lib-vdr-1.1.2/src/post/deinterlace/plugins/Makefile.in
---- xine-lib-vdr-1.1.2~/src/post/deinterlace/plugins/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/post/deinterlace/plugins/Makefile.in	2006-07-12 21:55:24.619219879 +0100
+--- xine-lib-vdr-1.1.2~/src/post/deinterlace/plugins/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/post/deinterlace/plugins/Makefile.in	2006-09-02 14:34:18.308738588 +0100
 @@ -362,6 +362,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -3103,8 +5603,8 @@
  
  clean-noinstLTLIBRARIES:
 diff -urNad xine-lib-vdr-1.1.2~/src/post/goom/Makefile.in xine-lib-vdr-1.1.2/src/post/goom/Makefile.in
---- xine-lib-vdr-1.1.2~/src/post/goom/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/post/goom/Makefile.in	2006-07-12 21:55:24.979224943 +0100
+--- xine-lib-vdr-1.1.2~/src/post/goom/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/post/goom/Makefile.in	2006-09-02 14:34:18.660743539 +0100
 @@ -383,6 +383,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -3137,8 +5637,8 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -urNad xine-lib-vdr-1.1.2~/src/post/mosaico/Makefile.in xine-lib-vdr-1.1.2/src/post/mosaico/Makefile.in
---- xine-lib-vdr-1.1.2~/src/post/mosaico/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/post/mosaico/Makefile.in	2006-07-12 21:55:25.535232763 +0100
+--- xine-lib-vdr-1.1.2~/src/post/mosaico/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/post/mosaico/Makefile.in	2006-09-02 14:34:19.004748378 +0100
 @@ -375,6 +375,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -3171,8 +5671,8 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -urNad xine-lib-vdr-1.1.2~/src/post/planar/Makefile.in xine-lib-vdr-1.1.2/src/post/planar/Makefile.in
---- xine-lib-vdr-1.1.2~/src/post/planar/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/post/planar/Makefile.in	2006-07-12 21:55:25.875237546 +0100
+--- xine-lib-vdr-1.1.2~/src/post/planar/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/post/planar/Makefile.in	2006-09-02 14:34:19.344753160 +0100
 @@ -371,6 +371,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -3205,8 +5705,8 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -urNad xine-lib-vdr-1.1.2~/src/post/visualizations/Makefile.in xine-lib-vdr-1.1.2/src/post/visualizations/Makefile.in
---- xine-lib-vdr-1.1.2~/src/post/visualizations/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/post/visualizations/Makefile.in	2006-07-12 21:55:26.223242441 +0100
+--- xine-lib-vdr-1.1.2~/src/post/visualizations/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/post/visualizations/Makefile.in	2006-09-02 14:34:19.684757943 +0100
 @@ -371,6 +371,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -3240,7 +5740,7 @@
  	@$(NORMAL_INSTALL)
 diff -urNad xine-lib-vdr-1.1.2~/src/vdr/Makefile.in xine-lib-vdr-1.1.2/src/vdr/Makefile.in
 --- xine-lib-vdr-1.1.2~/src/vdr/Makefile.in	1970-01-01 01:00:00.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/vdr/Makefile.in	2006-07-12 21:55:26.595247673 +0100
++++ xine-lib-vdr-1.1.2/src/vdr/Makefile.in	2006-09-02 14:34:20.068763344 +0100
 @@ -0,0 +1,935 @@
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# @configure_input@
@@ -4178,8 +6678,8 @@
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
 diff -urNad xine-lib-vdr-1.1.2~/src/video_out/Makefile.in xine-lib-vdr-1.1.2/src/video_out/Makefile.in
---- xine-lib-vdr-1.1.2~/src/video_out/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/video_out/Makefile.in	2006-07-12 21:55:27.279257294 +0100
+--- xine-lib-vdr-1.1.2~/src/video_out/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/video_out/Makefile.in	2006-09-02 14:34:20.728772627 +0100
 @@ -564,6 +564,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -4212,8 +6712,8 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -urNad xine-lib-vdr-1.1.2~/src/video_out/libdha/Makefile.in xine-lib-vdr-1.1.2/src/video_out/libdha/Makefile.in
---- xine-lib-vdr-1.1.2~/src/video_out/libdha/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/video_out/libdha/Makefile.in	2006-07-12 21:55:27.655262583 +0100
+--- xine-lib-vdr-1.1.2~/src/video_out/libdha/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/video_out/libdha/Makefile.in	2006-09-02 14:34:21.096777804 +0100
 @@ -374,6 +374,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -4246,8 +6746,8 @@
  
  clean-noinstLTLIBRARIES:
 diff -urNad xine-lib-vdr-1.1.2~/src/video_out/libdha/bin/Makefile.in xine-lib-vdr-1.1.2/src/video_out/libdha/bin/Makefile.in
---- xine-lib-vdr-1.1.2~/src/video_out/libdha/bin/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/video_out/libdha/bin/Makefile.in	2006-07-12 21:55:27.915266240 +0100
+--- xine-lib-vdr-1.1.2~/src/video_out/libdha/bin/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/video_out/libdha/bin/Makefile.in	2006-09-02 14:34:21.360781517 +0100
 @@ -338,6 +338,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -4280,8 +6780,8 @@
  
  mostlyclean-libtool:
 diff -urNad xine-lib-vdr-1.1.2~/src/video_out/libdha/kernelhelper/Makefile.in xine-lib-vdr-1.1.2/src/video_out/libdha/kernelhelper/Makefile.in
---- xine-lib-vdr-1.1.2~/src/video_out/libdha/kernelhelper/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/video_out/libdha/kernelhelper/Makefile.in	2006-07-12 21:55:28.251270966 +0100
+--- xine-lib-vdr-1.1.2~/src/video_out/libdha/kernelhelper/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/video_out/libdha/kernelhelper/Makefile.in	2006-09-02 14:34:21.680786018 +0100
 @@ -357,6 +357,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -4314,8 +6814,8 @@
  test$(EXEEXT): $(test_OBJECTS) $(test_DEPENDENCIES) 
  	@rm -f test$(EXEEXT)
 diff -urNad xine-lib-vdr-1.1.2~/src/video_out/libdha/oth/Makefile.in xine-lib-vdr-1.1.2/src/video_out/libdha/oth/Makefile.in
---- xine-lib-vdr-1.1.2~/src/video_out/libdha/oth/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/video_out/libdha/oth/Makefile.in	2006-07-12 21:55:28.511274623 +0100
+--- xine-lib-vdr-1.1.2~/src/video_out/libdha/oth/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/video_out/libdha/oth/Makefile.in	2006-09-02 14:34:21.948789788 +0100
 @@ -338,6 +338,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -4348,8 +6848,8 @@
  
  mostlyclean-libtool:
 diff -urNad xine-lib-vdr-1.1.2~/src/video_out/libdha/sysdep/Makefile.in xine-lib-vdr-1.1.2/src/video_out/libdha/sysdep/Makefile.in
---- xine-lib-vdr-1.1.2~/src/video_out/libdha/sysdep/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/video_out/libdha/sysdep/Makefile.in	2006-07-12 21:55:28.851279406 +0100
+--- xine-lib-vdr-1.1.2~/src/video_out/libdha/sysdep/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/video_out/libdha/sysdep/Makefile.in	2006-09-02 14:34:22.224793670 +0100
 @@ -342,6 +342,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -4382,8 +6882,8 @@
  
  mostlyclean-libtool:
 diff -urNad xine-lib-vdr-1.1.2~/src/video_out/macosx/Makefile.in xine-lib-vdr-1.1.2/src/video_out/macosx/Makefile.in
---- xine-lib-vdr-1.1.2~/src/video_out/macosx/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/video_out/macosx/Makefile.in	2006-07-12 21:55:29.207284413 +0100
+--- xine-lib-vdr-1.1.2~/src/video_out/macosx/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/video_out/macosx/Makefile.in	2006-09-02 14:34:22.572798565 +0100
 @@ -374,6 +374,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -4416,8 +6916,8 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -urNad xine-lib-vdr-1.1.2~/src/video_out/vidix/Makefile.in xine-lib-vdr-1.1.2/src/video_out/vidix/Makefile.in
---- xine-lib-vdr-1.1.2~/src/video_out/vidix/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/video_out/vidix/Makefile.in	2006-07-12 21:55:29.551289252 +0100
+--- xine-lib-vdr-1.1.2~/src/video_out/vidix/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/video_out/vidix/Makefile.in	2006-09-02 14:34:22.920803460 +0100
 @@ -367,6 +367,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -4450,8 +6950,8 @@
  
  clean-noinstLTLIBRARIES:
 diff -urNad xine-lib-vdr-1.1.2~/src/video_out/vidix/drivers/Makefile.in xine-lib-vdr-1.1.2/src/video_out/vidix/drivers/Makefile.in
---- xine-lib-vdr-1.1.2~/src/video_out/vidix/drivers/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/video_out/vidix/drivers/Makefile.in	2006-07-12 21:55:30.011295722 +0100
+--- xine-lib-vdr-1.1.2~/src/video_out/vidix/drivers/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/video_out/vidix/drivers/Makefile.in	2006-09-02 14:34:23.384809987 +0100
 @@ -421,6 +421,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -4484,8 +6984,8 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -urNad xine-lib-vdr-1.1.2~/src/xine-engine/Makefile.in xine-lib-vdr-1.1.2/src/xine-engine/Makefile.in
---- xine-lib-vdr-1.1.2~/src/xine-engine/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/xine-engine/Makefile.in	2006-07-12 21:55:30.547303262 +0100
+--- xine-lib-vdr-1.1.2~/src/xine-engine/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/xine-engine/Makefile.in	2006-09-02 14:34:23.764815332 +0100
 @@ -377,6 +377,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -4518,8 +7018,8 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -urNad xine-lib-vdr-1.1.2~/src/xine-utils/Makefile.in xine-lib-vdr-1.1.2/src/xine-utils/Makefile.in
---- xine-lib-vdr-1.1.2~/src/xine-utils/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/src/xine-utils/Makefile.in	2006-07-12 21:55:30.931308663 +0100
+--- xine-lib-vdr-1.1.2~/src/xine-utils/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/src/xine-utils/Makefile.in	2006-09-02 14:34:24.152820789 +0100
 @@ -377,6 +377,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -4552,8 +7052,8 @@
  
  clean-noinstLTLIBRARIES:
 diff -urNad xine-lib-vdr-1.1.2~/win32/Makefile.in xine-lib-vdr-1.1.2/win32/Makefile.in
---- xine-lib-vdr-1.1.2~/win32/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/win32/Makefile.in	2006-07-12 21:55:31.215312658 +0100
+--- xine-lib-vdr-1.1.2~/win32/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/win32/Makefile.in	2006-09-02 14:34:24.432824728 +0100
 @@ -347,6 +347,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@
@@ -4586,8 +7086,8 @@
  
  mostlyclean-libtool:
 diff -urNad xine-lib-vdr-1.1.2~/win32/include/Makefile.in xine-lib-vdr-1.1.2/win32/include/Makefile.in
---- xine-lib-vdr-1.1.2~/win32/include/Makefile.in	2006-07-12 21:54:20.000000000 +0100
-+++ xine-lib-vdr-1.1.2/win32/include/Makefile.in	2006-07-12 21:55:31.475316315 +0100
+--- xine-lib-vdr-1.1.2~/win32/include/Makefile.in	2006-09-02 14:32:50.000000000 +0100
++++ xine-lib-vdr-1.1.2/win32/include/Makefile.in	2006-09-02 14:34:24.692828385 +0100
 @@ -338,6 +338,9 @@
  LTLIBOBJS = @LTLIBOBJS@
  MAD_FALSE = @MAD_FALSE@

Added: general/xine-lib-vdr/trunk/debian/reportbug.presubj
===================================================================
--- general/xine-lib-vdr/trunk/debian/reportbug.presubj	                        (rev 0)
+++ general/xine-lib-vdr/trunk/debian/reportbug.presubj	2006-09-23 16:59:04 UTC (rev 3374)
@@ -0,0 +1,46 @@
+Reporting Bugs on libxine - general remarks
+===========================================
+
+As you can see on http://bugs.debian.org/src:xine-lib, the list of
+bugs against xine is rather long. Please help the maintainer by
+ensuring that your bugreport contains all pieces of infromation to
+reproduce and check if the bug has been fixed.
+
+Reporting bugs for unsupported file formats
+===========================================
+
+If you report a bug that a specific file cannot be played, please make
+sure that you include a link to the file so the maintainers can try
+them. If you cannot (easily) point to that file, please check
+http://samples.mplayerhq.hu/ if you find a similar file with the same
+problem. In any case, please start xine with the parameter
+--bug-report. (If you are using gxine, please install the package
+xine-ui instead. If you can only reproduce the bug with gxine but not
+with xine-ui, then file the bug against gxine)
+
+Report bugs for xine crashes
+============================
+
+If you report a bug that applications linked against libxine1
+(xine-ui, gxine, amarok, totem, etc) segfault, please install the
+packages 'xine-ui' and 'libxine1-dbg', and try to reproduce it with
+this command:
+
+> ulimit -c unlimited ; /usr/bin/xine --bug-report <mrl>
+
+If you can reproduce the bug, then run gdb to get a backtrace:
+
+> gdb /usr/bin/xine core.*
+
+At the gdb prompt, please issue these commands:
+
+# backtrace
+# thread apply all backtrace full
+# quit
+
+Make sure to attach both files BUG-REPORT.TXT and the resulting
+backtrace from gdb. Both are necessary to understand where and how the
+segfault occured.
+
+Thanks for your collaboration.
+

Modified: general/xine-lib-vdr/trunk/debian/rules
===================================================================
--- general/xine-lib-vdr/trunk/debian/rules	2006-09-23 16:52:47 UTC (rev 3373)
+++ general/xine-lib-vdr/trunk/debian/rules	2006-09-23 16:59:04 UTC (rev 3374)
@@ -23,9 +23,12 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+DEB_BUILD_CONFIG_OPTIONS :=
+
 CFLAGS += -g
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
+	DEB_BUILD_CONFIG_OPTIONS += --disable-optimizations
 endif
 INSTALL_TARGET := install
 BUILD_TARGET := all
@@ -33,9 +36,9 @@
 	INSTALL_TARGET := install-debug
 	BUILD_TARGET := debug
 endif
+
 # note also "noauto" to inhibit running of autogen.sh
 
-DEB_BUILD_GNU_OPTION := 
 # the "optimize" flag disables compatibility hacks
 ifeq (,$(findstring optimize,$(DEB_BUILD_OPTIONS)))
  $(warning trying to disable machine-specific optimizations)
@@ -55,11 +58,18 @@
   $(warning          ignoring DEB_HOST_GNU_TYPE = $(DEB_HOST_GNU_TYPE))
   DEB_HOST_GNU_TYPE := $(DEB_BUILD_GNU_TYPE)
  endif
- DEB_BUILD_GNU_OPTION := --build=$(DEB_BUILD_GNU_TYPE)
+ DEB_BUILD_CONFIG_OPTIONS += --build=$(DEB_BUILD_GNU_TYPE)
 endif
 
+# --mandir - remove after etch released (autoconf >= 2.59c gets it right)
 CONFIGURE_FLAGS := --prefix=/usr \
+	--mandir=\$${prefix}/share/man \
 	--with-external-libmad \
+	$(dpkg --compare-versions `dpkg -s libavcodec-dev | sed -e '/^Version:/! d; s/^.* //'` ge 0.cvs20060329 && echo --with-external-ffmpeg) \
+	--with-external-a52dec \
+	--with-external-libdts \
+	--disable-cacatest \
+	$(DEB_BUILD_CONFIG_OPTIONS) \
 	$(DEB_BUILD_GNU_OPTION) \
 	CFLAGS="$(CFLAGS)"
 
@@ -104,10 +114,11 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	#
-	#ugly hack, documentation should never have been in /u/s/d/xine/...
+	mkdir -p debian/tmp/usr/share/bug/libxine${major}/
+	cp debian/reportbug.presubj debian/tmp/usr/share/bug/libxine${major}/presubj
+# 	ugly hack, documentation should never have been in /u/s/d/xine/...
 	mv debian/tmp/usr/share/doc/xine debian/tmp/usr/share/doc/libxine${major}
-	# build libxine${major} package by moving files from libxine-dev
+#	build libxine${major} package by moving files from libxine-dev
 	dh_install --autodest --sourcedir=debian/tmp --list-missing
 	dh_installdocs
 	dh_installchangelogs -k ChangeLog

Modified: general/xine-lib-vdr/trunk/debian/shlibdeps.sh
===================================================================
--- general/xine-lib-vdr/trunk/debian/shlibdeps.sh	2006-09-23 16:52:47 UTC (rev 3373)
+++ general/xine-lib-vdr/trunk/debian/shlibdeps.sh	2006-09-23 16:59:04 UTC (rev 3374)
@@ -14,7 +14,6 @@
 	  $installdir/usr/lib/xine/plugins/$ver/xineplug_ao_out_arts.so
 	  $installdir/usr/lib/xine/plugins/$ver/xineplug_ao_out_esd.so
 	  $installdir/usr/lib/xine/plugins/$ver/xineplug_vo_out_aa.so
-	  $installdir/usr/lib/xine/plugins/$ver/xineplug_vo_out_syncfb.so
 	  $installdir/usr/lib/xine/plugins/$ver/xineplug_vo_out_sdl.so
 	  $installdir/usr/lib/xine/plugins/$ver/xineplug_flac.so
 	  $installdir/usr/lib/xine/plugins/$ver/xineplug_inp_gnome_vfs.so




More information about the pkg-vdr-dvb-changes mailing list