From: Sam Hocevar <sam@videolan.org>
Date: Mon, 10 Dec 2001 12:40:24 +0000 (+0000)
Subject:   * Removed more unused code.
X-Git-Tag: 0.3.0~333
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=45281e620dc142e81fe10d186f0ddc63a0cd5d13;p=vlc

  * Removed more unused code.
  * Updated config.guess and config.sub from GNU's latest versions (bozo,
    you may want to update them in vls as well).
  * Added vlc.pot skeleton for translators.
---

diff --git a/AUTHORS b/AUTHORS
index fbf85f4a5a..234dd9cf89 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -100,7 +100,7 @@ E: arnaud@carrosse.frmug.org
 D: autoconf patches
 
 N: Thomas Graf
-E: reeler@reeler.org
+E: tgraf@europe.com
 D: gettext support, german translation
 
 N: Jean-Philippe Grimaldi
diff --git a/Makefile b/Makefile
index 66e6785b62..b71c45d8e5 100644
--- a/Makefile
+++ b/Makefile
@@ -232,7 +232,7 @@ vlc-clean:
 	rm -Rf vlc.app
 
 distclean: clean
-	-cd po && $(MAKE) distclean
+	-cd po && $(MAKE) maintainer-clean
 	rm -f **/*.o **/*~ *.log
 	rm -f Makefile.opts
 	rm -f include/defs.h include/config.h include/modules_builtin.h
diff --git a/TODO b/TODO
index 8901ac88f2..67200bf6a0 100644
--- a/TODO
+++ b/TODO
@@ -664,7 +664,7 @@ Urgency: Wishlist
 Description: Rename channel names
  Channels should start from 1 (not 0) like on a VCR or TV,
  and Channel 0 should be renamed to "Playlist" or similar.
-Status: Todo
+Status: Done
 
 Task: 0x0d
 Difficulty: Medium
@@ -762,7 +762,7 @@ Description: Get rid of vlc.channels
  The file vlc.channels should be removed and information
  found in it put either into ~/.vlcrc or in another rc
  file. Note that this file can be modified by the vlc.
-Status: Todo
+Status: Done 9 Dec 2001 (sam)
 
 Task: 0x03
 Difficulty: Hard
diff --git a/config.guess b/config.guess
index 32a779ba9d..bcdc0742b7 100644
--- a/config.guess
+++ b/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
 
-timestamp='2001-01-17'
+timestamp='2001-11-26'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -24,8 +24,9 @@ timestamp='2001-01-17'
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-# Written by Per Bothner <bothner@cygnus.com>.
-# Please send patches to <config-patches@gnu.org>.
+# Originally written by Per Bothner <bothner@cygnus.com>.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
@@ -33,10 +34,6 @@ timestamp='2001-01-17'
 #
 # The plan is that this can be called by configure scripts if you
 # don't specify an explicit build system type.
-#
-# Only a few systems have been added to this list; please add others
-# (but try to keep the structure clean).
-#
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -56,7 +53,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -99,25 +96,25 @@ trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
 # use `HOST_CC' if defined, but it is deprecated.
 
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int dummy(){}" > $dummy.c
+set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int dummy(){}" > $dummy.c ;
 	for c in cc gcc c89 ; do
-	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1
+	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
 	  if test $? = 0 ; then
-	     CC_FOR_BUILD="$c"; break
-	  fi
-	done
-	rm -f $dummy.c $dummy.o $dummy.rel
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	rm -f $dummy.c $dummy.o $dummy.rel ;
 	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found
+	  CC_FOR_BUILD=no_compiler_found ;
 	fi
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac
+esac'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 8/24/94.)
+# (ghazi@noc.rutgers.edu 1994-08-24)
 if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
 	PATH=$PATH:/.attbin ; export PATH
 fi
@@ -131,7 +128,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
-	# Netbsd (nbsd) targets should (where applicable) match one or
+	# NetBSD (nbsd) targets should (where applicable) match one or
 	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
@@ -148,12 +145,14 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    macppc) machine=powerpc-apple ;;
 	    hp3[0-9][05]) machine=m68k-hp ;;
 	    ibmrt|romp-ibm) machine=romp-ibm ;;
+	    sparc*) machine=`uname -p`-unknown ;;
 	    *) machine=${UNAME_MACHINE}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
 	# to ELF recently, or will in the future.
 	case "${UNAME_MACHINE}" in
 	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
+		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep __ELF__ >/dev/null
 		then
@@ -175,6 +174,45 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit 0 ;;
+    amiga:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hp300:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    macppc:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvmeppc:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    pmax:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sgi:OpenBSD:*:*)
+	echo mipseb-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    *:OpenBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     alpha:OSF1:*:*)
 	if test $UNAME_RELEASE = "V4.0"; then
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
@@ -208,6 +246,7 @@ main:
 	jsr \$26,exit
 	.end main
 EOF
+	eval $set_cc_for_build
 	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
 	if test "$?" = 0 ; then
 		case `./$dummy` in
@@ -229,6 +268,9 @@ EOF
 			2-307)
 				UNAME_MACHINE="alphaev67"
 				;;
+			2-1307)
+				UNAME_MACHINE="alphaev68"
+				;;
 		esac
 	fi
 	rm -f $dummy.s $dummy
@@ -246,30 +288,9 @@ EOF
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
 	exit 0;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     *:[Aa]miga[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-amigaos
 	exit 0 ;;
-    arc64:OpenBSD:*:*)
-	echo mips64el-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    arc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hkmips:OpenBSD:*:*)
-	echo mips-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    pmax:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mips-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
 	exit 0 ;;
@@ -332,9 +353,6 @@ EOF
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
 	exit 0 ;;
-    atari*:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
     # "atarist" or "atariste" at least should have a processor
@@ -361,18 +379,6 @@ EOF
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
         exit 0 ;;
-    sun3*:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
 	exit 0 ;;
@@ -389,6 +395,7 @@ EOF
 	echo clipper-intergraph-clix${UNAME_RELEASE}
 	exit 0 ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
@@ -412,10 +419,13 @@ EOF
 EOF
 	$CC_FOR_BUILD $dummy.c -o $dummy \
 	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm $dummy.c $dummy && exit 0
+	  && rm -f $dummy.c $dummy && exit 0
 	rm -f $dummy.c $dummy
 	echo mips-mips-riscos${UNAME_RELEASE}
 	exit 0 ;;
+    Motorola:PowerMAX_OS:*:*)
+	echo powerpc-motorola-powermax
+	exit 0 ;;
     Night_Hawk:Power_UNIX:*:*)
 	echo powerpc-harris-powerunix
 	exit 0 ;;
@@ -463,11 +473,20 @@ EOF
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
 	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
 	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i?86:AIX:*:*)
+    i*86:AIX:*:*)
 	echo i386-ibm-aix
 	exit 0 ;;
+    ia64:AIX:*:*)
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+	exit 0 ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		eval $set_cc_for_build
 		sed 's/^		//' << EOF >$dummy.c
 		#include <sys/systemcfg.h>
 
@@ -479,7 +498,7 @@ EOF
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
 		rm -f $dummy.c $dummy
 		echo rs6000-ibm-aix3.2.5
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
@@ -488,9 +507,9 @@ EOF
 		echo rs6000-ibm-aix3.2
 	fi
 	exit 0 ;;
-    *:AIX:*:4)
+    *:AIX:*:[45])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
 	else
 		IBM_ARCH=powerpc
@@ -498,23 +517,10 @@ EOF
 	if [ -x /usr/bin/oslevel ] ; then
 		IBM_REV=`/usr/bin/oslevel`
 	else
-		IBM_REV=4.${UNAME_RELEASE}
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
 	exit 0 ;;
-    *:AIX:*:5)
-	case "`lsattr -El proc0 -a type -F value`" in
-	    PowerPC*) IBM_ARCH=powerpc
-		      IBM_MANUF=ibm ;;
-	    Itanium)  IBM_ARCH=ia64
-		      IBM_MANUF=unknown ;;
-	    POWER*)   IBM_ARCH=power
-		      IBM_MANUF=ibm ;;
-	    *)        IBM_ARCH=powerpc
-		      IBM_MANUF=ibm ;;
-	esac
-	echo ${IBM_ARCH}-${IBM_MANUF}-aix${UNAME_VERSION}.${UNAME_RELEASE}
-	exit 0 ;;
     *:AIX:*:*)
 	echo rs6000-ibm-aix
 	exit 0 ;;
@@ -542,10 +548,8 @@ EOF
 	    9000/31? )            HP_ARCH=m68000 ;;
 	    9000/[34]?? )         HP_ARCH=m68k ;;
 	    9000/[678][0-9][0-9])
-              case "${HPUX_REV}" in
-                11.[0-9][0-9])
-                  if [ -x /usr/bin/getconf ]; then
-                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+		if [ -x /usr/bin/getconf ]; then
+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
                     sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
                     case "${sc_cpu_version}" in
                       523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
@@ -554,12 +558,13 @@ EOF
                         case "${sc_kernel_bits}" in
                           32) HP_ARCH="hppa2.0n" ;;
                           64) HP_ARCH="hppa2.0w" ;;
+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
                         esac ;;
                     esac
-                  fi ;;
-              esac
-              if [ "${HP_ARCH}" = "" ]; then
-              sed 's/^              //' << EOF >$dummy.c
+		fi
+		if [ "${HP_ARCH}" = "" ]; then
+		    eval $set_cc_for_build
+		    sed 's/^              //' << EOF >$dummy.c
 
               #define _HPUX_SOURCE
               #include <stdlib.h>
@@ -592,10 +597,10 @@ EOF
                   exit (0);
               }
 EOF
-	(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
-	if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-	rm -f $dummy.c $dummy
-	fi ;;
+		    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy`
+		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
+		    rm -f $dummy.c $dummy
+		fi ;;
 	esac
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
 	exit 0 ;;
@@ -604,6 +609,7 @@ EOF
 	echo ia64-hp-hpux${HPUX_REV}
 	exit 0 ;;
     3050*:HI-UX:*:*)
+	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#include <unistd.h>
 	int
@@ -629,7 +635,7 @@ EOF
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
 	rm -f $dummy.c $dummy
 	echo unknown-hitachi-hiuxwe2
 	exit 0 ;;
@@ -639,7 +645,7 @@ EOF
     9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
 	exit 0 ;;
-    *9??*:MPE/iX:*:*)
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
 	echo hppa1.0-hp-mpeix
 	exit 0 ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
@@ -648,7 +654,7 @@ EOF
     hp8??:OSF1:*:*)
 	echo hppa1.0-hp-osf
 	exit 0 ;;
-    i?86:OSF1:*:*)
+    i*86:OSF1:*:*)
 	if [ -x /usr/sbin/sysversion ] ; then
 	    echo ${UNAME_MACHINE}-unknown-osf1mk
 	else
@@ -658,9 +664,6 @@ EOF
     parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
 	exit 0 ;;
-    hppa*:OpenBSD:*:*)
-	echo hppa-unknown-openbsd
-	exit 0 ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
         exit 0 ;;
@@ -683,12 +686,13 @@ EOF
 	echo xmp-cray-unicos
         exit 0 ;;
     CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE}
+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     CRAY*[A-Z]90:*:*:*)
 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
@@ -711,10 +715,7 @@ EOF
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
     sparc*:BSD/OS:*:*)
@@ -726,9 +727,6 @@ EOF
     *:FreeBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit 0 ;;
-    *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	exit 0 ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit 0 ;;
@@ -759,209 +757,93 @@ EOF
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit 0 ;;
-    *:Linux:*:*)
-
+    arm*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    ia64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux
+	exit 0 ;;
+    m68*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    mips:Linux:*:*)
+	case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
+	  big)    echo mips-unknown-linux-gnu && exit 0 ;;
+	  little) echo mipsel-unknown-linux-gnu && exit 0 ;;
+	esac
+	;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
+	exit 0 ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit 0 ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit 0 ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+	# Look for CPU level
+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	  *)    echo hppa-unknown-linux-gnu ;;
+	esac
+	exit 0 ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit 0 ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+	echo ${UNAME_MACHINE}-ibm-linux
+	exit 0 ;;
+    sh*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    x86_64:Linux:*:*)
+	echo x86_64-unknown-linux-gnu
+	exit 0 ;;
+    i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
 	# problems with other programs or directories called `ld' in the path.
-	ld_supported_emulations=`cd /; ld --help 2>&1 \
-			 | sed -ne '/supported emulations:/!d
+	ld_supported_targets=`cd /; ld --help 2>&1 \
+			 | sed -ne '/supported targets:/!d
 				    s/[ 	][ 	]*/ /g
-				    s/.*supported emulations: *//
+				    s/.*supported targets: *//
 				    s/ .*//
 				    p'`
-        case "$ld_supported_emulations" in
-	  *ia64)
-		echo "${UNAME_MACHINE}-unknown-linux"
-		exit 0
-		;;
-	  i?86linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0
-		;;
-	  elf_i?86)
+        case "$ld_supported_targets" in
+	  elf32-i386)
 		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
 		;;
-	  i?86coff)
+	  a.out-i386-linux)
+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+		exit 0 ;;		
+	  coff-i386)
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0
-		;;
-	  sparclinux)
-		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
-		exit 0
-		;;
-	  elf32_sparc)
-		echo "${UNAME_MACHINE}-unknown-linux-gnu"
-		exit 0
-		;;
-	  armlinux)
-		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
-		exit 0
-		;;
-	  elf32arm*)
-		echo "${UNAME_MACHINE}-unknown-linux-gnuoldld"
-		exit 0
-		;;
-	  armelf_linux*)
-		echo "${UNAME_MACHINE}-unknown-linux-gnu"
-		exit 0
-		;;
-	  m68klinux)
-		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
-		exit 0
-		;;
-	  elf32ppc | elf32ppclinux)
-		# Determine Lib Version
-		cat >$dummy.c <<EOF
-#include <features.h>
-#if defined(__GLIBC__)
-extern char __libc_version[];
-extern char __libc_release[];
-#endif
-main(argc, argv)
-     int argc;
-     char *argv[];
-{
-#if defined(__GLIBC__)
-  printf("%s %s\n", __libc_version, __libc_release);
-#else
-  printf("unkown\n");
-#endif
-  return 0;
-}
-EOF
-		LIBC=""
-		$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
-		if test "$?" = 0 ; then
-			./$dummy | grep 1\.99 > /dev/null
-			if test "$?" = 0 ; then
-				LIBC="libc1"
-			fi
-		fi
-		rm -f $dummy.c $dummy
-		echo powerpc-unknown-linux-gnu${LIBC}
-		exit 0
-		;;
-	  shelf_linux)
-		echo "${UNAME_MACHINE}-unknown-linux-gnu"
-		exit 0
-		;;
+		exit 0 ;;
+	  "")
+		# Either a pre-BFD a.out linker (linux-gnuoldld) or
+		# one that does not give us useful --help.
+		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+		exit 0 ;;
 	esac
-
-	if test "${UNAME_MACHINE}" = "alpha" ; then
-		cat <<EOF >$dummy.s
-			.data
-		\$Lformat:
-			.byte 37,100,45,37,120,10,0	# "%d-%x\n"
-
-			.text
-			.globl main
-			.align 4
-			.ent main
-		main:
-			.frame \$30,16,\$26,0
-			ldgp \$29,0(\$27)
-			.prologue 1
-			.long 0x47e03d80 # implver \$0
-			lda \$2,-1
-			.long 0x47e20c21 # amask \$2,\$1
-			lda \$16,\$Lformat
-			mov \$0,\$17
-			not \$1,\$18
-			jsr \$26,printf
-			ldgp \$29,0(\$26)
-			mov 0,\$16
-			jsr \$26,exit
-			.end main
-EOF
-		LIBC=""
-		$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
-		if test "$?" = 0 ; then
-			case `./$dummy` in
-			0-0)
-				UNAME_MACHINE="alpha"
-				;;
-			1-0)
-				UNAME_MACHINE="alphaev5"
-				;;
-			1-1)
-				UNAME_MACHINE="alphaev56"
-				;;
-			1-101)
-				UNAME_MACHINE="alphapca56"
-				;;
-			2-303)
-				UNAME_MACHINE="alphaev6"
-				;;
-			2-307)
-				UNAME_MACHINE="alphaev67"
-				;;
-			esac
-
-			objdump --private-headers $dummy | \
-			  grep ld.so.1 > /dev/null
-			if test "$?" = 0 ; then
-				LIBC="libc1"
-			fi
-		fi
-		rm -f $dummy.s $dummy
-		echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
-	elif test "${UNAME_MACHINE}" = "mips" ; then
-	  cat >$dummy.c <<EOF
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-#ifdef __MIPSEB__
-  printf ("%s-unknown-linux-gnu\n", argv[1]);
-#endif
-#ifdef __MIPSEL__
-  printf ("%sel-unknown-linux-gnu\n", argv[1]);
-#endif
-  return 0;
-}
-EOF
-	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
-	  rm -f $dummy.c $dummy
-	elif test "${UNAME_MACHINE}" = "s390"; then
-	  echo s390-ibm-linux && exit 0
-	elif test "${UNAME_MACHINE}" = "x86_64"; then
-	  echo x86_64-unknown-linux-gnu && exit 0
-	elif test "${UNAME_MACHINE}" = "parisc" -o "${UNAME_MACHINE}" = "hppa"; then
-	  # Look for CPU level
-	  case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	    PA7*)
-		echo hppa1.1-unknown-linux-gnu
-		;;
-	    PA8*)
-		echo hppa2.0-unknown-linux-gnu
-		;;
-	    *)
-		echo hppa-unknown-linux-gnu
-		;;
-	  esac
-	  exit 0
-	else
-	  # Either a pre-BFD a.out linker (linux-gnuoldld)
-	  # or one that does not give us useful --help.
-	  # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
-	  # If ld does not provide *any* "supported emulations:"
-	  # that means it is gnuoldld.
-	  test -z "$ld_supported_emulations" \
-	    && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
-
-	  case "${UNAME_MACHINE}" in
-	  i?86)
-	    VENDOR=pc;
-	    ;;
-	  *)
-	    VENDOR=unknown;
-	    ;;
-	  esac
-	  # Determine whether the default compiler is a.out or elf
-	  cat >$dummy.c <<EOF
+	# Determine whether the default compiler is a.out or elf
+	eval $set_cc_for_build
+	cat >$dummy.c <<EOF
 #include <features.h>
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
@@ -972,29 +854,30 @@ EOF
 #ifdef __ELF__
 # ifdef __GLIBC__
 #  if __GLIBC__ >= 2
-    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
+    printf ("%s-pc-linux-gnu\n", argv[1]);
 #  else
-    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+    printf ("%s-pc-linux-gnulibc1\n", argv[1]);
 #  endif
 # else
-   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+   printf ("%s-pc-linux-gnulibc1\n", argv[1]);
 # endif
 #else
-  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
+  printf ("%s-pc-linux-gnuaout\n", argv[1]);
 #endif
   return 0;
 }
 EOF
-	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
-	  rm -f $dummy.c $dummy
-	  test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-	fi ;;
-# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
-# are messed up and put the nodename in both sysname and nodename.
-    i?86:DYNIX/ptx:4*:*)
+	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
+	rm -f $dummy.c $dummy
+	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+	;;
+    i*86:DYNIX/ptx:4*:*)
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+	# earlier versions are messed up and put the nodename in both
+	# sysname and nodename.
 	echo i386-sequent-sysv4
 	exit 0 ;;
-    i?86:UNIX_SV:4.2MP:2.*)
+    i*86:UNIX_SV:4.2MP:2.*)
         # Unixware is an offshoot of SVR4, but it has its own version
         # number series starting with 2...
         # I am not positive that other SVR4 systems won't match this,
@@ -1002,7 +885,7 @@ EOF
         # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit 0 ;;
-    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
 		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
@@ -1010,16 +893,15 @@ EOF
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 	fi
 	exit 0 ;;
-    i?86:*:5:7*)
-        # Fixed at (any) Pentium or better
-        UNAME_MACHINE=i586
-        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
-	    echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
-	else
-	    echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
-	fi
+    i*86:*:5:[78]*)
+	case `/bin/uname -X | grep "^Machine"` in
+	    *486*)	     UNAME_MACHINE=i486 ;;
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+	esac
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
 	exit 0 ;;
-    i?86:*:3.2:*)
+    i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
 		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
@@ -1037,7 +919,7 @@ EOF
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
 	exit 0 ;;
-    i?86:*DOS:*:*)
+    i*86:*DOS:*:*)
 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
 	exit 0 ;;
     pc:*:*:*)
@@ -1065,7 +947,7 @@ EOF
 	exit 0 ;;
     M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1076,13 +958,13 @@ EOF
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
           && echo i486-ncr-sysv4 && exit 0 ;;
-    m68*:LynxOS:2.*:*)
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
 	exit 0 ;;
-    i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
     TSUNAMI:LynxOS:2.*:*)
@@ -1091,7 +973,7 @@ EOF
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:*)
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
     SM[BE]S:UNIX_SV:*:*)
@@ -1111,8 +993,8 @@ EOF
 		echo ns32k-sni-sysv
 	fi
 	exit 0 ;;
-    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                           # says <Richard.M.Bartel@ccMail.Census.GOV>
+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                      # says <Richard.M.Bartel@ccMail.Census.GOV>
         echo i586-unisys-sysv4
         exit 0 ;;
     *:UNIX_System_V:4*:FTX*)
@@ -1124,6 +1006,10 @@ EOF
 	# From seanf@swdc.stratus.com.
 	echo i860-stratus-sysv4
 	exit 0 ;;
+    *:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo hppa1.1-stratus-vos
+	exit 0 ;;
     mc68*:A/UX:*:*)
 	echo m68k-apple-aux${UNAME_RELEASE}
 	exit 0 ;;
@@ -1170,7 +1056,7 @@ EOF
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit 0 ;;
-    NSR-[KW]:NONSTOP_KERNEL:*:*)
+    NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit 0 ;;
     *:NonStop-UX:*:*)
@@ -1193,7 +1079,7 @@ EOF
 	fi
 	echo ${UNAME_MACHINE}-unknown-plan9
 	exit 0 ;;
-    i?86:OS/2:*:*)
+    i*86:OS/2:*:*)
 	# If we were able to find `uname', then EMX Unix compatibility
 	# is probably installed.
 	echo ${UNAME_MACHINE}-pc-os2-emx
@@ -1216,11 +1102,18 @@ EOF
     *:ITS:*:*)
 	echo pdp10-unknown-its
 	exit 0 ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit 0 ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
 
+eval $set_cc_for_build
 cat >$dummy.c <<EOF
 #ifdef _SEQUENT_
 # include <sys/types.h>
@@ -1307,11 +1200,24 @@ main ()
 #endif
 
 #if defined (vax)
-#if !defined (ultrix)
-  printf ("vax-dec-bsd\n"); exit (0);
-#else
-  printf ("vax-dec-ultrix\n"); exit (0);
-#endif
+# if !defined (ultrix)
+#  include <sys/param.h>
+#  if defined (BSD)
+#   if BSD == 43
+      printf ("vax-dec-bsd4.3\n"); exit (0);
+#   else
+#    if BSD == 199006
+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#    else
+      printf ("vax-dec-bsd\n"); exit (0);
+#    endif
+#   endif
+#  else
+    printf ("vax-dec-bsd\n"); exit (0);
+#  endif
+# else
+    printf ("vax-dec-ultrix\n"); exit (0);
+# endif
 #endif
 
 #if defined (alliant) && defined (i860)
@@ -1322,7 +1228,7 @@ main ()
 }
 EOF
 
-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
+$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
 rm -f $dummy.c $dummy
 
 # Apollos put the system type in the environment.
diff --git a/config.sub b/config.sub
index c736fbcb31..2476310dff 100644
--- a/config.sub
+++ b/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
 
-timestamp='2001-01-12'
+timestamp='2001-12-03'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -29,7 +29,8 @@ timestamp='2001-01-12'
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-# Please send patches to <config-patches@gnu.org>.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -117,7 +118,7 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*)
+  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -157,6 +158,14 @@ case $os in
 		os=-vxworks
 		basic_machine=$1
 		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+ 	-chorusrdb)
+ 		os=-chorusrdb
+		basic_machine=$1
+ 		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -215,24 +224,35 @@ esac
 case $basic_machine in
 	# Recognize the basic CPU types without company name.
 	# Some are omitted here because they have special meanings below.
-	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
-	        | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
-		| pyramid | mn10200 | mn10300 | tron | a29k \
-		| 580 | i960 | h8300 \
-		| x86 | ppcbe | mipsbe | mipsle | shbe | shle \
-		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
-		| hppa64 \
-		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
-		| alphaev6[78] \
-		| we32k | ns16k | clipper | i370 | sh | sh[34] \
-		| powerpc | powerpcle \
-		| 1750a | dsp16xx | pdp10 | pdp11 \
-		| mips16 | mips64 | mipsel | mips64el \
-		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
-		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
-		| mips64vr5000 | miprs64vr5000el | mcore \
-		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
-		| thumb | d10v | d30v | fr30 | avr | openrisc)
+	1750a | 580 \
+	| a29k \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| c4x | clipper \
+	| d10v | d30v | dsp16xx \
+	| fr30 \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| i370 | i860 | i960 | ia64 \
+	| m32r | m68000 | m68k | m88k | mcore \
+	| mips16 | mips64 | mips64el | mips64orion | mips64orionel \
+	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
+	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
+	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
+	| mipsisa32 \
+	| mn10200 | mn10300 \
+	| ns16k | ns32k \
+	| openrisc \
+	| pdp10 | pdp11 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| pyramid \
+	| sh | sh[34] | sh[34]eb | shbe | shle \
+	| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
+	| strongarm \
+	| tahoe | thumb | tic80 | tron \
+	| v850 | v850e \
+	| we32k \
+	| x86 | xscale | xstormy16 | xtensa \
+	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
@@ -240,13 +260,13 @@ case $basic_machine in
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
 
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
-	i[234567]86 | x86_64)
+	i*86 | x86_64)
 	  basic_machine=$basic_machine-pc
 	  ;;
 	# Object if more than one company name word.
@@ -255,29 +275,44 @@ case $basic_machine in
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
-	# FIXME: clean up the formatting here.
-	vax-* | tahoe-* | i[234567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
-	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
-	      | arm-*  | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
-	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
-	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
-	      | xmp-* | ymp-* \
-	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
-	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
-	      | hppa2.0n-* | hppa64-* \
-	      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
-	      | alphaev6[78]-* \
-	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
-	      | clipper-* | orion-* \
-	      | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
-	      | mips64el-* | mips64orion-* | mips64orionel-* \
-	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
-	      | mipstx39-* | mipstx39el-* | mcore-* \
-	      | f30[01]-* | f700-* | s390-* | sv1-* | t3e-* \
-	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
-	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \
-	      | bs2000-* | tic54x-* | c54x-* | x86_64-*)
+	580-* \
+	| a29k-* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+	| alphapca5[67]-* | arc-* \
+	| arm-*  | armbe-* | armle-* | armv*-* \
+	| avr-* \
+	| bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c54x-* \
+	| clipper-* | cray2-* | cydra-* \
+	| d10v-* | d30v-* \
+	| elxsi-* \
+	| f30[01]-* | f700-* | fr30-* | fx80-* \
+	| h8300-* | h8500-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
+	| m32r-* \
+	| m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | mcore-* \
+	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
+	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
+	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| pyramid-* \
+	| romp-* | rs6000-* \
+	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
+	| sparc-* | sparc64-* | sparc86x-* | sparclite-* \
+	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* \
+	| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
+	| v850-* | v850e-* | vax-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* | xstormy16-* \
+	| xtensa-* \
+	| ymp-* \
+	| z8k-*)
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -368,8 +403,8 @@ case $basic_machine in
 		basic_machine=cray2-cray
 		os=-unicos
 		;;
-	[ctj]90-cray)
-		basic_machine=c90-cray
+	[cjt]90)
+		basic_machine=${basic_machine}-cray
 		os=-unicos
 		;;
 	crds | unos)
@@ -425,6 +460,10 @@ case $basic_machine in
 		basic_machine=tron-gmicro
 		os=-sysv
 		;;
+	go32)
+		basic_machine=i386-pc
+		os=-go32
+		;;
 	h3050r* | hiux*)
 		basic_machine=hppa1.1-hitachi
 		os=-hiuxwe2
@@ -500,19 +539,19 @@ case $basic_machine in
 		basic_machine=i370-ibm
 		;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i[34567]86v32)
+	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
 		;;
-	i[34567]86v4*)
+	i*86v4*)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv4
 		;;
-	i[34567]86v)
+	i*86v)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv
 		;;
-	i[34567]86sol2)
+	i*86sol2)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-solaris2
 		;;
@@ -524,18 +563,6 @@ case $basic_machine in
 		basic_machine=i386-unknown
 		os=-vsta
 		;;
-	i386-go32 | go32)
-		basic_machine=i386-unknown
-		os=-go32
-		;;
-	i386-mingw32 | mingw32)
-		basic_machine=i386-unknown
-		os=-mingw32
-		;;
-	i[34567]86-pw32 | pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
 	iris | iris4d)
 		basic_machine=mips-sgi
 		case $os in
@@ -561,6 +588,10 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
+	mingw32)
+		basic_machine=i386-pc
+		os=-mingw32
+		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@@ -591,7 +622,7 @@ case $basic_machine in
 		os=-coff
 		;;
 	msdos)
-		basic_machine=i386-unknown
+		basic_machine=i386-pc
 		os=-msdos
 		;;
 	mvs)
@@ -694,7 +725,7 @@ case $basic_machine in
         pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5 | k5 | k6 | nexgen)
+	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
 	pentiumpro | p6 | 6x86 | athlon)
@@ -703,7 +734,7 @@ case $basic_machine in
 	pentiumii | pentium2)
 		basic_machine=i686-pc
 		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
@@ -727,9 +758,23 @@ case $basic_machine in
 	ppcle-* | powerpclittle-*)
 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
+	ppc64)	basic_machine=powerpc64-unknown
+	        ;;
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+		basic_machine=powerpc64le-unknown
+	        ;;
+	ppc64le-* | powerpc64little-*)
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	ps2)
 		basic_machine=i386-ibm
 		;;
+	pw32)
+		basic_machine=i586-unknown
+		os=-pw32
+		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -740,6 +785,12 @@ case $basic_machine in
 	rtpc | rtpc-*)
 		basic_machine=romp-ibm
 		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
 	sa29200)
 		basic_machine=a29k-amd
 		os=-udi
@@ -751,7 +802,7 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
-	sparclite-wrs)
+	sparclite-wrs | simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
 		;;
@@ -877,6 +928,10 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
+	windows32)
+		basic_machine=i386-pc
+		os=-windows32-msvcrt
+		;;
 	xmp)
 		basic_machine=xmp-cray
 		os=-unicos
@@ -930,10 +985,10 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4)
+	sh3 | sh4 | sh3eb | sh4eb)
 		basic_machine=sh-unknown
 		;;
-	sparc | sparcv9)
+	sparc | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
         cydra)
@@ -955,6 +1010,9 @@ case $basic_machine in
 		basic_machine=c4x-none
 		os=-coff
 		;;
+	*-unknown)
+		# Make sure to match an already-canonicalized machine name.
+		;;
 	*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
 		exit 1
@@ -1011,16 +1069,18 @@ case $os in
 	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*)
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
 		case $basic_machine in
-		    x86-* | i[34567]86-*)
+		    x86-* | i*86-*)
 			;;
 		    *)
 			os=-nto$os
@@ -1067,6 +1127,9 @@ case $os in
 	-acis*)
 		os=-aos
 		;;
+	-atheos*)
+		os=-atheos
+		;;
 	-386bsd)
 		os=-bsd
 		;;
@@ -1339,6 +1402,9 @@ case $basic_machine in
 			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 				vendor=atari
 				;;
+			-vos*)
+				vendor=stratus
+				;;
 		esac
 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 		;;
diff --git a/configure b/configure
index 5f52395953..dd02731f0f 100755
--- a/configure
+++ b/configure
@@ -1151,8 +1151,10 @@ fi
 fi
 
 
+ALL_LINGUAS="de fr"
 PACKAGE="vlc"
 VERSION="$VLC_VERSION"
+
 cat >> confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"
 EOF
@@ -1164,7 +1166,7 @@ EOF
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1168: checking for $ac_word" >&5
+echo "configure:1170: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1193,7 +1195,7 @@ fi
 
 
         echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6
-echo "configure:1197: checking for strerror in -lcposix" >&5
+echo "configure:1199: checking for strerror in -lcposix" >&5
 ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1201,7 +1203,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1205 "configure"
+#line 1207 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1212,7 +1214,7 @@ int main() {
 strerror()
 ; return 0; }
 EOF
-if { (eval echo configure:1216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1235,12 +1237,12 @@ fi
   
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1239: checking for ANSI C header files" >&5
+echo "configure:1241: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1244 "configure"
+#line 1246 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1248,7 +1250,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1252: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1254: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1265,7 +1267,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1269 "configure"
+#line 1271 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1283,7 +1285,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1287 "configure"
+#line 1289 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1304,7 +1306,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1308 "configure"
+#line 1310 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1315,7 +1317,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:1319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1339,12 +1341,12 @@ EOF
 fi
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1343: checking for working const" >&5
+echo "configure:1345: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1348 "configure"
+#line 1350 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -1393,7 +1395,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:1397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -1414,21 +1416,21 @@ EOF
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:1418: checking for inline" >&5
+echo "configure:1420: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 1425 "configure"
+#line 1427 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:1432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1434: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -1454,12 +1456,12 @@ EOF
 esac
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:1458: checking for off_t" >&5
+echo "configure:1460: checking for off_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1463 "configure"
+#line 1465 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -1487,12 +1489,12 @@ EOF
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:1491: checking for size_t" >&5
+echo "configure:1493: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1496 "configure"
+#line 1498 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -1522,19 +1524,19 @@ fi
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:1526: checking for working alloca.h" >&5
+echo "configure:1528: checking for working alloca.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1531 "configure"
+#line 1533 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:1538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -1555,12 +1557,12 @@ EOF
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:1559: checking for alloca" >&5
+echo "configure:1561: checking for alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1564 "configure"
+#line 1566 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -1588,7 +1590,7 @@ int main() {
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:1592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -1620,12 +1622,12 @@ EOF
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:1624: checking whether alloca needs Cray hooks" >&5
+echo "configure:1626: checking whether alloca needs Cray hooks" >&5
 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1629 "configure"
+#line 1631 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -1650,12 +1652,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1654: checking for $ac_func" >&5
+echo "configure:1656: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1659 "configure"
+#line 1661 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1678,7 +1680,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -1705,7 +1707,7 @@ done
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:1709: checking stack direction for C alloca" >&5
+echo "configure:1711: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1713,7 +1715,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 1717 "configure"
+#line 1719 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -1732,7 +1734,7 @@ main ()
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:1736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
 else
@@ -1757,17 +1759,17 @@ for ac_hdr in unistd.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1761: checking for $ac_hdr" >&5
+echo "configure:1763: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1766 "configure"
+#line 1768 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1771: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1773: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1796,12 +1798,12 @@ done
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1800: checking for $ac_func" >&5
+echo "configure:1802: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1805 "configure"
+#line 1807 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1824,7 +1826,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -1849,7 +1851,7 @@ fi
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:1853: checking for working mmap" >&5
+echo "configure:1855: checking for working mmap" >&5
 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1857,7 +1859,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 1861 "configure"
+#line 1863 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -1997,7 +1999,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:2001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -2021,12 +2023,12 @@ fi
 
 
     echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6
-echo "configure:2025: checking whether we are using the GNU C Library 2.1 or newer" >&5
+echo "configure:2027: checking whether we are using the GNU C Library 2.1 or newer" >&5
 if eval "test \"`echo '$''{'ac_cv_gnu_library_2_1'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2030 "configure"
+#line 2032 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -2062,17 +2064,17 @@ stdlib.h string.h unistd.h sys/param.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2066: checking for $ac_hdr" >&5
+echo "configure:2068: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2071 "configure"
+#line 2073 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2076: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2078: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2103,12 +2105,12 @@ getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \
 strdup strtoul tsearch __argz_count __argz_stringify __argz_next
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2107: checking for $ac_func" >&5
+echo "configure:2109: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2112 "configure"
+#line 2114 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2131,7 +2133,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2171,7 +2173,7 @@ fi
 
 
   echo $ac_n "checking for iconv""... $ac_c" 1>&6
-echo "configure:2175: checking for iconv" >&5
+echo "configure:2177: checking for iconv" >&5
 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2179,7 +2181,7 @@ else
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
     cat > conftest.$ac_ext <<EOF
-#line 2183 "configure"
+#line 2185 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <iconv.h>
@@ -2189,7 +2191,7 @@ iconv_t cd = iconv_open("","");
        iconv_close(cd);
 ; return 0; }
 EOF
-if { (eval echo configure:2193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_func_iconv=yes
 else
@@ -2201,7 +2203,7 @@ rm -f conftest*
       am_save_LIBS="$LIBS"
       LIBS="$LIBS -liconv"
       cat > conftest.$ac_ext <<EOF
-#line 2205 "configure"
+#line 2207 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <iconv.h>
@@ -2211,7 +2213,7 @@ iconv_t cd = iconv_open("","");
          iconv_close(cd);
 ; return 0; }
 EOF
-if { (eval echo configure:2215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes
@@ -2232,13 +2234,13 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6
 EOF
 
     echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6
-echo "configure:2236: checking for iconv declaration" >&5
+echo "configure:2238: checking for iconv declaration" >&5
     if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
       cat > conftest.$ac_ext <<EOF
-#line 2242 "configure"
+#line 2244 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -2257,7 +2259,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2261: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2263: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   am_cv_proto_iconv_arg1=""
 else
@@ -2286,19 +2288,19 @@ EOF
 
    
   echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6
-echo "configure:2290: checking for nl_langinfo and CODESET" >&5
+echo "configure:2292: checking for nl_langinfo and CODESET" >&5
 if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2295 "configure"
+#line 2297 "configure"
 #include "confdefs.h"
 #include <langinfo.h>
 int main() {
 char* cs = nl_langinfo(CODESET);
 ; return 0; }
 EOF
-if { (eval echo configure:2302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_langinfo_codeset=yes
 else
@@ -2321,19 +2323,19 @@ EOF
 
    if test $ac_cv_header_locale_h = yes; then
     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:2325: checking for LC_MESSAGES" >&5
+echo "configure:2327: checking for LC_MESSAGES" >&5
 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2330 "configure"
+#line 2332 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 return LC_MESSAGES
 ; return 0; }
 EOF
-if { (eval echo configure:2337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_val_LC_MESSAGES=yes
 else
@@ -2354,7 +2356,7 @@ EOF
     fi
   fi
    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:2358: checking whether NLS is requested" >&5
+echo "configure:2360: checking whether NLS is requested" >&5
         # Check whether --enable-nls or --disable-nls was given.
 if test "${enable_nls+set}" = set; then
   enableval="$enable_nls"
@@ -2376,7 +2378,7 @@ fi
 EOF
 
       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:2380: checking whether included gettext is requested" >&5
+echo "configure:2382: checking whether included gettext is requested" >&5
       # Check whether --with-included-gettext or --without-included-gettext was given.
 if test "${with_included_gettext+set}" = set; then
   withval="$with_included_gettext"
@@ -2396,17 +2398,17 @@ fi
 
 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:2400: checking for libintl.h" >&5
+echo "configure:2402: checking for libintl.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2405 "configure"
+#line 2407 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2410: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2412: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2423,12 +2425,12 @@ fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6
-echo "configure:2427: checking for GNU gettext in libc" >&5
+echo "configure:2429: checking for GNU gettext in libc" >&5
 if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2432 "configure"
+#line 2434 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 extern int _nl_msg_cat_cntr;
@@ -2437,7 +2439,7 @@ bindtextdomain ("", "");
 return (int) gettext ("") + _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:2441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gt_cv_func_gnugettext1_libc=yes
 else
@@ -2453,14 +2455,14 @@ echo "$ac_t""$gt_cv_func_gnugettext1_libc" 1>&6
 
 	   if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
 	     echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6
-echo "configure:2457: checking for GNU gettext in libintl" >&5
+echo "configure:2459: checking for GNU gettext in libintl" >&5
 if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   gt_save_LIBS="$LIBS"
 		LIBS="$LIBS -lintl $LIBICONV"
 		cat > conftest.$ac_ext <<EOF
-#line 2464 "configure"
+#line 2466 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 extern int _nl_msg_cat_cntr;
@@ -2469,7 +2471,7 @@ bindtextdomain ("", "");
 return (int) gettext ("") + _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:2473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gt_cv_func_gnugettext1_libintl=yes
 else
@@ -2502,12 +2504,12 @@ EOF
 	     for ac_func in dcgettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2506: checking for $ac_func" >&5
+echo "configure:2508: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2511 "configure"
+#line 2513 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2530,7 +2532,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2559,7 +2561,7 @@ done
 	     	     # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2563: checking for $ac_word" >&5
+echo "configure:2565: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2593,7 +2595,7 @@ fi
 	     # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2597: checking for $ac_word" >&5
+echo "configure:2599: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2630,7 +2632,7 @@ fi
 	     	     # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2634: checking for $ac_word" >&5
+echo "configure:2636: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2680,7 +2682,7 @@ fi
         # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2684: checking for $ac_word" >&5
+echo "configure:2686: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2714,7 +2716,7 @@ fi
         # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2718: checking for $ac_word" >&5
+echo "configure:2720: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2750,7 +2752,7 @@ fi
         # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2754: checking for $ac_word" >&5
+echo "configure:2756: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2821,7 +2823,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2825: checking for $ac_word" >&5
+echo "configure:2827: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2854,7 +2856,7 @@ done
       ac_verc_fail=yes
     else
             echo $ac_n "checking version of bison""... $ac_c" 1>&6
-echo "configure:2858: checking version of bison" >&5
+echo "configure:2860: checking version of bison" >&5
       ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
       case $ac_prog_version in
         '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
@@ -2901,7 +2903,7 @@ echo "configure:2858: checking version of bison" >&5
        LINGUAS=
      else
        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:2905: checking for catalogs to be installed" >&5
+echo "configure:2907: checking for catalogs to be installed" >&5
        NEW_LINGUAS=
        for presentlang in $ALL_LINGUAS; do
          useit=no
@@ -2940,7 +2942,6 @@ echo "configure:2905: checking for catalogs to be installed" >&5
       INTL_LIBTOOL_SUFFIX_PREFIX=
    
   
-ALL_LINGUAS="de"
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -2954,7 +2955,7 @@ ALL_LINGUAS="de"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:2958: checking for a BSD compatible install" >&5
+echo "configure:2959: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3009,14 +3010,14 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 if test x${cross_compiling} != xyes; then
   echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:3013: checking whether byte ordering is bigendian" >&5
+echo "configure:3014: checking whether byte ordering is bigendian" >&5
 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_bigendian=unknown
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat > conftest.$ac_ext <<EOF
-#line 3020 "configure"
+#line 3021 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -3027,11 +3028,11 @@ int main() {
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:3031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3032: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat > conftest.$ac_ext <<EOF
-#line 3035 "configure"
+#line 3036 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -3042,7 +3043,7 @@ int main() {
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:3046: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3047: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
 else
@@ -3062,7 +3063,7 @@ if test "$cross_compiling" = yes; then
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 3066 "configure"
+#line 3067 "configure"
 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
@@ -3075,7 +3076,7 @@ main () {
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:3079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_bigendian=no
 else
@@ -3115,7 +3116,7 @@ fi
     *)
                   ac_cv_c_bigendian=unknown
       echo $ac_n "checking what the byte order looks to be""... $ac_c" 1>&6
-echo "configure:3119: checking what the byte order looks to be" >&5
+echo "configure:3120: checking what the byte order looks to be" >&5
         cat >conftest.c <<EOF
         short am[] = { 0x4249, 0x4765, 0x6e44, 0x6961, 0x6e53, 0x7953, 0 };
         short ai[] = { 0x694c, 0x5454, 0x656c, 0x6e45, 0x6944, 0x6e61, 0 };
@@ -3160,12 +3161,12 @@ fi
 for ac_func in gettimeofday select strerror strtod strtol
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3164: checking for $ac_func" >&5
+echo "configure:3165: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3169 "configure"
+#line 3170 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3188,7 +3189,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3215,12 +3216,12 @@ done
 for ac_func in setenv putenv
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3219: checking for $ac_func" >&5
+echo "configure:3220: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3224 "configure"
+#line 3225 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3243,7 +3244,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3268,12 +3269,12 @@ fi
 done
 
 echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:3272: checking for connect" >&5
+echo "configure:3273: checking for connect" >&5
 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3277 "configure"
+#line 3278 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -3296,7 +3297,7 @@ connect();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -3315,7 +3316,7 @@ else
   echo "$ac_t""no" 1>&6
 
   echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:3319: checking for connect in -lsocket" >&5
+echo "configure:3320: checking for connect in -lsocket" >&5
 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3323,7 +3324,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3327 "configure"
+#line 3328 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3334,7 +3335,7 @@ int main() {
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:3338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3358,12 +3359,12 @@ fi
 fi
 
 echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:3362: checking for gethostbyname" >&5
+echo "configure:3363: checking for gethostbyname" >&5
 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3367 "configure"
+#line 3368 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -3386,7 +3387,7 @@ gethostbyname();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -3405,7 +3406,7 @@ else
   echo "$ac_t""no" 1>&6
 
   echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:3409: checking for gethostbyname in -lnsl" >&5
+echo "configure:3410: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3413,7 +3414,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3417 "configure"
+#line 3418 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3424,7 +3425,7 @@ int main() {
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:3428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3448,12 +3449,12 @@ fi
 fi
 
 echo $ac_n "checking for nanosleep""... $ac_c" 1>&6
-echo "configure:3452: checking for nanosleep" >&5
+echo "configure:3453: checking for nanosleep" >&5
 if eval "test \"`echo '$''{'ac_cv_func_nanosleep'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3457 "configure"
+#line 3458 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char nanosleep(); below.  */
@@ -3476,7 +3477,7 @@ nanosleep();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_nanosleep=yes"
 else
@@ -3495,7 +3496,7 @@ else
   echo "$ac_t""no" 1>&6
 
   echo $ac_n "checking for nanosleep in -lrt""... $ac_c" 1>&6
-echo "configure:3499: checking for nanosleep in -lrt" >&5
+echo "configure:3500: checking for nanosleep in -lrt" >&5
 ac_lib_var=`echo rt'_'nanosleep | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3503,7 +3504,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lrt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3507 "configure"
+#line 3508 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3514,7 +3515,7 @@ int main() {
 nanosleep()
 ; return 0; }
 EOF
-if { (eval echo configure:3518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3534,7 +3535,7 @@ else
   echo "$ac_t""no" 1>&6
 
     echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6
-echo "configure:3538: checking for nanosleep in -lposix4" >&5
+echo "configure:3539: checking for nanosleep in -lposix4" >&5
 ac_lib_var=`echo posix4'_'nanosleep | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3542,7 +3543,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lposix4  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3546 "configure"
+#line 3547 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3553,7 +3554,7 @@ int main() {
 nanosleep()
 ; return 0; }
 EOF
-if { (eval echo configure:3557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3582,12 +3583,12 @@ fi
 for ac_func in usleep
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3586: checking for $ac_func" >&5
+echo "configure:3587: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3591 "configure"
+#line 3592 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3610,7 +3611,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3635,12 +3636,12 @@ fi
 done
 
 echo $ac_n "checking for inet_aton""... $ac_c" 1>&6
-echo "configure:3639: checking for inet_aton" >&5
+echo "configure:3640: checking for inet_aton" >&5
 if eval "test \"`echo '$''{'ac_cv_func_inet_aton'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3644 "configure"
+#line 3645 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char inet_aton(); below.  */
@@ -3663,7 +3664,7 @@ inet_aton();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_inet_aton=yes"
 else
@@ -3682,7 +3683,7 @@ else
   echo "$ac_t""no" 1>&6
 
   echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6
-echo "configure:3686: checking for inet_aton in -lresolv" >&5
+echo "configure:3687: checking for inet_aton in -lresolv" >&5
 ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3690,7 +3691,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3694 "configure"
+#line 3695 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3701,7 +3702,7 @@ int main() {
 inet_aton()
 ; return 0; }
 EOF
-if { (eval echo configure:3705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3727,12 +3728,12 @@ fi
 for ac_func in vasprintf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3731: checking for $ac_func" >&5
+echo "configure:3732: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3736 "configure"
+#line 3737 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3755,7 +3756,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3782,12 +3783,12 @@ done
 for ac_func in swab
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3786: checking for $ac_func" >&5
+echo "configure:3787: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3791 "configure"
+#line 3792 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3810,7 +3811,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3837,12 +3838,12 @@ done
 for ac_func in memalign valloc
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3841: checking for $ac_func" >&5
+echo "configure:3842: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3846 "configure"
+#line 3847 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3865,7 +3866,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3893,12 +3894,12 @@ done
 for ac_func in sigrelse
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3897: checking for $ac_func" >&5
+echo "configure:3898: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3902 "configure"
+#line 3903 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3921,7 +3922,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3948,12 +3949,12 @@ done
 
 NEED_GETOPT=0
 echo $ac_n "checking for getopt_long""... $ac_c" 1>&6
-echo "configure:3952: checking for getopt_long" >&5
+echo "configure:3953: checking for getopt_long" >&5
 if eval "test \"`echo '$''{'ac_cv_func_getopt_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3957 "configure"
+#line 3958 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getopt_long(); below.  */
@@ -3976,7 +3977,7 @@ getopt_long();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_getopt_long=yes"
 else
@@ -3998,7 +3999,7 @@ else
   echo "$ac_t""no" 1>&6
  # FreeBSD has a gnugetopt library for this:
   echo $ac_n "checking for getopt_long in -lgnugetopt""... $ac_c" 1>&6
-echo "configure:4002: checking for getopt_long in -lgnugetopt" >&5
+echo "configure:4003: checking for getopt_long in -lgnugetopt" >&5
 ac_lib_var=`echo gnugetopt'_'getopt_long | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4006,7 +4007,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lgnugetopt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4010 "configure"
+#line 4011 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4017,7 +4018,7 @@ int main() {
 getopt_long()
 ; return 0; }
 EOF
-if { (eval echo configure:4021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4048,17 +4049,17 @@ for ac_hdr in unistd.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4052: checking for $ac_hdr" >&5
+echo "configure:4053: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4057 "configure"
+#line 4058 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4062: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4063: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4087,12 +4088,12 @@ done
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4091: checking for $ac_func" >&5
+echo "configure:4092: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4096 "configure"
+#line 4097 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4115,7 +4116,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4140,7 +4141,7 @@ fi
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:4144: checking for working mmap" >&5
+echo "configure:4145: checking for working mmap" >&5
 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4148,7 +4149,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 4152 "configure"
+#line 4153 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -4288,7 +4289,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:4292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -4311,12 +4312,12 @@ EOF
 fi
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:4315: checking return type of signal handlers" >&5
+echo "configure:4316: checking return type of signal handlers" >&5
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4320 "configure"
+#line 4321 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -4333,7 +4334,7 @@ int main() {
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:4337: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4338: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -4352,7 +4353,7 @@ EOF
 
 
 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:4356: checking for dlopen in -ldl" >&5
+echo "configure:4357: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4360,7 +4361,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4364 "configure"
+#line 4365 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4371,7 +4372,7 @@ int main() {
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:4375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4392,7 +4393,7 @@ else
 fi
 
 echo $ac_n "checking for cos in -lm""... $ac_c" 1>&6
-echo "configure:4396: checking for cos in -lm" >&5
+echo "configure:4397: checking for cos in -lm" >&5
 ac_lib_var=`echo m'_'cos | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4400,7 +4401,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4404 "configure"
+#line 4405 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4411,7 +4412,7 @@ int main() {
 cos()
 ; return 0; }
 EOF
-if { (eval echo configure:4415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4432,7 +4433,7 @@ else
 fi
 
 echo $ac_n "checking for pow in -lm""... $ac_c" 1>&6
-echo "configure:4436: checking for pow in -lm" >&5
+echo "configure:4437: checking for pow in -lm" >&5
 ac_lib_var=`echo m'_'pow | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4440,7 +4441,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4444 "configure"
+#line 4445 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4451,7 +4452,7 @@ int main() {
 pow()
 ; return 0; }
 EOF
-if { (eval echo configure:4455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4475,7 +4476,7 @@ fi
 THREAD_LIB=error
 if test "x${THREAD_LIB}" = xerror; then
   echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6
-echo "configure:4479: checking for pthread_attr_init in -lpthread" >&5
+echo "configure:4480: checking for pthread_attr_init in -lpthread" >&5
 ac_lib_var=`echo pthread'_'pthread_attr_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4483,7 +4484,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lpthread  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4487 "configure"
+#line 4488 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4494,7 +4495,7 @@ int main() {
 pthread_attr_init()
 ; return 0; }
 EOF
-if { (eval echo configure:4498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4517,7 +4518,7 @@ fi
 fi
 if test "x${THREAD_LIB}" = xerror; then
   echo $ac_n "checking for pthread_attr_init in -lpthreads""... $ac_c" 1>&6
-echo "configure:4521: checking for pthread_attr_init in -lpthreads" >&5
+echo "configure:4522: checking for pthread_attr_init in -lpthreads" >&5
 ac_lib_var=`echo pthreads'_'pthread_attr_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4525,7 +4526,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lpthreads  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4529 "configure"
+#line 4530 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4536,7 +4537,7 @@ int main() {
 pthread_attr_init()
 ; return 0; }
 EOF
-if { (eval echo configure:4540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4559,7 +4560,7 @@ fi
 fi
 if test "x${THREAD_LIB}" = xerror; then
   echo $ac_n "checking for pthread_attr_init in -lc_r""... $ac_c" 1>&6
-echo "configure:4563: checking for pthread_attr_init in -lc_r" >&5
+echo "configure:4564: checking for pthread_attr_init in -lc_r" >&5
 ac_lib_var=`echo c_r'_'pthread_attr_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4567,7 +4568,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lc_r  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4571 "configure"
+#line 4572 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4578,7 +4579,7 @@ int main() {
 pthread_attr_init()
 ; return 0; }
 EOF
-if { (eval echo configure:4582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4601,12 +4602,12 @@ fi
 fi
 if test "x${THREAD_LIB}" = xerror; then
   echo $ac_n "checking for pthread_attr_init""... $ac_c" 1>&6
-echo "configure:4605: checking for pthread_attr_init" >&5
+echo "configure:4606: checking for pthread_attr_init" >&5
 if eval "test \"`echo '$''{'ac_cv_func_pthread_attr_init'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4610 "configure"
+#line 4611 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pthread_attr_init(); below.  */
@@ -4629,7 +4630,7 @@ pthread_attr_init();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_pthread_attr_init=yes"
 else
@@ -4652,7 +4653,7 @@ fi
 fi
 
 echo $ac_n "checking for cthread_fork in -lthreads""... $ac_c" 1>&6
-echo "configure:4656: checking for cthread_fork in -lthreads" >&5
+echo "configure:4657: checking for cthread_fork in -lthreads" >&5
 ac_lib_var=`echo threads'_'cthread_fork | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4660,7 +4661,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lthreads  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4664 "configure"
+#line 4665 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4671,7 +4672,7 @@ int main() {
 cthread_fork()
 ; return 0; }
 EOF
-if { (eval echo configure:4675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4693,7 +4694,7 @@ fi
 
 
 cat > conftest.$ac_ext <<EOF
-#line 4697 "configure"
+#line 4698 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 EOF
@@ -4709,7 +4710,7 @@ fi
 rm -f conftest*
 
 cat > conftest.$ac_ext <<EOF
-#line 4713 "configure"
+#line 4714 "configure"
 #include "confdefs.h"
 #include <strings.h>
 EOF
@@ -4729,17 +4730,17 @@ for ac_hdr in stddef.h getopt.h strings.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4733: checking for $ac_hdr" >&5
+echo "configure:4734: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4738 "configure"
+#line 4739 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4743: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4744: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4769,17 +4770,17 @@ for ac_hdr in sys/sockio.h fcntl.h sys/time.h sys/times.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4773: checking for $ac_hdr" >&5
+echo "configure:4774: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4778 "configure"
+#line 4779 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4783: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4784: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4809,17 +4810,17 @@ for ac_hdr in sys/soundcard.h machine/soundcard.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4813: checking for $ac_hdr" >&5
+echo "configure:4814: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4818 "configure"
+#line 4819 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4823: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4824: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4849,17 +4850,17 @@ for ac_hdr in dlfcn.h image.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4853: checking for $ac_hdr" >&5
+echo "configure:4854: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4858 "configure"
+#line 4859 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4863: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4864: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4889,17 +4890,17 @@ for ac_hdr in arpa/inet.h net/if.h netinet/in.h sys/socket.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4893: checking for $ac_hdr" >&5
+echo "configure:4894: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4898 "configure"
+#line 4899 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4903: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4904: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4929,17 +4930,17 @@ for ac_hdr in machine/param.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4933: checking for $ac_hdr" >&5
+echo "configure:4934: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4938 "configure"
+#line 4939 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4943: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4944: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4970,17 +4971,17 @@ for ac_hdr in cthreads.h pthread.h kernel/scheduler.h kernel/OS.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4974: checking for $ac_hdr" >&5
+echo "configure:4975: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4979 "configure"
+#line 4980 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4984: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4985: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5008,20 +5009,20 @@ done
 
 
 echo $ac_n "checking for ntohl in sys/param.h""... $ac_c" 1>&6
-echo "configure:5012: checking for ntohl in sys/param.h" >&5
+echo "configure:5013: checking for ntohl in sys/param.h" >&5
 if eval "test \"`echo '$''{'ac_cv_c_ntohl_sys_param_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   CFLAGS="${save_CFLAGS} -Wall -Werror"
      cat > conftest.$ac_ext <<EOF
-#line 5018 "configure"
+#line 5019 "configure"
 #include "confdefs.h"
 #include <sys/param.h>
 int main() {
 void foo() { int meuh; ntohl(meuh); }
 ; return 0; }
 EOF
-if { (eval echo configure:5025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5026: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_ntohl_sys_param_h=yes
 else
@@ -5042,20 +5043,20 @@ EOF
 fi
 
 echo $ac_n "checking if \$CC accepts -finline-limit""... $ac_c" 1>&6
-echo "configure:5046: checking if \$CC accepts -finline-limit" >&5
+echo "configure:5047: checking if \$CC accepts -finline-limit" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline_limit'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   CFLAGS="${save_CFLAGS} -finline-limit-30000"
      cat > conftest.$ac_ext <<EOF
-#line 5052 "configure"
+#line 5053 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5059: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5060: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline_limit=yes
 else
@@ -5073,20 +5074,20 @@ if test x"$ac_cv_c_inline_limit" != x"no"; then
 fi
 
 echo $ac_n "checking if \$CC accepts -bundle -undefined error""... $ac_c" 1>&6
-echo "configure:5077: checking if \$CC accepts -bundle -undefined error" >&5
+echo "configure:5078: checking if \$CC accepts -bundle -undefined error" >&5
 if eval "test \"`echo '$''{'ac_cv_ld_darwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   CFLAGS="${save_CFLAGS} -bundle -undefined error"
      cat > conftest.$ac_ext <<EOF
-#line 5083 "configure"
+#line 5084 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5090: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5091: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_ld_darwin=yes
 else
@@ -5104,20 +5105,20 @@ if test x"$ac_cv_ld_darwin" != x"no"; then
 fi
 
 echo $ac_n "checking if \$CC accepts -shared""... $ac_c" 1>&6
-echo "configure:5108: checking if \$CC accepts -shared" >&5
+echo "configure:5109: checking if \$CC accepts -shared" >&5
 if eval "test \"`echo '$''{'ac_cv_ld_plugins'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   CFLAGS="${save_CFLAGS} -shared"
      cat > conftest.$ac_ext <<EOF
-#line 5114 "configure"
+#line 5115 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5121: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_ld_plugins=yes
 else
@@ -5136,7 +5137,7 @@ fi
         
 if test x"${SOFLAGS}" = x; then
     echo $ac_n "checking for soname setting""... $ac_c" 1>&6
-echo "configure:5140: checking for soname setting" >&5
+echo "configure:5141: checking for soname setting" >&5
 if eval "test \"`echo '$''{'ac_cv_ld_soname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5145,14 +5146,14 @@ else
         try_SOFLAGS="-Wl,-soname -Wl,"
         LDFLAGS="${save_LDFLAGS} ${try_SOFLAGS}foo.so.0"
         cat > conftest.$ac_ext <<EOF
-#line 5149 "configure"
+#line 5150 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_ld_soname="${try_SOFLAGS}"
 else
@@ -5164,14 +5165,14 @@ else
             try_SOFLAGS="-Wl,-h -Wl,"
             LDFLAGS="${save_LDFLAGS} ${try_SOFLAGS}foo.so.0"
             cat > conftest.$ac_ext <<EOF
-#line 5168 "configure"
+#line 5169 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_ld_soname="${try_SOFLAGS}"
 else
@@ -5200,7 +5201,7 @@ have problems using libdvdcss.
 fi
 
 echo $ac_n "checking __attribute__ ((aligned ())) support""... $ac_c" 1>&6
-echo "configure:5204: checking __attribute__ ((aligned ())) support" >&5
+echo "configure:5205: checking __attribute__ ((aligned ())) support" >&5
 if eval "test \"`echo '$''{'ac_cv_c_attribute_aligned'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5208,14 +5209,14 @@ else
 	CFLAGS="${save_CFLAGS} -Werror"
     for ac_cv_c_attr_align_try in 2 4 8 16 32 64; do
         cat > conftest.$ac_ext <<EOF
-#line 5212 "configure"
+#line 5213 "configure"
 #include "confdefs.h"
 
 int main() {
 static char c __attribute__ ((aligned($ac_cv_c_attr_align_try))) = 0; return c;
 ; return 0; }
 EOF
-if { (eval echo configure:5219: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5220: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_attribute_aligned=$ac_cv_c_attr_align_try
 else
@@ -5238,19 +5239,19 @@ CFLAGS="${save_CFLAGS}"
 LDFLAGS="${save_LDFLAGS}"
 
 echo $ac_n "checking for boolean_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:5242: checking for boolean_t in sys/types.h" >&5
+echo "configure:5243: checking for boolean_t in sys/types.h" >&5
 if eval "test \"`echo '$''{'ac_cv_c_boolean_t_sys_types_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5247 "configure"
+#line 5248 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int main() {
 boolean_t foo;
 ; return 0; }
 EOF
-if { (eval echo configure:5254: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5255: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_boolean_t_sys_types_h=yes
 else
@@ -5271,19 +5272,19 @@ EOF
 fi
 
 echo $ac_n "checking for boolean_t in pthread.h""... $ac_c" 1>&6
-echo "configure:5275: checking for boolean_t in pthread.h" >&5
+echo "configure:5276: checking for boolean_t in pthread.h" >&5
 if eval "test \"`echo '$''{'ac_cv_c_boolean_t_pthread_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5280 "configure"
+#line 5281 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 int main() {
 boolean_t foo;
 ; return 0; }
 EOF
-if { (eval echo configure:5287: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5288: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_boolean_t_pthread_h=yes
 else
@@ -5304,19 +5305,19 @@ EOF
 fi
 
 echo $ac_n "checking for boolean_t in cthreads.h""... $ac_c" 1>&6
-echo "configure:5308: checking for boolean_t in cthreads.h" >&5
+echo "configure:5309: checking for boolean_t in cthreads.h" >&5
 if eval "test \"`echo '$''{'ac_cv_c_boolean_t_cthreads_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5313 "configure"
+#line 5314 "configure"
 #include "confdefs.h"
 #include <cthreads.h>
 int main() {
 boolean_t foo;
 ; return 0; }
 EOF
-if { (eval echo configure:5320: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5321: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_boolean_t_cthreads_h=yes
 else
@@ -5337,12 +5338,12 @@ EOF
 fi
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:5341: checking for working const" >&5
+echo "configure:5342: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5346 "configure"
+#line 5347 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -5391,7 +5392,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:5395: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -5412,12 +5413,12 @@ EOF
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:5416: checking for size_t" >&5
+echo "configure:5417: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5421 "configure"
+#line 5422 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -5445,12 +5446,12 @@ EOF
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:5449: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:5450: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5454 "configure"
+#line 5455 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -5459,7 +5460,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:5463: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -5494,19 +5495,19 @@ SSE_MODULES="imdctsse downmixsse"
 ALTIVEC_MODULES="idctaltivec motionaltivec"
 
 echo $ac_n "checking if \$CC groks MMX inline assembly""... $ac_c" 1>&6
-echo "configure:5498: checking if \$CC groks MMX inline assembly" >&5
+echo "configure:5499: checking if \$CC groks MMX inline assembly" >&5
 if eval "test \"`echo '$''{'ac_cv_mmx_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5503 "configure"
+#line 5504 "configure"
 #include "confdefs.h"
 
 int main() {
 void *p;asm volatile("packuswb %%mm1,%%mm2"::"r"(p));
 ; return 0; }
 EOF
-if { (eval echo configure:5510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mmx_inline=yes
 else
@@ -5524,19 +5525,19 @@ if test x"$ac_cv_mmx_inline" != x"no"; then
 fi
 
 echo $ac_n "checking if \$CC groks MMX EXT inline assembly""... $ac_c" 1>&6
-echo "configure:5528: checking if \$CC groks MMX EXT inline assembly" >&5
+echo "configure:5529: checking if \$CC groks MMX EXT inline assembly" >&5
 if eval "test \"`echo '$''{'ac_cv_mmxext_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5533 "configure"
+#line 5534 "configure"
 #include "confdefs.h"
 
 int main() {
 void *p;asm volatile("maskmovq %%mm1,%%mm2"::"r"(p));
 ; return 0; }
 EOF
-if { (eval echo configure:5540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5541: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mmxext_inline=yes
 else
@@ -5554,19 +5555,19 @@ if test x"$ac_cv_mmxext_inline" != x"no"; then
 fi
 
 echo $ac_n "checking if \$CC groks 3D Now! inline assembly""... $ac_c" 1>&6
-echo "configure:5558: checking if \$CC groks 3D Now! inline assembly" >&5
+echo "configure:5559: checking if \$CC groks 3D Now! inline assembly" >&5
 if eval "test \"`echo '$''{'ac_cv_3dnow_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5563 "configure"
+#line 5564 "configure"
 #include "confdefs.h"
 
 int main() {
 void *p;asm volatile("pfadd %%mm1,%%mm2"::"r"(p));
 ; return 0; }
 EOF
-if { (eval echo configure:5570: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5571: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_3dnow_inline=yes
 else
@@ -5588,19 +5589,19 @@ EOF
 fi
 
 echo $ac_n "checking if \$CC groks SSE inline assembly""... $ac_c" 1>&6
-echo "configure:5592: checking if \$CC groks SSE inline assembly" >&5
+echo "configure:5593: checking if \$CC groks SSE inline assembly" >&5
 if eval "test \"`echo '$''{'ac_cv_sse_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5597 "configure"
+#line 5598 "configure"
 #include "confdefs.h"
 
 int main() {
 void *p;asm volatile("xorps %%xmm1,%%xmm2"::"r"(p));
 ; return 0; }
 EOF
-if { (eval echo configure:5604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_sse_inline=yes
 else
@@ -5622,19 +5623,19 @@ EOF
 fi
 
 echo $ac_n "checking if \$CC groks Altivec inline assembly""... $ac_c" 1>&6
-echo "configure:5626: checking if \$CC groks Altivec inline assembly" >&5
+echo "configure:5627: checking if \$CC groks Altivec inline assembly" >&5
 if eval "test \"`echo '$''{'ac_cv_altivec_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5631 "configure"
+#line 5632 "configure"
 #include "confdefs.h"
 
 int main() {
 asm volatile("vperm 0,1,2,3");
 ; return 0; }
 EOF
-if { (eval echo configure:5638: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5639: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_altivec_inline=yes
 else
@@ -5644,14 +5645,14 @@ else
   save_CFLAGS=$CFLAGS
           CFLAGS="$CFLAGS -Wa,-m7400"
           cat > conftest.$ac_ext <<EOF
-#line 5648 "configure"
+#line 5649 "configure"
 #include "confdefs.h"
 
 int main() {
 asm volatile("vperm 0,1,2,3");
 ; return 0; }
 EOF
-if { (eval echo configure:5655: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5656: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_altivec_inline="-Wa,-m7400"
 else
@@ -5680,7 +5681,7 @@ EOF
 fi
 
 echo $ac_n "checking if \$CC groks Altivec C extensions""... $ac_c" 1>&6
-echo "configure:5684: checking if \$CC groks Altivec C extensions" >&5
+echo "configure:5685: checking if \$CC groks Altivec C extensions" >&5
 if eval "test \"`echo '$''{'ac_cv_c_altivec'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5688,14 +5689,14 @@ else
      CFLAGS="$CFLAGS -faltivec"
      # Darwin test
      cat > conftest.$ac_ext <<EOF
-#line 5692 "configure"
+#line 5693 "configure"
 #include "confdefs.h"
 
 int main() {
 vec_mtvscr((vector unsigned int)(0));
 ; return 0; }
 EOF
-if { (eval echo configure:5699: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5700: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_altivec=-faltivec
 else
@@ -5706,14 +5707,14 @@ else
         # Linux/PPC test
         CFLAGS="$save_CFLAGS $CFLAGS_ALTIVEC -fvec"
         cat > conftest.$ac_ext <<EOF
-#line 5710 "configure"
+#line 5711 "configure"
 #include "confdefs.h"
 
 int main() {
 vec_mtvscr((vector unsigned int)(0));
 ; return 0; }
 EOF
-if { (eval echo configure:5717: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5718: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_altivec="-fvec"
 else
@@ -5741,21 +5742,21 @@ EOF
 fi
 
 echo $ac_n "checking if linker needs -framework vecLib""... $ac_c" 1>&6
-echo "configure:5745: checking if linker needs -framework vecLib" >&5
+echo "configure:5746: checking if linker needs -framework vecLib" >&5
 if eval "test \"`echo '$''{'ac_cv_ld_altivec'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   save_LDFLAGS=$LDFLAGS
      LDFLAGS="$LDFLAGS -framework vecLib"
      cat > conftest.$ac_ext <<EOF
-#line 5752 "configure"
+#line 5753 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_ld_altivec=yes
 else
@@ -5801,7 +5802,7 @@ if test $SYS = mingw32; then
 # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
 set dummy ${ac_tool_prefix}windres; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5805: checking for $ac_word" >&5
+echo "configure:5806: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5833,7 +5834,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "windres", so it can be a program name with args.
 set dummy windres; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5837: checking for $ac_word" >&5
+echo "configure:5838: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5876,17 +5877,17 @@ for ac_hdr in winioctl.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5880: checking for $ac_hdr" >&5
+echo "configure:5881: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5885 "configure"
+#line 5886 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5890: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5891: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5919,17 +5920,17 @@ for ac_hdr in sys/ioctl.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5923: checking for $ac_hdr" >&5
+echo "configure:5924: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5928 "configure"
+#line 5929 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5933: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5934: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5955,17 +5956,17 @@ EOF
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5959: checking for $ac_hdr" >&5
+echo "configure:5960: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5964 "configure"
+#line 5965 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5969: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5970: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5995,7 +5996,7 @@ done
   LINUX_DVD_STRUCT=0
   OPENBSD_DVD_STRUCT=0
         cat > conftest.$ac_ext <<EOF
-#line 5999 "configure"
+#line 6000 "configure"
 #include "confdefs.h"
 #include <sys/cdio.h>
 EOF
@@ -6008,7 +6009,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 EOF
 
     cat > conftest.$ac_ext <<EOF
-#line 6012 "configure"
+#line 6013 "configure"
 #include "confdefs.h"
 #include <sys/cdio.h>
 EOF
@@ -6028,7 +6029,7 @@ fi
 rm -f conftest*
 
         cat > conftest.$ac_ext <<EOF
-#line 6032 "configure"
+#line 6033 "configure"
 #include "confdefs.h"
 #include <sys/dvdio.h>
 EOF
@@ -6041,7 +6042,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 EOF
 
     cat > conftest.$ac_ext <<EOF
-#line 6045 "configure"
+#line 6046 "configure"
 #include "confdefs.h"
 #include <sys/dvdio.h>
 EOF
@@ -6061,7 +6062,7 @@ fi
 rm -f conftest*
 
         cat > conftest.$ac_ext <<EOF
-#line 6065 "configure"
+#line 6066 "configure"
 #include "confdefs.h"
 #include <linux/cdrom.h>
 EOF
@@ -6080,7 +6081,7 @@ rm -f conftest*
 
         NEED_BSDI_LIBDVD=0
   cat > conftest.$ac_ext <<EOF
-#line 6084 "configure"
+#line 6085 "configure"
 #include "confdefs.h"
 #include <dvd.h>
 EOF
@@ -6102,17 +6103,17 @@ else
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6106: checking for $ac_hdr" >&5
+echo "configure:6107: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6111 "configure"
+#line 6112 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6116: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6117: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6152,17 +6153,17 @@ rm -f conftest*
 
         ac_safe=`echo "sys/scsi/scsi_types.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/scsi/scsi_types.h""... $ac_c" 1>&6
-echo "configure:6156: checking for sys/scsi/scsi_types.h" >&5
+echo "configure:6157: checking for sys/scsi/scsi_types.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6161 "configure"
+#line 6162 "configure"
 #include "confdefs.h"
 #include <sys/scsi/scsi_types.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6166: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6167: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6181,17 +6182,17 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   
     ac_safe=`echo "sys/scsi/impl/uscsi.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/scsi/impl/uscsi.h""... $ac_c" 1>&6
-echo "configure:6185: checking for sys/scsi/impl/uscsi.h" >&5
+echo "configure:6186: checking for sys/scsi/impl/uscsi.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6190 "configure"
+#line 6191 "configure"
 #include "confdefs.h"
 #include <sys/scsi/impl/uscsi.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6195: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6196: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6359,7 +6360,7 @@ if test "${enable_pth+set}" = set; then
   enableval="$enable_pth"
    if test x$enableval = xyes; then
     echo $ac_n "checking for pth_init in -lpth""... $ac_c" 1>&6
-echo "configure:6363: checking for pth_init in -lpth" >&5
+echo "configure:6364: checking for pth_init in -lpth" >&5
 ac_lib_var=`echo pth'_'pth_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6367,7 +6368,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lpth  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6371 "configure"
+#line 6372 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6378,7 +6379,7 @@ int main() {
 pth_init()
 ; return 0; }
 EOF
-if { (eval echo configure:6382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6406,7 +6407,7 @@ else
 fi
 
     cat > conftest.$ac_ext <<EOF
-#line 6410 "configure"
+#line 6411 "configure"
 #include "confdefs.h"
 #include <pth.h>
 EOF
@@ -6527,7 +6528,7 @@ fi
 if test x$enable_vcd != xno
 then
   cat > conftest.$ac_ext <<EOF
-#line 6531 "configure"
+#line 6532 "configure"
 #include "confdefs.h"
 #include <linux/cdrom.h>
 EOF
@@ -6601,17 +6602,17 @@ if test "${with_mad+set}" = set; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6605: checking for $ac_hdr" >&5
+echo "configure:6606: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6610 "configure"
+#line 6611 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6615: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6616: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6641,7 +6642,7 @@ fi
 done
 
       echo $ac_n "checking for mad_bit_init in -lmad""... $ac_c" 1>&6
-echo "configure:6645: checking for mad_bit_init in -lmad" >&5
+echo "configure:6646: checking for mad_bit_init in -lmad" >&5
 ac_lib_var=`echo mad'_'mad_bit_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6649,7 +6650,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lmad  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6653 "configure"
+#line 6654 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6660,7 +6661,7 @@ int main() {
 mad_bit_init()
 ; return 0; }
 EOF
-if { (eval echo configure:6664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6729,7 +6730,7 @@ if test "${enable_esd+set}" = set; then
      # Extract the first word of "esd-config", so it can be a program name with args.
 set dummy esd-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6733: checking for $ac_word" >&5
+echo "configure:6734: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6780,7 +6781,7 @@ if test "${enable_arts+set}" = set; then
      # Extract the first word of "artsc-config", so it can be a program name with args.
 set dummy artsc-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6784: checking for $ac_word" >&5
+echo "configure:6785: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_ARTS_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6837,17 +6838,17 @@ else
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6841: checking for $ac_hdr" >&5
+echo "configure:6842: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6846 "configure"
+#line 6847 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6851: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6852: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6891,17 +6892,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6895: checking for $ac_hdr" >&5
+echo "configure:6896: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6900 "configure"
+#line 6901 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6905: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6906: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6979,7 +6980,7 @@ fi
   # Extract the first word of "sdl12-config", so it can be a program name with args.
 set dummy sdl12-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6983: checking for $ac_word" >&5
+echo "configure:6984: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_SDL12_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7019,7 +7020,7 @@ fi
     # Extract the first word of "sdl11-config", so it can be a program name with args.
 set dummy sdl11-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7023: checking for $ac_word" >&5
+echo "configure:7024: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_SDL11_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7060,7 +7061,7 @@ fi
     # Extract the first word of "sdl-config", so it can be a program name with args.
 set dummy sdl-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7064: checking for $ac_word" >&5
+echo "configure:7065: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_SDL_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7106,17 +7107,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7110: checking for $ac_hdr" >&5
+echo "configure:7111: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7115 "configure"
+#line 7116 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7120: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7121: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7186,17 +7187,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7190: checking for $ac_hdr" >&5
+echo "configure:7191: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7195 "configure"
+#line 7196 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7200: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7201: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7225,7 +7226,7 @@ done
 
     else
       echo $ac_n "checking for directX headers in ${withval}""... $ac_c" 1>&6
-echo "configure:7229: checking for directX headers in ${withval}" >&5
+echo "configure:7230: checking for directX headers in ${withval}" >&5
       if test -f ${withval}/include/directx.h
       then
         PLUGINS="${PLUGINS} directx"
@@ -7308,7 +7309,7 @@ if test "${enable_gnome+set}" = set; then
     # Extract the first word of "gnome-config", so it can be a program name with args.
 set dummy gnome-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7312: checking for $ac_word" >&5
+echo "configure:7313: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GNOME_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7353,17 +7354,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7357: checking for $ac_hdr" >&5
+echo "configure:7358: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7362 "configure"
+#line 7363 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7367: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7368: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7423,7 +7424,7 @@ fi
   # Extract the first word of "gtk-config", so it can be a program name with args.
 set dummy gtk-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7427: checking for $ac_word" >&5
+echo "configure:7428: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7469,17 +7470,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7473: checking for $ac_hdr" >&5
+echo "configure:7474: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7478 "configure"
+#line 7479 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7483: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7484: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7535,17 +7536,17 @@ if test x$enable_x11 != xno &&
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7539: checking for $ac_hdr" >&5
+echo "configure:7540: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7544 "configure"
+#line 7545 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7549: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7550: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7598,17 +7599,17 @@ if test x$enable_xvideo != xno &&
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7602: checking for $ac_hdr" >&5
+echo "configure:7603: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7607 "configure"
+#line 7608 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7612: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7613: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7648,17 +7649,17 @@ if test "${enable_alsa+set}" = set; then
    then
      ac_safe=`echo "alsa/asoundlib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for alsa/asoundlib.h""... $ac_c" 1>&6
-echo "configure:7652: checking for alsa/asoundlib.h" >&5
+echo "configure:7653: checking for alsa/asoundlib.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7657 "configure"
+#line 7658 "configure"
 #include "confdefs.h"
 #include <alsa/asoundlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7662: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7663: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7675,7 +7676,7 @@ fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6
-echo "configure:7679: checking for main in -lasound" >&5
+echo "configure:7680: checking for main in -lasound" >&5
 ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7683,14 +7684,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lasound  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7687 "configure"
+#line 7688 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:7694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
diff --git a/configure.in b/configure.in
index 3d608a69ba..fb34f89d0b 100644
--- a/configure.in
+++ b/configure.in
@@ -34,12 +34,13 @@ AC_PROG_CPP
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 dnl Gettext stuff
+ALL_LINGUAS="de fr"
 PACKAGE="vlc"
 VERSION="$VLC_VERSION"
+
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AM_GNU_GETTEXT
-ALL_LINGUAS="de"
 
 dnl AM_PROG_LIBTOOL
 AC_PROG_INSTALL
diff --git a/include/interface.h b/include/interface.h
index 8fdb60f538..c05f520bbc 100644
--- a/include/interface.h
+++ b/include/interface.h
@@ -4,7 +4,7 @@
  * interface, such as message output.
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: interface.h,v 1.23 2001/12/09 17:01:35 sam Exp $
+ * $Id: interface.h,v 1.24 2001/12/10 12:40:24 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -61,12 +61,6 @@ typedef struct intf_thread_s
     /* Interface callback */
     void             ( *pf_manage ) ( struct intf_thread_s * );
 
-    /* XXX: Channels array - new API */
-  //p_intf_channel_t *  p_channel[INTF_MAX_CHANNELS];/* channel descriptions */
-
-    /* Channels array - NULL if not used */
-    p_intf_channel_t    p_channel;                /* description of channels */
-
     /* Input thread - NULL if not active */
     p_input_thread_t    p_input;
 
diff --git a/po/.cvsignore b/po/.cvsignore
index 8f58e9b9db..dd122c4a69 100644
--- a/po/.cvsignore
+++ b/po/.cvsignore
@@ -2,3 +2,4 @@ Makefile
 Makefile.in
 POTFILES
 *.mo
+*.gmo
diff --git a/po/ChangeLog b/po/ChangeLog
new file mode 100644
index 0000000000..bdb61875c9
--- /dev/null
+++ b/po/ChangeLog
@@ -0,0 +1,4 @@
+2001-12-10  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 61e3f3ce44..28726a21f2 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -2,19 +2,22 @@
 # Copyright (C) 1995-1997, 2000, 2001 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
 #
 # This file file be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
+# be used in projects which are not available under the GNU General Public License
 # but which still want to provide support for the GNU gettext functionality.
 # Please note that the actual code is *not* freely available.
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
 SHELL = /bin/sh
 @SET_MAKE@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ..
 VPATH = @srcdir@
 
 prefix = @prefix@
@@ -22,7 +25,6 @@ exec_prefix = @exec_prefix@
 datadir = @datadir@
 localedir = $(datadir)/locale
 gettextsrcdir = $(datadir)/gettext/po
-subdir = po
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -151,7 +153,7 @@ maintainer-clean: distclean
 	@echo "it deletes files that may require special tools to rebuild."
 	rm -f $(GMOFILES)
 
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 dist distdir:
 	$(MAKE) update-po
 	@$(MAKE) dist2
@@ -159,7 +161,8 @@ dist distdir:
 dist2: $(DISTFILES)
 	dists="$(DISTFILES)"; \
 	for file in $$dists; do \
-	  cp -p $(srcdir)/$$file $(distdir); \
+	  if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
+	  cp -p $$dir/$$file $(distdir); \
 	done
 
 update-po: Makefile
@@ -183,21 +186,8 @@ update-po: Makefile
 update-gmo: Makefile $(GMOFILES)
 	@:
 
-POTFILES: POTFILES.in
-	( if test 'x$(srcdir)' != 'x.'; then \
-	    posrcprefix='$(top_srcdir)/'; \
-	  else \
-	    posrcprefix="../"; \
-	  fi; \
-	  rm -f $@-t $@ \
-	    && (sed -e '/^#/d' -e '/^[ 	]*$$/d' \
-		    -e "s@.*@	$$posrcprefix& \\\\@" < $(srcdir)/$@.in \
-		| sed -e '$$s/\\$$//') > $@-t \
-	    && chmod a-w $@-t \
-	    && mv $@-t $@ )
-
-Makefile: Makefile.in.in ../config.status POTFILES
-	cd .. \
+Makefile: Makefile.in.in $(top_builddir)/config.status POTFILES.in
+	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
 	       $(SHELL) ./config.status
 
diff --git a/po/fr.po b/po/fr.po
new file mode 100644
index 0000000000..8535314dee
--- /dev/null
+++ b/po/fr.po
@@ -0,0 +1,1117 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2001-12-10 13:26+0100\n"
+"PO-Revision-Date: 2001-12-10 13:32+0100\n"
+"Last-Translator: Samuel Hocevar <sam@zoy.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: plugins/gtk/gnome_interface.c:23
+#: plugins/gtk/gnome_interface.c:747
+#: plugins/gtk/gtk_interface.c:152
+#: plugins/gtk/gtk_interface.c:1096
+msgid "_Open File..."
+msgstr "_Ouvrir Fichier"
+
+#: plugins/gtk/gnome_interface.c:24
+#: plugins/gtk/gnome_interface.c:339
+#: plugins/gtk/gnome_interface.c:748
+#: plugins/gtk/gtk_interface.c:160
+#: plugins/gtk/gtk_interface.c:453
+#: plugins/gtk/gtk_interface.c:1104
+msgid "Open a File"
+msgstr "Ouvre un Fichier"
+
+#: plugins/gtk/gnome_interface.c:30
+#: plugins/gtk/gnome_interface.c:754
+#: plugins/gtk/gtk_interface.c:167
+#: plugins/gtk/gtk_interface.c:1108
+msgid "Open _Disc..."
+msgstr "Ouvrir _Disque"
+
+#: plugins/gtk/gnome_interface.c:31
+#: plugins/gtk/gnome_interface.c:351
+#: plugins/gtk/gnome_interface.c:755
+#: plugins/gtk/gtk_interface.c:175
+#: plugins/gtk/gtk_interface.c:464
+#: plugins/gtk/gtk_interface.c:1116
+msgid "Open a DVD or VCD"
+msgstr "Ouvre un DVD ou un VCD"
+
+#: plugins/gtk/gnome_interface.c:37
+#: plugins/gtk/gnome_interface.c:761
+#: plugins/gtk/gtk_interface.c:182
+#: plugins/gtk/gtk_interface.c:1120
+msgid "_Network Stream..."
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:38
+#: plugins/gtk/gnome_interface.c:363
+#: plugins/gtk/gnome_interface.c:762
+#: plugins/gtk/gtk_interface.c:190
+#: plugins/gtk/gtk_interface.c:475
+#: plugins/gtk/gtk_interface.c:1128
+msgid "Select a Network Stream"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:51
+#: plugins/gtk/gtk_interface.c:238
+msgid "_Hide interface"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:58
+#: plugins/gtk/gnome_interface.c:825
+#: plugins/gtk/gtk_interface.c:250
+#: plugins/gtk/gtk_interface.c:986
+msgid "_Fullscreen"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:66
+#: plugins/gtk/gtk_interface.c:269
+msgid "_Title"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:67
+msgid "Choose title"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:73
+#: plugins/gtk/gtk_interface.c:282
+msgid "_Chapter"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:74
+msgid "Choose chapter"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:80
+#: plugins/gtk/gnome_interface.c:861
+#: plugins/gtk/gtk_interface.c:294
+#: plugins/gtk/gtk_interface.c:1042
+msgid "An_gle"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:81
+msgid "Choose angle"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:88
+#: plugins/gtk/gtk_interface.c:314
+msgid "_Playlist..."
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:89
+#: plugins/gtk/gtk_interface.c:322
+msgid "Open the playlist window"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:95
+#: plugins/gtk/gtk_interface.c:326
+msgid "_Modules..."
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:96
+#: plugins/gtk/gtk_interface.c:335
+msgid "Open the plugin manager"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:107
+#: plugins/gtk/gnome_interface.c:868
+#: plugins/gtk/gtk_interface.c:1054
+msgid "_Audio"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:108
+#: plugins/gtk/gnome_interface.c:869
+msgid "Select audio channel"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:114
+#: plugins/gtk/gnome_interface.c:875
+#: plugins/gtk/gtk_interface.c:370
+#: plugins/gtk/gtk_interface.c:1066
+msgid "_Subtitles"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:115
+msgid "Select subtitle unit"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:189
+#: plugins/gtk/gtk_interface.c:108
+#: plugins/gtk/gtk_interface.c:1278
+msgid "VideoLAN Client"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:338
+#: plugins/gtk/gnome_interface.c:1658
+#: plugins/gtk/gnome_interface.c:2230
+#: plugins/gtk/gtk_interface.c:452
+#: plugins/gtk/gtk_interface.c:2060
+#: plugins/gtk/gtk_interface.c:2177
+#: plugins/gtk/gtk_interface.c:2437
+msgid "File"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:350
+#: plugins/gtk/gnome_interface.c:529
+#: plugins/gtk/gnome_interface.c:1651
+#: plugins/gtk/gnome_interface.c:2297
+#: plugins/gtk/gtk_interface.c:463
+#: plugins/gtk/gtk_interface.c:628
+#: plugins/gtk/gtk_interface.c:2053
+#: plugins/gtk/gtk_interface.c:2530
+msgid "Disc"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:362
+#: plugins/gtk/gtk_interface.c:474
+msgid "Net"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:376
+#: plugins/gtk/gnome_interface.c:796
+#: plugins/gtk/gtk_interface.c:487
+#: plugins/gtk/gtk_interface.c:941
+msgid "Back"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:377
+#: plugins/gtk/gtk_interface.c:488
+msgid "Go Backwards"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:389
+#: plugins/gtk/gnome_interface.c:789
+#: plugins/gtk/gtk_interface.c:499
+#: plugins/gtk/gtk_interface.c:934
+msgid "Stop"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:390
+#: plugins/gtk/gtk_interface.c:500
+msgid "Stop Stream"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:401
+#: plugins/gtk/gnome_interface.c:775
+#: plugins/gtk/gtk_interface.c:510
+msgid "Play"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:402
+#: plugins/gtk/gtk_interface.c:511
+msgid "Play Stream"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:413
+#: plugins/gtk/gnome_interface.c:782
+#: plugins/gtk/gtk_interface.c:521
+#: plugins/gtk/gtk_interface.c:926
+msgid "Pause"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:414
+#: plugins/gtk/gtk_interface.c:522
+msgid "Pause Stream"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:426
+#: plugins/gtk/gnome_interface.c:803
+#: plugins/gtk/gtk_interface.c:533
+#: plugins/gtk/gtk_interface.c:949
+msgid "Slow"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:427
+#: plugins/gtk/gtk_interface.c:534
+msgid "Play Slower"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:439
+#: plugins/gtk/gnome_interface.c:810
+#: plugins/gtk/gtk_interface.c:545
+#: plugins/gtk/gtk_interface.c:957
+msgid "Fast"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:440
+#: plugins/gtk/gtk_interface.c:546
+msgid "Play Faster"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:454
+#: plugins/gtk/gnome_interface.c:1768
+#: plugins/gtk/gnome_interface.c:1792
+#: plugins/gtk/gnome_interface.c:2866
+#: plugins/gtk/gtk_interface.c:559
+#: plugins/gtk/gtk_interface.c:2024
+#: plugins/gtk/gtk_interface.c:3114
+msgid "Playlist"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:455
+#: plugins/gtk/gtk_interface.c:560
+msgid "Open Playlist"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:466
+#: plugins/gtk/gnome_interface.c:840
+#: plugins/gtk/gtk_interface.c:570
+#: plugins/gtk/gtk_interface.c:656
+#: plugins/gtk/gtk_interface.c:700
+#: plugins/gtk/gtk_interface.c:1010
+msgid "Prev"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:467
+#: plugins/gtk/gtk_interface.c:571
+msgid "Previous File"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:478
+#: plugins/gtk/gnome_interface.c:833
+#: plugins/gtk/gtk_interface.c:581
+#: plugins/gtk/gtk_interface.c:664
+#: plugins/gtk/gtk_interface.c:708
+#: plugins/gtk/gtk_interface.c:1003
+msgid "Next"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:479
+#: plugins/gtk/gtk_interface.c:582
+msgid "Next File"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:493
+#: plugins/gtk/gtk_interface.c:589
+msgid "-:--:--"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:543
+msgid "Title:"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:550
+#: plugins/gtk/gtk_interface.c:649
+msgid "--"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:563
+msgid "Select previous title"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:588
+msgid "Chapter:"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:595
+#: plugins/gtk/gtk_interface.c:693
+msgid "---"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:608
+msgid "Select previous chapter"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:617
+msgid "Select next chapter"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:626
+msgid "No server"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:640
+msgid "Network Channel:"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:655
+#: plugins/gtk/gtk_interface.c:752
+msgid "Go!"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:818
+#: plugins/gtk/gtk_interface.c:975
+msgid "Toggle _Interface"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:826
+msgid "Toggle fullscreen mode"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:847
+#: plugins/gtk/gtk_interface.c:1019
+msgid "_Jump..."
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:848
+msgid "Got directly so specified point"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:854
+#: plugins/gtk/gtk_interface.c:1030
+msgid "_Navigation"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:855
+msgid "Navigate through titles and chapters"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:876
+msgid "Select subtitle channel"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:884
+#: plugins/gtk/gtk_interface.c:1149
+msgid "Playlist..."
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1081
+#: plugins/gtk/gtk_interface.c:1286
+msgid "(C) 1996, 1997, 1998, 1999, 2000, 2001 - the VideoLAN Team"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1083
+#: plugins/gtk/gtk_interface.c:1312
+msgid "This is the VideoLAN client, a DVD and MPEG player. It can play MPEG and MPEG 2 files from a file or from a network source."
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1097
+msgid "Open File"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1134
+msgid "Modules"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1142
+msgid "Sorry, the module manager isn't functional yet. Please retry in a later version."
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1208
+#: plugins/gtk/gtk_interface.c:1405
+msgid "Open Disc"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1224
+#: plugins/gtk/gtk_interface.c:1429
+msgid "Disc type"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1238
+#: plugins/gtk/gtk_interface.c:1443
+msgid "DVD"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1246
+#: plugins/gtk/gtk_interface.c:1451
+msgid "VCD"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1254
+#: plugins/gtk/gtk_interface.c:1459
+msgid "Starting position"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1271
+#: plugins/gtk/gtk_interface.c:1506
+msgid "Title"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1281
+#: plugins/gtk/gtk_interface.c:1496
+msgid "Chapter"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1318
+msgid "Device name:"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1331
+#: plugins/gtk/gtk_interface.c:1536
+#: plugins/gtk/gtk_interface.c:2482
+#: plugins/gtk/gtk_interface.c:2491
+msgid "/dev/dvd"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1409
+msgid "Network Stream"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1425
+#: plugins/gtk/gtk_interface.c:1644
+msgid "Protocol"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1439
+#: plugins/gtk/gnome_interface.c:2394
+#: plugins/gtk/gtk_interface.c:1658
+#: plugins/gtk/gtk_interface.c:2637
+msgid "TS"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1447
+#: plugins/gtk/gnome_interface.c:2404
+#: plugins/gtk/gtk_interface.c:1666
+#: plugins/gtk/gtk_interface.c:2647
+msgid "RTP"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1456
+#: plugins/gtk/gnome_interface.c:2414
+#: plugins/gtk/gtk_interface.c:1675
+#: plugins/gtk/gtk_interface.c:2657
+msgid "HTTP"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1464
+#: plugins/gtk/gtk_interface.c:1683
+msgid "Server"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1481
+#: plugins/gtk/gtk_interface.c:1720
+msgid "Address"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1491
+#: plugins/gtk/gtk_interface.c:1710
+msgid "Port"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1510
+msgid "Port of the stream server"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1512
+#: plugins/gtk/gtk_interface.c:1730
+msgid "Broadcast"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1536
+#: plugins/gtk/gtk_interface.c:1755
+msgid "138.195.143.255"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1552
+#: plugins/gtk/gnome_interface.c:2368
+#: plugins/gtk/gtk_interface.c:1765
+#: plugins/gtk/gtk_interface.c:1774
+msgid "vls"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1554
+#: plugins/gtk/gtk_interface.c:1776
+msgid "Channels"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1569
+#: plugins/gtk/gtk_interface.c:1791
+msgid "Channel server:"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1589
+#: plugins/gtk/gtk_interface.c:1810
+msgid "138.195.143.120"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1591
+#: plugins/gtk/gtk_interface.c:1812
+msgid "port:"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1665
+#: plugins/gtk/gnome_interface.c:2434
+#: plugins/gtk/gtk_interface.c:2067
+#: plugins/gtk/gtk_interface.c:2667
+msgid "Network"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1672
+#: plugins/gtk/gnome_interface.c:1811
+#: plugins/gtk/gtk_interface.c:2074
+msgid "Url"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1684
+#: plugins/gtk/gtk_interface.c:2095
+msgid "All"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1691
+msgid "Item"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1703
+msgid "Crop"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1710
+msgid "Invert"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1717
+msgid "Select"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1729
+#: plugins/gtk/gtk_interface.c:2039
+msgid "Add"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1736
+#: plugins/gtk/gtk_interface.c:2081
+msgid "Delete"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1743
+#: plugins/gtk/gtk_interface.c:2109
+msgid "Selection"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1818
+#: plugins/gtk/gtk_interface.c:2184
+msgid "Duration"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1970
+msgid "Jump to: "
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1987
+#: plugins/gtk/gtk_interface.c:1915
+msgid "s."
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2002
+#: plugins/gtk/gtk_interface.c:1930
+msgid "m:"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2017
+#: plugins/gtk/gtk_interface.c:1945
+msgid "h:"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2170
+#: plugins/gtk/gnome_interface.c:2180
+#: plugins/gtk/gtk_interface.c:2378
+msgid "Preferences"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2220
+msgid "Default path: "
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2277
+msgid "Default DVD path: "
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2287
+msgid "Default VCD path: "
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2314
+msgid "Default server: "
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2334
+msgid "Broadcast address: "
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2344
+msgid "Default port: "
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2385
+#: plugins/gtk/gtk_interface.c:2618
+msgid "Broadcast mode"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2424
+msgid "Default protocol: "
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2451
+msgid "Default interface: "
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2476
+#: plugins/gtk/gtk_interface.c:2714
+msgid "Interface"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2493
+#: plugins/gtk/gnome_interface.c:2684
+msgid "Default output: "
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2503
+msgid "Default height: "
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2533
+msgid "Default width: "
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2558
+#: plugins/gtk/gtk_interface.c:2823
+msgid "Default depth:"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2577
+#: plugins/gtk/gnome_interface.c:2608
+#: plugins/gtk/gtk_interface.c:2811
+#: plugins/gtk/gtk_interface.c:2852
+msgid "15 bits"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2580
+#: plugins/gtk/gnome_interface.c:2611
+#: plugins/gtk/gnome_interface.c:2761
+#: plugins/gtk/gtk_interface.c:2814
+#: plugins/gtk/gtk_interface.c:2855
+#: plugins/gtk/gtk_interface.c:2931
+msgid "16 bits"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2583
+#: plugins/gtk/gnome_interface.c:2614
+#: plugins/gtk/gtk_interface.c:2817
+#: plugins/gtk/gtk_interface.c:2858
+msgid "32 bits"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2589
+#: plugins/gtk/gtk_interface.c:2833
+msgid "Fullscreen depth:"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2620
+#: plugins/gtk/gtk_interface.c:2884
+msgid "Fullscreen on play"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2629
+#: plugins/gtk/gtk_interface.c:2893
+msgid "Grayscale"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2638
+#: plugins/gtk/gtk_interface.c:2874
+msgid "Gamma:"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2658
+#: plugins/gtk/gtk_interface.c:2902
+msgid "Video"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2675
+#: plugins/gtk/gtk_interface.c:3022
+msgid "Spdif output"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2709
+msgid "Frequency: "
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2728
+#: plugins/gtk/gtk_interface.c:2946
+msgid "48000 Hz"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2731
+#: plugins/gtk/gtk_interface.c:2949
+msgid "44100 Hz"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2734
+msgid "32000 Hz"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2737
+msgid "22050 Hz"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2742
+msgid "Quality: "
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2764
+#: plugins/gtk/gtk_interface.c:2928
+msgid "8 bits"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2769
+msgid "Channels: "
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2788
+#: plugins/gtk/gtk_interface.c:2963
+msgid "Mono"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2791
+#: plugins/gtk/gtk_interface.c:2966
+msgid "Stereo"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2797
+#: plugins/gtk/gtk_interface.c:2982
+msgid "Default device:"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2822
+#: plugins/gtk/gtk_interface.c:3070
+msgid "Audio"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2839
+#: plugins/gtk/gtk_interface.c:3087
+msgid "Launch on startup"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2848
+#: plugins/gtk/gtk_interface.c:3105
+msgid "Loop on playlist end"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2857
+#: plugins/gtk/gtk_interface.c:3096
+msgid "Enqueue as default"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2883
+msgid "Files associated with vlc"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2901
+#: plugins/gtk/gtk_interface.c:3174
+msgid "ts"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2910
+#: plugins/gtk/gtk_interface.c:3165
+msgid "vob"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2919
+#: plugins/gtk/gtk_interface.c:3156
+msgid "mp2"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2928
+#: plugins/gtk/gtk_interface.c:3147
+msgid "mpeg"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2937
+#: plugins/gtk/gtk_interface.c:3183
+msgid "Messages"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2954
+#: plugins/gtk/gtk_interface.c:3199
+msgid "Warning level: "
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2973
+#: plugins/gtk/gtk_interface.c:3219
+msgid "Misc"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:134
+#: plugins/gtk/gtk_interface.c:1078
+msgid "_File"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:205
+#: plugins/gtk/gtk_interface.c:1177
+msgid "E_xit"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:213
+msgid "Exit the program"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:220
+msgid "_View"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:246
+msgid "Hide the main interface window"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:278
+msgid "Navigate through the stream"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:339
+msgid "_Settings"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:357
+msgid "A_udio"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:366
+msgid "Select audio language"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:379
+msgid "Select sub-title"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:391
+#: plugins/gtk/gtk_interface.c:1158
+msgid "_Preferences..."
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:399
+msgid "Configure the application"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:403
+msgid "_Help"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:421
+#: plugins/gtk/gtk_interface.c:1140
+msgid "_About..."
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:429
+msgid "About this application"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:642
+msgid "Title:  "
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:686
+msgid "Chapter:  "
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:723
+msgid "No server !"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:737
+msgid "Channel:  "
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:917
+msgid "_Play"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:1263
+msgid "About"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:1295
+msgid "Authors"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:1302
+msgid ""
+"Régis Duchesne <regis@via.ecp.fr>\n"
+"Michel Lespinasse <walken@zoy.org>\n"
+"Olivier Pomel <pomel@via.ecp.fr>\n"
+"Pierre Baillet <oct@zoy.org>\n"
+"Jean-Philippe Grimaldi <jeanphi@via.ecp.fr>\n"
+"Andres Krapf <dae@via.ecp.fr>\n"
+"Christophe Massiot <massiot@via.ecp.fr>\n"
+"Vincent Seguin <seguin@via.ecp.fr>\n"
+"Benoit Steiner <benny@via.ecp.fr>\n"
+"Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>\n"
+"Jean-Marc Dressler <polux@via.ecp.fr>\n"
+"Gaël Hendryckx <jimmy@via.ecp.fr>\n"
+"Samuel Hocevar <sam@zoy.org>\n"
+"Brieuc Jeunhomme <bbp@via.ecp.fr>\n"
+"Michel Kaempf <maxx@via.ecp.fr>\n"
+"Stéphane Borel <stef@via.ecp.fr>\n"
+"Renaud Dartus <reno@via.ecp.fr>\n"
+"Henri Fallon <henri@via.ecp.fr>"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:1327
+#: plugins/gtk/gtk_interface.c:1550
+#: plugins/gtk/gtk_interface.c:1840
+msgid "OK"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:1350
+msgid "Select File"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:1523
+msgid "Device name"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:1557
+#: plugins/gtk/gtk_interface.c:1847
+#: plugins/gtk/gtk_interface.c:1972
+#: plugins/gtk/gtk_interface.c:2203
+#: plugins/gtk/gtk_interface.c:3245
+msgid "Cancel"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:1620
+msgid "Open Network"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:1892
+msgid "Jump"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:1899
+msgid "Go to:"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:1965
+#: plugins/gtk/gtk_interface.c:2196
+#: plugins/gtk/gtk_interface.c:3231
+msgid "Ok"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2102
+msgid "Selected"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2125
+msgid "_Crop"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2136
+msgid "_Invert"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2147
+msgid "_Select"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2403
+msgid "Default path:"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2428
+#: plugins/gtk/gtk_interface.c:2512
+#: plugins/gtk/gtk_interface.c:2521
+msgid "Browse"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2454
+msgid "Default VCD path"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2464
+msgid "Default DVD path:"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2501
+#: plugins/gtk/gtk_interface.c:2510
+msgid "/dev/cdrom"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2561
+msgid "vls "
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2578
+msgid "Default server:"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2588
+msgid "Default port:"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2608
+msgid "Broadcast address:"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2627
+msgid "Default protocol:"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2692
+#: plugins/gtk/gtk_interface.c:2702
+msgid "Gtk+"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2693
+msgid "Gnome"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2704
+msgid "Default interface:"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2739
+#: plugins/gtk/gtk_interface.c:2750
+msgid "sdl"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2740
+msgid "xvideo"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2741
+msgid "x11"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2752
+#: plugins/gtk/gtk_interface.c:2972
+msgid "Default output:"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2762
+msgid "Default width:"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2792
+msgid "Default height:"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2992
+msgid "Quality:"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:3002
+msgid "Frequency:"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:3012
+msgid "Channels:"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:3039
+#: plugins/gtk/gtk_interface.c:3049
+msgid "dsp"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:3040
+msgid "alsa"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:3059
+#: plugins/gtk/gtk_interface.c:3068
+msgid "/dev/dsp"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:3131
+msgid "Types associated with vlc"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:3238
+msgid "Apply"
+msgstr ""
+
diff --git a/po/vlc.pot b/po/vlc.pot
new file mode 100644
index 0000000000..a90ea832d9
--- /dev/null
+++ b/po/vlc.pot
@@ -0,0 +1,955 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2001-12-10 13:26+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: plugins/gtk/gnome_interface.c:23 plugins/gtk/gnome_interface.c:747
+#: plugins/gtk/gtk_interface.c:152 plugins/gtk/gtk_interface.c:1096
+msgid "_Open File..."
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:24 plugins/gtk/gnome_interface.c:339
+#: plugins/gtk/gnome_interface.c:748 plugins/gtk/gtk_interface.c:160
+#: plugins/gtk/gtk_interface.c:453 plugins/gtk/gtk_interface.c:1104
+msgid "Open a File"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:30 plugins/gtk/gnome_interface.c:754
+#: plugins/gtk/gtk_interface.c:167 plugins/gtk/gtk_interface.c:1108
+msgid "Open _Disc..."
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:31 plugins/gtk/gnome_interface.c:351
+#: plugins/gtk/gnome_interface.c:755 plugins/gtk/gtk_interface.c:175
+#: plugins/gtk/gtk_interface.c:464 plugins/gtk/gtk_interface.c:1116
+msgid "Open a DVD or VCD"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:37 plugins/gtk/gnome_interface.c:761
+#: plugins/gtk/gtk_interface.c:182 plugins/gtk/gtk_interface.c:1120
+msgid "_Network Stream..."
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:38 plugins/gtk/gnome_interface.c:363
+#: plugins/gtk/gnome_interface.c:762 plugins/gtk/gtk_interface.c:190
+#: plugins/gtk/gtk_interface.c:475 plugins/gtk/gtk_interface.c:1128
+msgid "Select a Network Stream"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:51 plugins/gtk/gtk_interface.c:238
+msgid "_Hide interface"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:58 plugins/gtk/gnome_interface.c:825
+#: plugins/gtk/gtk_interface.c:250 plugins/gtk/gtk_interface.c:986
+msgid "_Fullscreen"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:66 plugins/gtk/gtk_interface.c:269
+msgid "_Title"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:67
+msgid "Choose title"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:73 plugins/gtk/gtk_interface.c:282
+msgid "_Chapter"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:74
+msgid "Choose chapter"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:80 plugins/gtk/gnome_interface.c:861
+#: plugins/gtk/gtk_interface.c:294 plugins/gtk/gtk_interface.c:1042
+msgid "An_gle"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:81
+msgid "Choose angle"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:88 plugins/gtk/gtk_interface.c:314
+msgid "_Playlist..."
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:89 plugins/gtk/gtk_interface.c:322
+msgid "Open the playlist window"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:95 plugins/gtk/gtk_interface.c:326
+msgid "_Modules..."
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:96 plugins/gtk/gtk_interface.c:335
+msgid "Open the plugin manager"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:107 plugins/gtk/gnome_interface.c:868
+#: plugins/gtk/gtk_interface.c:1054
+msgid "_Audio"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:108 plugins/gtk/gnome_interface.c:869
+msgid "Select audio channel"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:114 plugins/gtk/gnome_interface.c:875
+#: plugins/gtk/gtk_interface.c:370 plugins/gtk/gtk_interface.c:1066
+msgid "_Subtitles"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:115
+msgid "Select subtitle unit"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:189 plugins/gtk/gtk_interface.c:108
+#: plugins/gtk/gtk_interface.c:1278
+msgid "VideoLAN Client"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:338 plugins/gtk/gnome_interface.c:1658
+#: plugins/gtk/gnome_interface.c:2230 plugins/gtk/gtk_interface.c:452
+#: plugins/gtk/gtk_interface.c:2060 plugins/gtk/gtk_interface.c:2177
+#: plugins/gtk/gtk_interface.c:2437
+msgid "File"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:350 plugins/gtk/gnome_interface.c:529
+#: plugins/gtk/gnome_interface.c:1651 plugins/gtk/gnome_interface.c:2297
+#: plugins/gtk/gtk_interface.c:463 plugins/gtk/gtk_interface.c:628
+#: plugins/gtk/gtk_interface.c:2053 plugins/gtk/gtk_interface.c:2530
+msgid "Disc"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:362 plugins/gtk/gtk_interface.c:474
+msgid "Net"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:376 plugins/gtk/gnome_interface.c:796
+#: plugins/gtk/gtk_interface.c:487 plugins/gtk/gtk_interface.c:941
+msgid "Back"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:377 plugins/gtk/gtk_interface.c:488
+msgid "Go Backwards"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:389 plugins/gtk/gnome_interface.c:789
+#: plugins/gtk/gtk_interface.c:499 plugins/gtk/gtk_interface.c:934
+msgid "Stop"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:390 plugins/gtk/gtk_interface.c:500
+msgid "Stop Stream"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:401 plugins/gtk/gnome_interface.c:775
+#: plugins/gtk/gtk_interface.c:510
+msgid "Play"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:402 plugins/gtk/gtk_interface.c:511
+msgid "Play Stream"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:413 plugins/gtk/gnome_interface.c:782
+#: plugins/gtk/gtk_interface.c:521 plugins/gtk/gtk_interface.c:926
+msgid "Pause"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:414 plugins/gtk/gtk_interface.c:522
+msgid "Pause Stream"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:426 plugins/gtk/gnome_interface.c:803
+#: plugins/gtk/gtk_interface.c:533 plugins/gtk/gtk_interface.c:949
+msgid "Slow"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:427 plugins/gtk/gtk_interface.c:534
+msgid "Play Slower"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:439 plugins/gtk/gnome_interface.c:810
+#: plugins/gtk/gtk_interface.c:545 plugins/gtk/gtk_interface.c:957
+msgid "Fast"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:440 plugins/gtk/gtk_interface.c:546
+msgid "Play Faster"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:454 plugins/gtk/gnome_interface.c:1768
+#: plugins/gtk/gnome_interface.c:1792 plugins/gtk/gnome_interface.c:2866
+#: plugins/gtk/gtk_interface.c:559 plugins/gtk/gtk_interface.c:2024
+#: plugins/gtk/gtk_interface.c:3114
+msgid "Playlist"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:455 plugins/gtk/gtk_interface.c:560
+msgid "Open Playlist"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:466 plugins/gtk/gnome_interface.c:840
+#: plugins/gtk/gtk_interface.c:570 plugins/gtk/gtk_interface.c:656
+#: plugins/gtk/gtk_interface.c:700 plugins/gtk/gtk_interface.c:1010
+msgid "Prev"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:467 plugins/gtk/gtk_interface.c:571
+msgid "Previous File"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:478 plugins/gtk/gnome_interface.c:833
+#: plugins/gtk/gtk_interface.c:581 plugins/gtk/gtk_interface.c:664
+#: plugins/gtk/gtk_interface.c:708 plugins/gtk/gtk_interface.c:1003
+msgid "Next"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:479 plugins/gtk/gtk_interface.c:582
+msgid "Next File"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:493 plugins/gtk/gtk_interface.c:589
+msgid "-:--:--"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:543
+msgid "Title:"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:550 plugins/gtk/gtk_interface.c:649
+msgid "--"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:563
+msgid "Select previous title"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:588
+msgid "Chapter:"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:595 plugins/gtk/gtk_interface.c:693
+msgid "---"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:608
+msgid "Select previous chapter"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:617
+msgid "Select next chapter"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:626
+msgid "No server"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:640
+msgid "Network Channel:"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:655 plugins/gtk/gtk_interface.c:752
+msgid "Go!"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:818 plugins/gtk/gtk_interface.c:975
+msgid "Toggle _Interface"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:826
+msgid "Toggle fullscreen mode"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:847 plugins/gtk/gtk_interface.c:1019
+msgid "_Jump..."
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:848
+msgid "Got directly so specified point"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:854 plugins/gtk/gtk_interface.c:1030
+msgid "_Navigation"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:855
+msgid "Navigate through titles and chapters"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:876
+msgid "Select subtitle channel"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:884 plugins/gtk/gtk_interface.c:1149
+msgid "Playlist..."
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1081 plugins/gtk/gtk_interface.c:1286
+msgid "(C) 1996, 1997, 1998, 1999, 2000, 2001 - the VideoLAN Team"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1083 plugins/gtk/gtk_interface.c:1312
+msgid ""
+"This is the VideoLAN client, a DVD and MPEG player. It can play MPEG and "
+"MPEG 2 files from a file or from a network source."
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1097
+msgid "Open File"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1134
+msgid "Modules"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1142
+msgid ""
+"Sorry, the module manager isn't functional yet. Please retry in a later "
+"version."
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1208 plugins/gtk/gtk_interface.c:1405
+msgid "Open Disc"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1224 plugins/gtk/gtk_interface.c:1429
+msgid "Disc type"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1238 plugins/gtk/gtk_interface.c:1443
+msgid "DVD"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1246 plugins/gtk/gtk_interface.c:1451
+msgid "VCD"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1254 plugins/gtk/gtk_interface.c:1459
+msgid "Starting position"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1271 plugins/gtk/gtk_interface.c:1506
+msgid "Title"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1281 plugins/gtk/gtk_interface.c:1496
+msgid "Chapter"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1318
+msgid "Device name:"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1331 plugins/gtk/gtk_interface.c:1536
+#: plugins/gtk/gtk_interface.c:2482 plugins/gtk/gtk_interface.c:2491
+msgid "/dev/dvd"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1409
+msgid "Network Stream"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1425 plugins/gtk/gtk_interface.c:1644
+msgid "Protocol"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1439 plugins/gtk/gnome_interface.c:2394
+#: plugins/gtk/gtk_interface.c:1658 plugins/gtk/gtk_interface.c:2637
+msgid "TS"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1447 plugins/gtk/gnome_interface.c:2404
+#: plugins/gtk/gtk_interface.c:1666 plugins/gtk/gtk_interface.c:2647
+msgid "RTP"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1456 plugins/gtk/gnome_interface.c:2414
+#: plugins/gtk/gtk_interface.c:1675 plugins/gtk/gtk_interface.c:2657
+msgid "HTTP"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1464 plugins/gtk/gtk_interface.c:1683
+msgid "Server"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1481 plugins/gtk/gtk_interface.c:1720
+msgid "Address"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1491 plugins/gtk/gtk_interface.c:1710
+msgid "Port"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1510
+msgid "Port of the stream server"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1512 plugins/gtk/gtk_interface.c:1730
+msgid "Broadcast"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1536 plugins/gtk/gtk_interface.c:1755
+msgid "138.195.143.255"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1552 plugins/gtk/gnome_interface.c:2368
+#: plugins/gtk/gtk_interface.c:1765 plugins/gtk/gtk_interface.c:1774
+msgid "vls"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1554 plugins/gtk/gtk_interface.c:1776
+msgid "Channels"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1569 plugins/gtk/gtk_interface.c:1791
+msgid "Channel server:"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1589 plugins/gtk/gtk_interface.c:1810
+msgid "138.195.143.120"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1591 plugins/gtk/gtk_interface.c:1812
+msgid "port:"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1665 plugins/gtk/gnome_interface.c:2434
+#: plugins/gtk/gtk_interface.c:2067 plugins/gtk/gtk_interface.c:2667
+msgid "Network"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1672 plugins/gtk/gnome_interface.c:1811
+#: plugins/gtk/gtk_interface.c:2074
+msgid "Url"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1684 plugins/gtk/gtk_interface.c:2095
+msgid "All"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1691
+msgid "Item"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1703
+msgid "Crop"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1710
+msgid "Invert"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1717
+msgid "Select"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1729 plugins/gtk/gtk_interface.c:2039
+msgid "Add"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1736 plugins/gtk/gtk_interface.c:2081
+msgid "Delete"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1743 plugins/gtk/gtk_interface.c:2109
+msgid "Selection"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1818 plugins/gtk/gtk_interface.c:2184
+msgid "Duration"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1970
+msgid "Jump to: "
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:1987 plugins/gtk/gtk_interface.c:1915
+msgid "s."
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2002 plugins/gtk/gtk_interface.c:1930
+msgid "m:"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2017 plugins/gtk/gtk_interface.c:1945
+msgid "h:"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2170 plugins/gtk/gnome_interface.c:2180
+#: plugins/gtk/gtk_interface.c:2378
+msgid "Preferences"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2220
+msgid "Default path: "
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2277
+msgid "Default DVD path: "
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2287
+msgid "Default VCD path: "
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2314
+msgid "Default server: "
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2334
+msgid "Broadcast address: "
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2344
+msgid "Default port: "
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2385 plugins/gtk/gtk_interface.c:2618
+msgid "Broadcast mode"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2424
+msgid "Default protocol: "
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2451
+msgid "Default interface: "
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2476 plugins/gtk/gtk_interface.c:2714
+msgid "Interface"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2493 plugins/gtk/gnome_interface.c:2684
+msgid "Default output: "
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2503
+msgid "Default height: "
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2533
+msgid "Default width: "
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2558 plugins/gtk/gtk_interface.c:2823
+msgid "Default depth:"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2577 plugins/gtk/gnome_interface.c:2608
+#: plugins/gtk/gtk_interface.c:2811 plugins/gtk/gtk_interface.c:2852
+msgid "15 bits"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2580 plugins/gtk/gnome_interface.c:2611
+#: plugins/gtk/gnome_interface.c:2761 plugins/gtk/gtk_interface.c:2814
+#: plugins/gtk/gtk_interface.c:2855 plugins/gtk/gtk_interface.c:2931
+msgid "16 bits"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2583 plugins/gtk/gnome_interface.c:2614
+#: plugins/gtk/gtk_interface.c:2817 plugins/gtk/gtk_interface.c:2858
+msgid "32 bits"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2589 plugins/gtk/gtk_interface.c:2833
+msgid "Fullscreen depth:"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2620 plugins/gtk/gtk_interface.c:2884
+msgid "Fullscreen on play"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2629 plugins/gtk/gtk_interface.c:2893
+msgid "Grayscale"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2638 plugins/gtk/gtk_interface.c:2874
+msgid "Gamma:"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2658 plugins/gtk/gtk_interface.c:2902
+msgid "Video"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2675 plugins/gtk/gtk_interface.c:3022
+msgid "Spdif output"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2709
+msgid "Frequency: "
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2728 plugins/gtk/gtk_interface.c:2946
+msgid "48000 Hz"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2731 plugins/gtk/gtk_interface.c:2949
+msgid "44100 Hz"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2734
+msgid "32000 Hz"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2737
+msgid "22050 Hz"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2742
+msgid "Quality: "
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2764 plugins/gtk/gtk_interface.c:2928
+msgid "8 bits"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2769
+msgid "Channels: "
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2788 plugins/gtk/gtk_interface.c:2963
+msgid "Mono"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2791 plugins/gtk/gtk_interface.c:2966
+msgid "Stereo"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2797 plugins/gtk/gtk_interface.c:2982
+msgid "Default device:"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2822 plugins/gtk/gtk_interface.c:3070
+msgid "Audio"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2839 plugins/gtk/gtk_interface.c:3087
+msgid "Launch on startup"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2848 plugins/gtk/gtk_interface.c:3105
+msgid "Loop on playlist end"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2857 plugins/gtk/gtk_interface.c:3096
+msgid "Enqueue as default"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2883
+msgid "Files associated with vlc"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2901 plugins/gtk/gtk_interface.c:3174
+msgid "ts"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2910 plugins/gtk/gtk_interface.c:3165
+msgid "vob"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2919 plugins/gtk/gtk_interface.c:3156
+msgid "mp2"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2928 plugins/gtk/gtk_interface.c:3147
+msgid "mpeg"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2937 plugins/gtk/gtk_interface.c:3183
+msgid "Messages"
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2954 plugins/gtk/gtk_interface.c:3199
+msgid "Warning level: "
+msgstr ""
+
+#: plugins/gtk/gnome_interface.c:2973 plugins/gtk/gtk_interface.c:3219
+msgid "Misc"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:134 plugins/gtk/gtk_interface.c:1078
+msgid "_File"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:205 plugins/gtk/gtk_interface.c:1177
+msgid "E_xit"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:213
+msgid "Exit the program"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:220
+msgid "_View"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:246
+msgid "Hide the main interface window"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:278
+msgid "Navigate through the stream"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:339
+msgid "_Settings"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:357
+msgid "A_udio"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:366
+msgid "Select audio language"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:379
+msgid "Select sub-title"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:391 plugins/gtk/gtk_interface.c:1158
+msgid "_Preferences..."
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:399
+msgid "Configure the application"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:403
+msgid "_Help"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:421 plugins/gtk/gtk_interface.c:1140
+msgid "_About..."
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:429
+msgid "About this application"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:642
+msgid "Title:  "
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:686
+msgid "Chapter:  "
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:723
+msgid "No server !"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:737
+msgid "Channel:  "
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:917
+msgid "_Play"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:1263
+msgid "About"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:1295
+msgid "Authors"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:1302
+msgid ""
+"Régis Duchesne <regis@via.ecp.fr>\n"
+"Michel Lespinasse <walken@zoy.org>\n"
+"Olivier Pomel <pomel@via.ecp.fr>\n"
+"Pierre Baillet <oct@zoy.org>\n"
+"Jean-Philippe Grimaldi <jeanphi@via.ecp.fr>\n"
+"Andres Krapf <dae@via.ecp.fr>\n"
+"Christophe Massiot <massiot@via.ecp.fr>\n"
+"Vincent Seguin <seguin@via.ecp.fr>\n"
+"Benoit Steiner <benny@via.ecp.fr>\n"
+"Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>\n"
+"Jean-Marc Dressler <polux@via.ecp.fr>\n"
+"Gaël Hendryckx <jimmy@via.ecp.fr>\n"
+"Samuel Hocevar <sam@zoy.org>\n"
+"Brieuc Jeunhomme <bbp@via.ecp.fr>\n"
+"Michel Kaempf <maxx@via.ecp.fr>\n"
+"Stéphane Borel <stef@via.ecp.fr>\n"
+"Renaud Dartus <reno@via.ecp.fr>\n"
+"Henri Fallon <henri@via.ecp.fr>"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:1327 plugins/gtk/gtk_interface.c:1550
+#: plugins/gtk/gtk_interface.c:1840
+msgid "OK"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:1350
+msgid "Select File"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:1523
+msgid "Device name"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:1557 plugins/gtk/gtk_interface.c:1847
+#: plugins/gtk/gtk_interface.c:1972 plugins/gtk/gtk_interface.c:2203
+#: plugins/gtk/gtk_interface.c:3245
+msgid "Cancel"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:1620
+msgid "Open Network"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:1892
+msgid "Jump"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:1899
+msgid "Go to:"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:1965 plugins/gtk/gtk_interface.c:2196
+#: plugins/gtk/gtk_interface.c:3231
+msgid "Ok"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2102
+msgid "Selected"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2125
+msgid "_Crop"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2136
+msgid "_Invert"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2147
+msgid "_Select"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2403
+msgid "Default path:"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2428 plugins/gtk/gtk_interface.c:2512
+#: plugins/gtk/gtk_interface.c:2521
+msgid "Browse"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2454
+msgid "Default VCD path"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2464
+msgid "Default DVD path:"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2501 plugins/gtk/gtk_interface.c:2510
+msgid "/dev/cdrom"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2561
+msgid "vls "
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2578
+msgid "Default server:"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2588
+msgid "Default port:"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2608
+msgid "Broadcast address:"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2627
+msgid "Default protocol:"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2692 plugins/gtk/gtk_interface.c:2702
+msgid "Gtk+"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2693
+msgid "Gnome"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2704
+msgid "Default interface:"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2739 plugins/gtk/gtk_interface.c:2750
+msgid "sdl"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2740
+msgid "xvideo"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2741
+msgid "x11"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2752 plugins/gtk/gtk_interface.c:2972
+msgid "Default output:"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2762
+msgid "Default width:"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2792
+msgid "Default height:"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:2992
+msgid "Quality:"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:3002
+msgid "Frequency:"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:3012
+msgid "Channels:"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:3039 plugins/gtk/gtk_interface.c:3049
+msgid "dsp"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:3040
+msgid "alsa"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:3059 plugins/gtk/gtk_interface.c:3068
+msgid "/dev/dsp"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:3131
+msgid "Types associated with vlc"
+msgstr ""
+
+#: plugins/gtk/gtk_interface.c:3238
+msgid "Apply"
+msgstr ""