Merge svn changes up to r28537

1 files changed, 879 insertions, 811 deletions

diff --git a/configure b/configure
index ef55ade91b..c5d85e04d6 100755
--- a/configure
+++ b/configure
@@ -30,9 +30,9 @@
 # _feature=no
 # cc_check && _feature=yes
 # if test "$_feature" = yes ; then
-#   _def_feature='#define CONFIG_FEATURE 1'
+#   def_feature='#define CONFIG_FEATURE 1'
 # else
-#   _def_feature='#undef CONFIG_FEATURE'
+#   def_feature='#undef CONFIG_FEATURE'
 # fi
 # echores "$_feature"
 #
@@ -44,7 +44,7 @@
 # uniform, i.e. if the option is named 'feature':
 #
 # _feature     : should have a value of yes/no/auto
-# _def_feature : '#define ... 1' or '#undef ...' for conditional compilation
+# def_feature  : '#define ... 1' or '#undef ...' for conditional compilation
 # _ld_feature  : '-L/path/dir -lfeature' GCC options
 #
 #############################################################################
@@ -718,8 +718,11 @@ _ass=auto
 _rpath=no
 _asmalign_pot=auto
 _stream_cache=yes
-_def_stream_cache="#define CONFIG_STREAM_CACHE 1"
-_def_pthread_cache="#undef PTHREAD_CACHE"
+_priority=no
+def_dos_paths="#define HAVE_DOS_PATHS 0"
+def_stream_cache="#define CONFIG_STREAM_CACHE 1"
+def_priority="#undef CONFIG_PRIORITY"
+def_pthread_cache="#undef PTHREAD_CACHE"
 _need_shmem=yes
 for ac_option do
   case "$ac_option" in
@@ -1437,6 +1440,9 @@ if win32 ; then
   _ld_extra="$_ld_extra -lwinmm"
   _pe_executable=yes
   _timer=timer-win2.c
+  _priority=yes
+  def_dos_paths="#define HAVE_DOS_PATHS 1"
+  def_priority="#define CONFIG_PRIORITY 1"
 fi
 
 if mingw32 ; then
@@ -1448,7 +1454,7 @@ if amigaos ; then
   _select=no
   _sighandler=no
   _stream_cache=no
-  _def_stream_cache="#undef CONFIG_STREAM_CACHE"
+  def_stream_cache="#undef CONFIG_STREAM_CACHE"
 fi
 
 if qnx ; then
@@ -1459,6 +1465,9 @@ if os2 ; then
   _exesuf=".exe"
   _getch=getch2-os2.c
   _need_shmem=no
+  _priority=yes
+  def_dos_paths="#define HAVE_DOS_PATHS 1"
+  def_priority="#define CONFIG_PRIORITY 1"
 fi
 
 for I in "$TMPDIR" "$TEMPDIR" "/tmp" ; do
@@ -1697,7 +1706,7 @@ case "$host_arch" in
   _arch='X86 X86_32'
   _target_arch_x86="ARCH_X86 = yes"
   _target_arch="ARCH_X86_32 = yes"
-  _def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1'
+  def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1'
   iproc=486
   proc=i486
 
@@ -1937,7 +1946,7 @@ EOF
     _arch='X86 X86_64'
     _target_arch='ARCH_X86_64 = yes'
     _target_arch_x86="ARCH_X86 = yes"
-    _def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1'
+    def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1'
     def_fast_64bit='#define HAVE_FAST_64BIT 1'
     iproc='x86_64'
 
@@ -2058,9 +2067,9 @@ EOF
 
   ppc|ppc64|powerpc|powerpc64)
     _arch='PPC'
-    _def_dcbzl='#define HAVE_DCBZL 0'
+    def_dcbzl='#define HAVE_DCBZL 0'
     _target_arch='ARCH_PPC = yes'
-    _def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1'
+    def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1'
     iproc='ppc'
 
     if test "$host_arch" = "ppc64" -o "$host_arch" = "powerpc64" ; then
@@ -2131,7 +2140,7 @@ EOF
 	if test "$_cc_major" -ge "3" && test "$_cc_minor" -ge "3" || test "$_cc_major" -ge "4"; then
 	    case "$proc" in
 		970*|PPC970*) _march='-mcpu=970' _mcpu='-mtune=970'
-                      _def_dcbzl='#define HAVE_DCBZL 1' ;;
+                      def_dcbzl='#define HAVE_DCBZL 1' ;;
     		*) ;;
     	    esac
 	fi
@@ -2316,10 +2325,10 @@ EOF
 fi
 if test "$_big_endian" = yes ; then
   _byte_order='big-endian'
-  _def_words_endian='#define WORDS_BIGENDIAN 1'
+  def_words_endian='#define WORDS_BIGENDIAN 1'
 else
   _byte_order='little-endian'
-  _def_words_endian='#undef WORDS_BIGENDIAN'
+  def_words_endian='#undef WORDS_BIGENDIAN'
 fi
 echores "$_byte_order"
 
@@ -2331,7 +2340,7 @@ EOF
 cc_check -c || die "Symbol mangling check failed."
 sym=$($_nm -P -g $TMPEXE)
 extern_prefix=${sym%%ff_extern*}
-_def_extern_prefix="#define EXTERN_PREFIX \"$extern_prefix\""
+def_extern_prefix="#define EXTERN_PREFIX \"$extern_prefix\""
 echores $extern_prefix
 
 
@@ -2344,11 +2353,11 @@ cc_check -pipe && _pipe="-pipe" && echores "yes" || echores "no"
 
 echocheck "compiler support of named assembler arguments"
 _named_asm_args=yes
-_def_named_asm_args="#define NAMED_ASM_ARGS 1"
+def_named_asm_args="#define NAMED_ASM_ARGS 1"
 if test "$cc_vendor" = "gnu" && test "$_cc_major" -lt 3 \
      -o "$_cc_major" -eq 3 -a "$_cc_minor" = 0 ; then
   _named_asm_args=no
-  _def_named_asm_args="#undef NAMED_ASM_ARGS"
+  def_named_asm_args="#undef NAMED_ASM_ARGS"
 fi
 echores $_named_asm_args
 
@@ -2461,13 +2470,29 @@ EOF
 cc_check && _asmalign_pot=yes
 fi
 if test "$_asmalign_pot" = "yes" ; then
-  _def_asmalign_pot='#define ASMALIGN(ZEROBITS) ".align " #ZEROBITS "\n\t"'
+  def_asmalign_pot='#define ASMALIGN(ZEROBITS) ".align " #ZEROBITS "\n\t"'
 else
-  _def_asmalign_pot='#define ASMALIGN(ZEROBITS) ".align 1<<" #ZEROBITS "\n\t"'
+  def_asmalign_pot='#define ASMALIGN(ZEROBITS) ".align 1<<" #ZEROBITS "\n\t"'
 fi
 echores $_asmalign_pot
 
 if x86 ; then
+echocheck "10 assembler operands"
+ten_operands=no
+def_ten_operands='#define HAVE_TEN_OPERANDS 0'
+cat > $TMPC << EOF
+int main(void) {
+    int x=0;
+    __asm__ volatile(
+        ""
+        :"+&rm"(x), "+&rm"(x), "+&rm"(x), "+&rm"(x), "+&rm"(x), "+&rm"(x)
+    );
+    return 0;
+}
+EOF
+cc_check && ten_operands=yes && def_ten_operands='#define HAVE_TEN_OPERANDS 1'
+echores $ten_operands
+
 echocheck "yasm"
 if test -z "$YASMFLAGS" ; then
   if darwin ; then
@@ -2493,11 +2518,11 @@ echo "pabsw xmm0, xmm0" > $TMPS
 yasm_check || _yasm=""
 if test $_yasm ; then
   test "$_mmx" = "yes" && fft_mmx="yes"
-  _def_yasm='#define HAVE_YASM 1'
+  def_yasm='#define HAVE_YASM 1'
   _have_yasm="yes"
   echores "$_yasm"
 else
-  _def_yasm='#define HAVE_YASM 0'
+  def_yasm='#define HAVE_YASM 0'
   fft_mmx="no"
   _have_yasm="no"
   echores "no"
@@ -2709,9 +2734,9 @@ EOF
   cc_check && _langinfo=yes
 fi
 if test "$_langinfo" = yes ; then
-  _def_langinfo='#define HAVE_LANGINFO 1'
+  def_langinfo='#define HAVE_LANGINFO 1'
 else
-  _def_langinfo='#undef HAVE_LANGINFO'
+  def_langinfo='#undef HAVE_LANGINFO'
 fi
 echores "$_langinfo"
 
@@ -2755,18 +2780,18 @@ echores "messages: $msg_lang - man pages: $man_langs - documentation: $doc_langs
 
 echocheck "enable sighandler"
 if test "$_sighandler" = yes ; then
-  _def_sighandler='#define CONFIG_SIGHANDLER 1'
+  def_sighandler='#define CONFIG_SIGHANDLER 1'
 else
-  _def_sighandler='#undef CONFIG_SIGHANDLER'
+  def_sighandler='#undef CONFIG_SIGHANDLER'
 fi
 echores "$_sighandler"
 
 echocheck "runtime cpudetection"
 if test "$_runtime_cpudetection" = yes ; then
   _optimizing="Runtime CPU-Detection enabled"
-  _def_runtime_cpudetection='#define RUNTIME_CPUDETECT 1'
+  def_runtime_cpudetection='#define RUNTIME_CPUDETECT 1'
 else
-  _def_runtime_cpudetection='#undef RUNTIME_CPUDETECT'
+  def_runtime_cpudetection='#undef RUNTIME_CPUDETECT'
 fi
 echores "$_runtime_cpudetection"
 
@@ -2775,20 +2800,20 @@ echocheck "restrict keyword"
 for restrict_keyword in restrict __restrict __restrict__ ; do
   echo "void foo(char * $restrict_keyword p); int main(void) { return 0; }" > $TMPC
   if cc_check; then
-    _def_restrict_keyword=$restrict_keyword
+    def_restrict_keyword=$restrict_keyword
     break;
   fi
 done
-if [ -n "$_def_restrict_keyword" ]; then
-  echores "$_def_restrict_keyword"
+if [ -n "$def_restrict_keyword" ]; then
+  echores "$def_restrict_keyword"
 else
   echores "none"
 fi
 # Avoid infinite recursion loop ("#define restrict restrict")
-if [ "$_def_restrict_keyword" != "restrict" ]; then
-  _def_restrict_keyword="#define restrict $_def_restrict_keyword"
+if [ "$def_restrict_keyword" != "restrict" ]; then
+  def_restrict_keyword="#define restrict $def_restrict_keyword"
 else
-  _def_restrict_keyword=""
+  def_restrict_keyword=""
 fi
 
 
@@ -2804,9 +2829,9 @@ EOF
 _builtin_expect=no
 cc_check && _builtin_expect=yes
 if test "$_builtin_expect" = yes ; then
-  _def_builtin_expect='#define HAVE_BUILTIN_EXPECT 1'
+  def_builtin_expect='#define HAVE_BUILTIN_EXPECT 1'
 else
-  _def_builtin_expect='#undef HAVE_BUILTIN_EXPECT'
+  def_builtin_expect='#undef HAVE_BUILTIN_EXPECT'
 fi
 echores "$_builtin_expect"
 
@@ -2819,10 +2844,10 @@ EOF
 _kstat=no
 cc_check -lkstat && _kstat=yes
 if test "$_kstat" = yes ; then
-  _def_kstat="#define HAVE_LIBKSTAT 1"
+  def_kstat="#define HAVE_LIBKSTAT 1"
   _ld_extra="$_ld_extra -lkstat"
 else
-  _def_kstat="#undef HAVE_LIBKSTAT"
+  def_kstat="#undef HAVE_LIBKSTAT"
 fi
 echores "$_kstat"
 
@@ -2849,10 +2874,10 @@ EOF
 eval _$func=no
 cc_check -D_ISOC99_SOURCE $_ld_lm && eval _$func=yes
 if eval test "x\$_$func" = "xyes"; then
-  eval _def_$func="\"#define HAVE_`echo $func | tr '[a-z]' '[A-Z]'` 1\""
+  eval def_$func="\"#define HAVE_`echo $func | tr '[a-z]' '[A-Z]'` 1\""
   echores yes
 else
-  eval _def_$func="\"#define HAVE_`echo $func | tr '[a-z]' '[A-Z]'` 0\""
+  eval def_$func="\"#define HAVE_`echo $func | tr '[a-z]' '[A-Z]'` 0\""
   echores no
 fi
 done
@@ -2866,9 +2891,9 @@ EOF
 _mkstemp=no
 cc_check && _mkstemp=yes
 if test "$_mkstemp" = yes ; then
-  _def_mkstemp='#define HAVE_MKSTEMP 1'
+  def_mkstemp='#define HAVE_MKSTEMP 1'
 else
-  _def_mkstemp='#undef HAVE_MKSTEMP'
+  def_mkstemp='#undef HAVE_MKSTEMP'
 fi
 echores "$_mkstemp"
 
@@ -2882,9 +2907,9 @@ EOF
 _nanosleep=no
 cc_check && _nanosleep=yes
 if test "$_nanosleep" = yes ; then
-  _def_nanosleep='#define HAVE_NANOSLEEP 1'
+  def_nanosleep='#define HAVE_NANOSLEEP 1'
 else
-  _def_nanosleep='#undef HAVE_NANOSLEEP'
+  def_nanosleep='#undef HAVE_NANOSLEEP'
 fi
 echores "$_nanosleep"
 
@@ -2921,6 +2946,17 @@ else
 fi
 
 
+echocheck "arpa/inet.h"
+arpa_inet_h=no
+def_arpa_inet_h='#define HAVE_ARPA_INET_H 0'
+cat > $TMPC << EOF
+#include <arpa/inet.h>
+int main(void) { return 0; }
+EOF
+cc_check && arpa_inet_h=yes && def_arpa_inet_h='#define HAVE_ARPA_INET_H 1'
+echores "$arpa_inet_h"
+
+
 echocheck "inet_pton()"
 def_inet_pton='#define HAVE_INET_PTON 0'
 inet_pton=no
@@ -2969,9 +3005,9 @@ EOF
   cc_check && _socklen_t=yes && break
 done
 if test "$_socklen_t" = yes ; then
-  _def_socklen_t='#define HAVE_SOCKLEN_T 1'
+  def_socklen_t='#define HAVE_SOCKLEN_T 1'
 else
-  _def_socklen_t='#define HAVE_SOCKLEN_T 0'
+  def_socklen_t='#define HAVE_SOCKLEN_T 0'
 fi
 echores "$_socklen_t"
 
@@ -2984,9 +3020,9 @@ int main(void) { closesocket(~0); return 0; }
 EOF
 cc_check $_ld_sock && _closesocket=yes
 if test "$_closesocket" = yes ; then
-  _def_closesocket='#define HAVE_CLOSESOCKET 1'
+  def_closesocket='#define HAVE_CLOSESOCKET 1'
 else
-  _def_closesocket='#define HAVE_CLOSESOCKET 0'
+  def_closesocket='#define HAVE_CLOSESOCKET 0'
 fi
 echores "$_closesocket"
 
@@ -2995,12 +3031,12 @@ echocheck "network"
 test $_winsock2_h = no && test $inet_pton = no &&
   test $inet_aton = no && _network=no
 if test "$_network" = yes ; then
-  _def_network='#define CONFIG_NETWORK 1'
+  def_network='#define CONFIG_NETWORK 1'
   _ld_extra="$_ld_extra $_ld_sock"
   _inputmodules="network $_inputmodules"
 else
   _noinputmodules="network $_noinputmodules"
-  _def_network='#undef CONFIG_NETWORK'
+  def_network='#undef CONFIG_NETWORK'
   _ftp=no
 fi
 echores "$_network"
@@ -3024,9 +3060,9 @@ EOF
   fi
 fi
 if test "$_inet6" = yes ; then
-  _def_inet6='#define HAVE_AF_INET6 1'
+  def_inet6='#define HAVE_AF_INET6 1'
 else
-  _def_inet6='#undef HAVE_AF_INET6'
+  def_inet6='#undef HAVE_AF_INET6'
 fi
 echores "$_inet6"
 
@@ -3045,9 +3081,9 @@ EOF
   fi
 fi
 if test "$_gethostbyname2" = yes ; then
-  _def_gethostbyname2='#define HAVE_GETHOSTBYNAME2 1'
+  def_gethostbyname2='#define HAVE_GETHOSTBYNAME2 1'
 else
-  _def_gethostbyname2='#undef HAVE_GETHOSTBYNAME2'
+  def_gethostbyname2='#undef HAVE_GETHOSTBYNAME2'
 fi
 echores "$_gethostbyname2"
 
@@ -3086,7 +3122,7 @@ EOF
 _fast_inttypes=no
 cc_check && _fast_inttypes=yes
 if test "$_fast_inttypes" = no ; then
-  _def_fast_inttypes='
+  def_fast_inttypes='
     typedef signed char int_fast8_t;
     typedef signed int  int_fast16_t;
     typedef signed int  int_fast32_t;
@@ -3118,7 +3154,7 @@ echores "$_malloc"
 
 echocheck "memalign()"
 # XXX restrict to x86 ? extend to other CPUs/cacheline sizes ?
-_def_memalign_hack='#define CONFIG_MEMALIGN_HACK 0'
+def_memalign_hack='#define CONFIG_MEMALIGN_HACK 0'
 cat > $TMPC << EOF
 #include <malloc.h>
 int main(void) { (void) memalign(64, sizeof(char)); return 0; }
@@ -3126,15 +3162,27 @@ EOF
 _memalign=no
 cc_check && _memalign=yes
 if test "$_memalign" = yes ; then
- _def_memalign='#define HAVE_MEMALIGN 1'
+  def_memalign='#define HAVE_MEMALIGN 1'
 else
- _def_memalign='#undef HAVE_MEMALIGN'
- _def_map_memalign='#define memalign(a,b) malloc(b)'
- darwin || _def_memalign_hack='#define CONFIG_MEMALIGN_HACK 1'
+  def_memalign='#undef HAVE_MEMALIGN'
+  def_map_memalign='#define memalign(a,b) malloc(b)'
+  darwin || def_memalign_hack='#define CONFIG_MEMALIGN_HACK 1'
 fi
 echores "$_memalign"
 
 
+echocheck "posix_memalign()"
+posix_memalign=no
+def_posix_memalign='#define HAVE_POSIX_MEMALIGN 0'
+cat > $TMPC << EOF
+#define _XOPEN_SOURCE 600
+#include <stdlib.h>
+int main(void) { posix_memalign(NULL, 0, 0); }
+EOF
+cc_check && posix_memalign=yes && def_posix_memalign='#define HAVE_POSIX_MEMALIGN 1'
+echores "$posix_memalign"
+
+
 echocheck "alloca.h"
 cat > $TMPC << EOF
 #include <alloca.h>
@@ -3152,9 +3200,9 @@ echores "$_alloca"
 
 echocheck "fastmemcpy"
 if test "$_fastmemcpy" = yes ; then
-  _def_fastmemcpy='#define CONFIG_FASTMEMCPY 1'
+  def_fastmemcpy='#define CONFIG_FASTMEMCPY 1'
 else
-  _def_fastmemcpy='#undef CONFIG_FASTMEMCPY'
+  def_fastmemcpy='#undef CONFIG_FASTMEMCPY'
 fi
 echores "$_fastmemcpy"
 
@@ -3183,9 +3231,9 @@ EOF
 _mman_has_map_failed=no
 cc_check && _mman_has_map_failed=yes
 if test "$_mman_has_map_failed" = yes ; then
-  _def_mman_has_map_failed=''
+  def_mman_has_map_failed=''
 else
-  _def_mman_has_map_failed='#define MAP_FAILED ((void *) -1)'
+  def_mman_has_map_failed='#define MAP_FAILED ((void *) -1)'
 fi
 
 echocheck "dynamic loader"
@@ -3199,9 +3247,9 @@ for _ld_tmp in "" "-ldl" ; do
   cc_check $_ld_tmp && _ld_dl="$_ld_tmp" && _dl=yes && break
 done
 if test "$_dl" = yes ; then
- _def_dl='#define HAVE_LIBDL 1'
+  def_dl='#define HAVE_LIBDL 1'
 else
- _def_dl='#undef HAVE_LIBDL'
+  def_dl='#undef HAVE_LIBDL'
 fi
 echores "$_dl"
 
@@ -3211,14 +3259,14 @@ if test "$_dl" = no ; then
   _dynamic_plugins=no
 fi
 if test "$_dynamic_plugins" = yes ; then
-  _def_dynamic_plugins='#define CONFIG_DYNAMIC_PLUGINS 1'
+  def_dynamic_plugins='#define CONFIG_DYNAMIC_PLUGINS 1'
 else
-  _def_dynamic_plugins='#undef CONFIG_DYNAMIC_PLUGINS'
+  def_dynamic_plugins='#undef CONFIG_DYNAMIC_PLUGINS'
 fi
 echores "$_dynamic_plugins"
 
 
-_def_threads='#undef HAVE_THREADS'
+def_threads='#undef HAVE_THREADS'
 
 echocheck "pthread"
 if test "$_pthreads" = auto ; then
@@ -3237,11 +3285,11 @@ fi
 fi
 if test "$_pthreads" = yes ; then
   test $_ld_pthread && _res_comment="using $_ld_pthread"
-  _def_pthreads='#define HAVE_PTHREADS 1'
-  _def_threads='#define HAVE_THREADS 1'
+  def_pthreads='#define HAVE_PTHREADS 1'
+  def_threads='#define HAVE_THREADS 1'
 else
   _res_comment="v4l, v4l2, ao_nas, win32 loader disabled"
-  _def_pthreads='#undef HAVE_PTHREADS'
+  def_pthreads='#undef HAVE_PTHREADS'
   _nas=no ; _tv_v4l1=no ; _tv_v4l2=no
   mingw32 || _win32dll=no
 fi
@@ -3249,10 +3297,10 @@ echores "$_pthreads"
 
 if cygwin ; then
   if test "$_pthreads" = yes ; then
-    _def_pthread_cache="#define PTHREAD_CACHE 1"
+    def_pthread_cache="#define PTHREAD_CACHE 1"
   else
     _stream_cache=no
-    _def_stream_cache="#undef CONFIG_STREAM_CACHE"
+    def_stream_cache="#undef CONFIG_STREAM_CACHE"
   fi
 fi
 
@@ -3265,7 +3313,7 @@ if test "$_w32threads" = auto ; then
   _w32threads=no
   mingw32 && _w32threads=yes
 fi
-test "$_w32threads" = yes && _def_threads='#define HAVE_THREADS 1'
+test "$_w32threads" = yes && def_threads='#define HAVE_THREADS 1'
 echores "$_w32threads"
 
 echocheck "rpath"
@@ -3319,9 +3367,9 @@ EOF
   done
 fi
 if test "$_iconv" = yes ; then
-  _def_iconv='#define CONFIG_ICONV 1'
+  def_iconv='#define CONFIG_ICONV 1'
 else
-  _def_iconv='#undef CONFIG_ICONV'
+  def_iconv='#undef CONFIG_ICONV'
 fi
 echores "$_iconv"
 
@@ -3357,9 +3405,9 @@ EOF
 _dvdio=no
 cc_check && _dvdio=yes
 if test "$_dvdio" = yes ; then
-  _def_dvdio='#define DVD_STRUCT_IN_SYS_DVDIO_H 1'
+  def_dvdio='#define DVD_STRUCT_IN_SYS_DVDIO_H 1'
 else
-  _def_dvdio='#undef DVD_STRUCT_IN_SYS_DVDIO_H'
+  def_dvdio='#undef DVD_STRUCT_IN_SYS_DVDIO_H'
 fi
 echores "$_dvdio"
 
@@ -3373,9 +3421,9 @@ EOF
 _cdio=no
 cc_check && _cdio=yes
 if test "$_cdio" = yes ; then
-  _def_cdio='#define DVD_STRUCT_IN_SYS_CDIO_H 1'
+  def_cdio='#define DVD_STRUCT_IN_SYS_CDIO_H 1'
 else
-  _def_cdio='#undef DVD_STRUCT_IN_SYS_CDIO_H'
+  def_cdio='#undef DVD_STRUCT_IN_SYS_CDIO_H'
 fi
 echores "$_cdio"
 
@@ -3389,9 +3437,9 @@ EOF
 _cdrom=no
 cc_check && _cdrom=yes
 if test "$_cdrom" = yes ; then
-  _def_cdrom='#define DVD_STRUCT_IN_LINUX_CDROM_H 1'
+  def_cdrom='#define DVD_STRUCT_IN_LINUX_CDROM_H 1'
 else
-  _def_cdrom='#undef DVD_STRUCT_IN_LINUX_CDROM_H'
+  def_cdrom='#undef DVD_STRUCT_IN_LINUX_CDROM_H'
 fi
 echores "$_cdrom"
 
@@ -3404,9 +3452,9 @@ EOF
 _dvd=no
 cc_check && _dvd=yes
 if test "$_dvd" = yes ; then
-  _def_dvd='#define DVD_STRUCT_IN_DVD_H 1'
+  def_dvd='#define DVD_STRUCT_IN_DVD_H 1'
 else
-  _def_dvd='#undef DVD_STRUCT_IN_DVD_H'
+  def_dvd='#undef DVD_STRUCT_IN_DVD_H'
 fi
 echores "$_dvd"
 
@@ -3420,9 +3468,9 @@ EOF
 _bsdi_dvd=no
 cc_check && _bsdi_dvd=yes
 if test "$_bsdi_dvd" = yes ; then
-  _def_bsdi_dvd='#define DVD_STRUCT_IN_BSDI_DVDIOCTL_DVD_H 1'
+  def_bsdi_dvd='#define DVD_STRUCT_IN_BSDI_DVDIOCTL_DVD_H 1'
 else
-  _def_bsdi_dvd='#undef DVD_STRUCT_IN_BSDI_DVDIOCTL_DVD_H'
+  def_bsdi_dvd='#undef DVD_STRUCT_IN_BSDI_DVDIOCTL_DVD_H'
 fi
 echores "$_bsdi_dvd"
 fi #if bsdos
@@ -3438,9 +3486,9 @@ EOF
 _hpux_scsi_h=no
 cc_check && _hpux_scsi_h=yes
 if test "$_hpux_scsi_h" = yes ; then
-  _def_hpux_scsi_h='#define HPUX_SCTL_IO 1'
+  def_hpux_scsi_h='#define HPUX_SCTL_IO 1'
 else
-  _def_hpux_scsi_h='#undef HPUX_SCTL_IO'
+  def_hpux_scsi_h='#undef HPUX_SCTL_IO'
 fi
 echores "$_hpux_scsi_h"
 fi #if hpux
@@ -3458,9 +3506,9 @@ EOF
 _sol_scsi_h=no
 cc_check && _sol_scsi_h=yes
 if test "$_sol_scsi_h" = yes ; then
-  _def_sol_scsi_h='#define SOLARIS_USCSI 1'
+  def_sol_scsi_h='#define SOLARIS_USCSI 1'
 else
-  _def_sol_scsi_h='#undef SOLARIS_USCSI'
+  def_sol_scsi_h='#undef SOLARIS_USCSI'
 fi
 echores "$_sol_scsi_h"
 fi #if sunos
@@ -3480,16 +3528,16 @@ EOF
   done
 fi
 if test "$_termcap" = yes ; then
-  _def_termcap='#define HAVE_TERMCAP 1'
+  def_termcap='#define HAVE_TERMCAP 1'
   test $_ld_tmp && _res_comment="using $_ld_tmp"
 else
-  _def_termcap='#undef HAVE_TERMCAP'
+  def_termcap='#undef HAVE_TERMCAP'
 fi
 echores "$_termcap"
 
 
 echocheck "termios"
-_def_termios='#undef HAVE_TERMIOS'
+def_termios='#undef HAVE_TERMIOS'
 def_termios_h='#undef HAVE_TERMIOS_H'
 def_termios_sys_h='#undef HAVE_SYS_TERMIOS_H'
 if test "$_termios" = auto ; then
@@ -3504,7 +3552,7 @@ done
 fi
 
 if test "$_termios" = yes ; then
-  _def_termios='#define HAVE_TERMIOS 1'
+  def_termios='#define HAVE_TERMIOS 1'
   if test "$_termios_header" = "termios.h" ; then
     def_termios_h='#define HAVE_TERMIOS_H 1'
   else
@@ -3525,9 +3573,9 @@ EOF
   cc_check && _shm=yes
 fi
 if test "$_shm" = yes ; then
-  _def_shm='#define HAVE_SHM 1'
+  def_shm='#define HAVE_SHM 1'
 else
-  _def_shm='#undef HAVE_SHM'
+  def_shm='#undef HAVE_SHM'
 fi
 echores "$_shm"
 
@@ -3540,10 +3588,10 @@ EOF
 _strsep=no
 cc_check && _strsep=yes
 if test "$_strsep" = yes ; then
- _def_strsep='#define HAVE_STRSEP 1'
+  def_strsep='#define HAVE_STRSEP 1'
  _need_strsep=no
 else
- _def_strsep='#undef HAVE_STRSEP'
+  def_strsep='#undef HAVE_STRSEP'
  _need_strsep=yes
 fi
 echores "$_strsep"
@@ -3559,10 +3607,10 @@ EOF
 _vsscanf=no
 cc_check && _vsscanf=yes
 if test "$_vsscanf" = yes ; then
-  _def_vsscanf='#define HAVE_VSSCANF 1'
+  def_vsscanf='#define HAVE_VSSCANF 1'
   _need_vsscanf=no
 else
-  _def_vsscanf='#undef HAVE_VSSCANF'
+  def_vsscanf='#undef HAVE_VSSCANF'
   _need_vsscanf=yes
 fi
 echores "$_vsscanf"
@@ -3570,17 +3618,17 @@ echores "$_vsscanf"
 
 echocheck "swab()"
 cat > $TMPC << EOF
-#define _XOPEN_SOURCE
+#define _XOPEN_SOURCE 600
 #include <unistd.h>
 int main(void) { swab(0, 0, 0); return 0; }
 EOF
 _swab=no
 cc_check && _swab=yes
 if test "$_swab" = yes ; then
-  _def_swab='#define HAVE_SWAB 1'
+  def_swab='#define HAVE_SWAB 1'
   _need_swab=no
 else
-  _def_swab='#undef HAVE_SWAB'
+  def_swab='#undef HAVE_SWAB'
   _need_swab=yes
 fi
 echores "$_swab"
@@ -3596,18 +3644,18 @@ cat > $TMPC << EOF
 int main(void) {int nfds = 1; fd_set readfds; struct timeval timeout; select(nfds,&readfds,NULL,NULL,&timeout); return 0; }
 EOF
 _posix_select=no
-_def_posix_select='#undef HAVE_POSIX_SELECT'
+def_posix_select='#undef HAVE_POSIX_SELECT'
 #select() of kLIBC (OS/2) supports socket only
 ! os2 && cc_check && _posix_select=yes \
-  && _def_posix_select='#define HAVE_POSIX_SELECT 1'
+  && def_posix_select='#define HAVE_POSIX_SELECT 1'
 echores "$_posix_select"
 
 
 echocheck "audio select()"
 if test "$_select" = no ; then
-  _def_select='#undef HAVE_AUDIO_SELECT'
+  def_select='#undef HAVE_AUDIO_SELECT'
 elif test  "$_select" = yes ; then
-  _def_select='#define HAVE_AUDIO_SELECT 1'
+  def_select='#define HAVE_AUDIO_SELECT 1'
 fi
 echores "$_select"
 
@@ -3621,10 +3669,10 @@ EOF
 _gettimeofday=no
 cc_check && _gettimeofday=yes
 if test "$_gettimeofday" = yes ; then
-  _def_gettimeofday='#define HAVE_GETTIMEOFDAY 1'
+  def_gettimeofday='#define HAVE_GETTIMEOFDAY 1'
   _need_gettimeofday=no
 else
-  _def_gettimeofday='#undef HAVE_GETTIMEOFDAY'
+  def_gettimeofday='#undef HAVE_GETTIMEOFDAY'
   _need_gettimeofday=yes
 fi
 echores "$_gettimeofday"
@@ -3639,10 +3687,10 @@ EOF
 _glob=no
 cc_check && _glob=yes
 if test "$_glob" = yes ; then
-  _def_glob='#define HAVE_GLOB 1'
+  def_glob='#define HAVE_GLOB 1'
   _need_glob=no
 else
-  _def_glob='#undef HAVE_GLOB'
+  def_glob='#undef HAVE_GLOB'
   _need_glob=yes
 fi
 echores "$_glob"
@@ -3656,10 +3704,10 @@ EOF
 _setenv=no
 cc_check && _setenv=yes
 if test "$_setenv" = yes ; then
-  _def_setenv='#define HAVE_SETENV 1'
+  def_setenv='#define HAVE_SETENV 1'
   _need_setenv=no
 else
-  _def_setenv='#undef HAVE_SETENV'
+  def_setenv='#undef HAVE_SETENV'
   _need_setenv=yes
 fi
 echores "$_setenv"
@@ -3674,14 +3722,14 @@ EOF
 _sysi86=no
 cc_check && _sysi86=yes
 if test "$_sysi86" = yes ; then
-  _def_sysi86='#define HAVE_SYSI86 1'
+  def_sysi86='#define HAVE_SYSI86 1'
   cat > $TMPC << EOF
 #include <sys/sysi86.h>
 int main(void) { int sysi86(int, void*); sysi86(0); return 0; }
 EOF
-  cc_check && _def_sysi86_iv='#define HAVE_SYSI86_iv 1'
+  cc_check && def_sysi86_iv='#define HAVE_SYSI86_iv 1'
 else
-  _def_sysi86='#undef HAVE_SYSI86'
+  def_sysi86='#undef HAVE_SYSI86'
 fi
 echores "$_sysi86"
 fi #if sunos
@@ -3728,11 +3776,11 @@ EOF
   if cc_check -framework CoreAudio; then
     _ld_extra="$_ld_extra -framework CoreAudio -framework AudioUnit -framework AudioToolbox"
     _coreaudio=yes
-    _def_coreaudio='#define CONFIG_COREAUDIO 1'
+    def_coreaudio='#define CONFIG_COREAUDIO 1'
     _aomodules="macosx $_aomodules"
   else
     _coreaudio=no
-    _def_coreaudio='#undef CONFIG_COREAUDIO'
+    def_coreaudio='#undef CONFIG_COREAUDIO'
     _noaomodules="macosx $_noaomodules"
   fi
   cat > $TMPC <<EOF
@@ -3748,14 +3796,14 @@ EOF
   if cc_check -framework Carbon -framework QuickTime; then
     _ld_extra="$_ld_extra -framework Carbon -framework QuickTime"
     _quartz=yes
-    _def_quartz='#define CONFIG_QUARTZ 1'
+    def_quartz='#define CONFIG_QUARTZ 1'
     _vomodules="quartz $_vomodules"
-    _def_quicktime='#define CONFIG_QUICKTIME 1'
+    def_quicktime='#define CONFIG_QUICKTIME 1'
   else
     _quartz=no
-    _def_quartz='#undef CONFIG_QUARTZ'
+    def_quartz='#undef CONFIG_QUARTZ'
     _novomodules="quartz $_novomodules"
-    _def_quicktime='#undef CONFIG_QUICKTIME'
+    def_quicktime='#undef CONFIG_QUICKTIME'
   fi
 cat > $TMPC <<EOF
 #include <Carbon/Carbon.h>
@@ -3765,11 +3813,11 @@ EOF
 	if cc_check -framework Carbon -framework QuartzCore -framework OpenGL; then
 		_vomodules="macosx $_vomodules"
 		_ld_extra="$_ld_extra -framework Cocoa -framework QuartzCore -framework OpenGL"
-		_def_corevideo='#define CONFIG_COREVIDEO 1'
+		def_corevideo='#define CONFIG_COREVIDEO 1'
 		_corevideo=yes
 	else
 		_novomodules="macosx $_novomodules"
-		_def_corevideo='#undef CONFIG_COREVIDEO'
+		def_corevideo='#undef CONFIG_COREVIDEO'
 		_corevideo=no
 	fi
 fi
@@ -3780,10 +3828,10 @@ if test "$_macosx_finder" = auto ; then
   _macosx_finder=$_macosx
 fi
 if test "$_macosx_finder" = yes; then
-  _def_macosx_finder='#define CONFIG_MACOSX_FINDER 1'
+  def_macosx_finder='#define CONFIG_MACOSX_FINDER 1'
   _macosx_finder=yes
 else
-  _def_macosx_finder='#undef CONFIG_MACOSX_FINDER'
+  def_macosx_finder='#undef CONFIG_MACOSX_FINDER'
   _macosx_finder=no
 fi
 echores "$_macosx_finder"
@@ -3793,9 +3841,9 @@ if test "$_macosx_bundle" = auto ; then
   _macosx_bundle=$_macosx_finder
 fi
 if test "$_macosx_bundle" = yes; then
-  _def_macosx_bundle='#define CONFIG_MACOSX_BUNDLE 1'
+  def_macosx_bundle='#define CONFIG_MACOSX_BUNDLE 1'
 else
-  _def_macosx_bundle='#undef CONFIG_MACOSX_BUNDLE'
+  def_macosx_bundle='#undef CONFIG_MACOSX_BUNDLE'
   _macosx_bundle=no
 fi
 echores "$_macosx_bundle"
@@ -3830,10 +3878,10 @@ EOF
   cc_check -framework IOKit && tmp_run && _apple_remote=yes
 fi
 if test "$_apple_remote" = yes ; then
-  _def_apple_remote='#define CONFIG_APPLE_REMOTE 1'
+  def_apple_remote='#define CONFIG_APPLE_REMOTE 1'
   _ld_extra="$_ld_extra -framework IOKit"
 else
-  _def_apple_remote='#undef CONFIG_APPLE_REMOTE'
+  def_apple_remote='#undef CONFIG_APPLE_REMOTE'
 fi
 echores "$_apple_remote"
 
@@ -3856,9 +3904,9 @@ EOF
   cc_check && tmp_run && _apple_ir=yes
 fi
 if test "$_apple_ir" = yes ; then
-  _def_apple_ir='#define CONFIG_APPLE_IR 1'
+  def_apple_ir='#define CONFIG_APPLE_IR 1'
 else
-  _def_apple_ir='#undef CONFIG_APPLE_IR'
+  def_apple_ir='#undef CONFIG_APPLE_IR'
 fi
 echores "$_apple_ir"
 fi #if linux
@@ -3893,10 +3941,10 @@ EOF
 fi
 
 if test "$_smb" = yes; then
-    _def_smb="#define CONFIG_LIBSMBCLIENT"
+    def_smb="#define CONFIG_LIBSMBCLIENT"
     _inputmodules="smb $_inputmodules"
 else
-    _def_smb="#undef CONFIG_LIBSMBCLIENT"
+    def_smb="#undef CONFIG_LIBSMBCLIENT"
     _noinputmodules="smb $_noinputmodules"
 fi
 echores "$_smb"
@@ -3909,40 +3957,40 @@ echores "$_smb"
 
 echocheck "tdfxfb"
 if test "$_tdfxfb" = yes ; then
-  _def_tdfxfb='#define CONFIG_TDFXFB 1'
+  def_tdfxfb='#define CONFIG_TDFXFB 1'
   _vomodules="tdfxfb $_vomodules"
 else
-  _def_tdfxfb='#undef CONFIG_TDFXFB'
+  def_tdfxfb='#undef CONFIG_TDFXFB'
   _novomodules="tdfxfb $_novomodules"
 fi
 echores "$_tdfxfb"
 
 echocheck "s3fb"
 if test "$_s3fb" = yes ; then
-  _def_s3fb='#define CONFIG_S3FB 1'
+  def_s3fb='#define CONFIG_S3FB 1'
   _vomodules="s3fb $_vomodules"
 else
-  _def_s3fb='#undef CONFIG_S3FB'
+  def_s3fb='#undef CONFIG_S3FB'
   _novomodules="s3fb $_novomodules"
 fi
 echores "$_s3fb"
 
 echocheck "wii"
 if test "$_wii" = yes ; then
-  _def_wii='#define CONFIG_WII 1'
+  def_wii='#define CONFIG_WII 1'
   _vomodules="wii $_vomodules"
 else
-  _def_wii='#undef CONFIG_WII'
+  def_wii='#undef CONFIG_WII'
   _novomodules="wii $_novomodules"
 fi
 echores "$_wii"
 
 echocheck "tdfxvid"
 if test "$_tdfxvid" = yes ; then
-  _def_tdfxvid='#define CONFIG_TDFX_VID 1'
+  def_tdfxvid='#define CONFIG_TDFX_VID 1'
   _vomodules="tdfx_vid $_vomodules"
 else
-  _def_tdfxvid='#undef CONFIG_TDFX_VID'
+  def_tdfxvid='#undef CONFIG_TDFX_VID'
   _novomodules="tdfx_vid $_novomodules"
 fi
 echores "$_tdfxvid"
@@ -3965,20 +4013,20 @@ EOF
   cc_check && _xvr100=yes
 fi
 if test "$_xvr100" = yes ; then
-  _def_xvr100='#define CONFIG_XVR100 1'
+  def_xvr100='#define CONFIG_XVR100 1'
   _vomodules="xvr100 $_vomodules"
 else
-  _def_tdfxvid='#undef CONFIG_XVR100'
+  def_tdfxvid='#undef CONFIG_XVR100'
   _novomodules="xvr100 $_novomodules"
 fi
 echores "$_xvr100"
 
 echocheck "tga"
 if test "$_tga" = yes ; then
-  _def_tga='#define CONFIG_TGA 1'
+  def_tga='#define CONFIG_TGA 1'
   _vomodules="tga $_vomodules"
 else
-  _def_tga='#undef CONFIG_TGA'
+  def_tga='#undef CONFIG_TGA'
   _novomodules="tga $_novomodules"
 fi
 echores "$_tga"
@@ -3986,10 +4034,10 @@ echores "$_tga"
 
 echocheck "md5sum support"
 if test "$_md5sum" = yes; then
-  _def_md5sum="#define CONFIG_MD5SUM"
+  def_md5sum="#define CONFIG_MD5SUM"
   _vomodules="md5sum $_vomodules"
 else
-  _def_md5sum="#undef CONFIG_MD5SUM"
+  def_md5sum="#undef CONFIG_MD5SUM"
   _novomodules="md5sum $_novomodules"
 fi
 echores "$_md5sum"
@@ -3997,10 +4045,10 @@ echores "$_md5sum"
 
 echocheck "yuv4mpeg support"
 if test "$_yuv4mpeg" = yes; then
-  _def_yuv4mpeg="#define CONFIG_YUV4MPEG"
+  def_yuv4mpeg="#define CONFIG_YUV4MPEG"
   _vomodules="yuv4mpeg $_vomodules"
 else
-  _def_yuv4mpeg="#undef CONFIG_YUV4MPEG"
+  def_yuv4mpeg="#undef CONFIG_YUV4MPEG"
   _novomodules="yuv4mpeg $_novomodules"
 fi
 echores "$_yuv4mpeg"
@@ -4008,10 +4056,10 @@ echores "$_yuv4mpeg"
 
 echocheck "bl"
 if test "$_bl" = yes ; then
-  _def_bl='#define CONFIG_BL 1'
+  def_bl='#define CONFIG_BL 1'
   _vomodules="bl $_vomodules"
 else
-  _def_bl='#undef CONFIG_BL'
+  def_bl='#undef CONFIG_BL'
   _novomodules="bl $_novomodules"
 fi
 echores "$_bl"
@@ -4049,11 +4097,11 @@ EOF
     _dfb_micro=`echo $_directfb_version | cut -d . -f 3`
     _dfb_version=`dfb_version $_dfb_major $_dfb_minor $_dfb_micro`
     if test "$_dfb_version" -ge `dfb_version 0 9 13`; then
-      _def_directfb_version="#define DIRECTFBVERSION $_dfb_version"
+      def_directfb_version="#define DIRECTFBVERSION $_dfb_version"
       _res_comment="$_directfb_version"
       test "$_dfb_version" -ge `dfb_version 0 9 15` && _dfbmga=yes
     else
-      _def_directfb_version='#undef DIRECTFBVERSION'
+      def_directfb_version='#undef DIRECTFBVERSION'
       _directfb=no
       _res_comment="version >=0.9.13 required"
     fi
@@ -4065,19 +4113,19 @@ fi
 echores "$_directfb"
 
 if test "$_directfb" = yes ; then
-  _def_directfb='#define CONFIG_DIRECTFB 1'
+  def_directfb='#define CONFIG_DIRECTFB 1'
   _vomodules="directfb $_vomodules"
   _libs_mplayer="$_libs_mplayer -ldirectfb"
 else
-  _def_directfb='#undef CONFIG_DIRECTFB'
+  def_directfb='#undef CONFIG_DIRECTFB'
   _novomodules="directfb $_novomodules"
 fi
 if test "$_dfbmga" = yes; then
   _vomodules="dfbmga $_vomodules"
-  _def_dfbmga='#define CONFIG_DFBMGA 1'
+  def_dfbmga='#define CONFIG_DFBMGA 1'
 else
   _novomodules="dfbmga $_novomodules"
-  _def_dfbmga='#undef CONFIG_DFBMGA'
+  def_dfbmga='#undef CONFIG_DFBMGA'
 fi
 
 
@@ -4123,11 +4171,11 @@ EOF
   done
 fi
 if test "$_x11" = yes ; then
-  _def_x11='#define CONFIG_X11 1'
+  def_x11='#define CONFIG_X11 1'
   _vomodules="x11 xover $_vomodules"
 else
   _x11=no
-  _def_x11='#undef CONFIG_X11'
+  def_x11='#undef CONFIG_X11'
   _novomodules="x11 $_novomodules"
   _res_comment="check if the dev(el) packages are installed"
   # disable stuff that depends on X
@@ -4146,10 +4194,10 @@ EOF
   cc_check -lXss && _xss=yes
 fi
 if test "$_xss" = yes ; then
-  _def_xss='#define CONFIG_XSS 1'
+  def_xss='#define CONFIG_XSS 1'
   _libs_mplayer="$_libs_mplayer -lXss"
 else
-  _def_xss='#undef CONFIG_XSS'
+  def_xss='#undef CONFIG_XSS'
 fi
 echores "$_xss"
 
@@ -4174,16 +4222,16 @@ EOF
   cc_check -lXext && _xdpms4=yes
 fi
 if test "$_xdpms4" = yes ; then
-  _def_xdpms='#define CONFIG_XDPMS 1'
+  def_xdpms='#define CONFIG_XDPMS 1'
   _res_comment="using Xdpms 4"
   echores "yes"
 elif test "$_xdpms3" = yes ; then
-  _def_xdpms='#define CONFIG_XDPMS 1'
+  def_xdpms='#define CONFIG_XDPMS 1'
   _libs_mplayer="$_libs_mplayer -lXdpms"
   _res_comment="using Xdpms 3"
   echores "yes"
 else