cosmetics: Drop leading underscore from extra_ variables.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29057 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 194 insertions, 194 deletions

diff --git a/configure b/configure
index efc054778a..d3d2026789 100755
--- a/configure
+++ b/configure
@@ -61,9 +61,9 @@ compile_check() {
   echo >> "$TMPLOG"
   cat "$1" >> "$TMPLOG"
   echo >> "$TMPLOG"
-  echo "$_cc $CFLAGS $_extra_cflags $_ld_static $_extra_ldflags $_libs_mplayer $_libs_mencoder -o $TMPEXE $@" >> "$TMPLOG"
+  echo "$_cc $CFLAGS $extra_cflags $_ld_static $extra_ldflags $libs_mplayer $libs_mencoder -o $TMPEXE $@" >> "$TMPLOG"
   rm -f "$TMPEXE"
-  $_cc $CFLAGS $_extra_cflags $_ld_static $_extra_ldflags $_libs_mplayer $_libs_mencoder -o "$TMPEXE" "$@" >> "$TMPLOG" 2>&1
+  $_cc $CFLAGS $extra_cflags $_ld_static $extra_ldflags $libs_mplayer $libs_mencoder -o "$TMPEXE" "$@" >> "$TMPLOG" 2>&1
   TMP="$?"
   echo >> "$TMPLOG"
   echo >> "$TMPLOG"
@@ -795,19 +795,19 @@ for ac_option do
     ;;
 
   --extra-cflags=*)
-    _extra_cflags=`echo $ac_option | cut -d '=' -f 2`
+    extra_cflags=`echo $ac_option | cut -d '=' -f 2`
     ;;
   --extra-ldflags=*)
-    _extra_ldflags=`echo $ac_option | cut -d '=' -f 2`
+    extra_ldflags=`echo $ac_option | cut -d '=' -f 2`
     ;;
   --extra-libs=*)
-    _extra_libs=`echo $ac_option | cut -d '=' -f 2`
+    extra_libs=`echo $ac_option | cut -d '=' -f 2`
     ;;
   --extra-libs-mplayer=*)
-    _libs_mplayer=`echo $ac_option | cut -d '=' -f 2`
+    libs_mplayer=`echo $ac_option | cut -d '=' -f 2`
     ;;
   --extra-libs-mencoder=*)
-    _libs_mencoder=`echo $ac_option | cut -d '=' -f 2`
+    libs_mencoder=`echo $ac_option | cut -d '=' -f 2`
     ;;
 
   --target=*)
@@ -1411,27 +1411,27 @@ if test "$_runtime_cpudetection" = yes && ! x86 && ! ppc; then
 fi
 
 
-_extra_cflags="-I. $_extra_cflags"
+extra_cflags="-I. $extra_cflags"
 _timer=timer-linux.c
 _getch=getch2.c
 if freebsd ; then
-  _extra_ldflags="$_extra_ldflags -L/usr/local/lib"
-  _extra_cflags="$_extra_cflags -I/usr/local/include"
+  extra_ldflags="$extra_ldflags -L/usr/local/lib"
+  extra_cflags="$extra_cflags -I/usr/local/include"
 fi
 
 if netbsd || dragonfly ; then
-  _extra_ldflags="$_extra_ldflags -L/usr/pkg/lib"
-  _extra_cflags="$_extra_cflags -I/usr/pkg/include"
+  extra_ldflags="$extra_ldflags -L/usr/pkg/lib"
+  extra_cflags="$extra_cflags -I/usr/pkg/include"
 fi
 
 if darwin; then
-  _extra_ldflags="$_extra_ldflags -L/usr/local/lib"
-  _extra_cflags="$_extra_cflags -I/usr/local/include"
+  extra_ldflags="$extra_ldflags -L/usr/local/lib"
+  extra_cflags="$extra_cflags -I/usr/local/include"
   _timer=timer-darwin.c
 fi
 
 if aix ; then
-  _extra_ldflags="$_extra_ldflags -lC"
+  extra_ldflags="$extra_ldflags -lC"
 fi
 
 if irix ; then
@@ -1443,7 +1443,7 @@ fi
 if win32 ; then
   _exesuf=".exe"
   # -lwinmm is always needed for osdep/timer-win2.c
-  _extra_ldflags="$_extra_ldflags -lwinmm"
+  extra_ldflags="$extra_ldflags -lwinmm"
   _pe_executable=yes
   _timer=timer-win2.c
   _priority=yes
@@ -1464,7 +1464,7 @@ if amigaos ; then
 fi
 
 if qnx ; then
-  _extra_ldflags="$_extra_ldflags -lph"
+  extra_ldflags="$extra_ldflags -lph"
 fi
 
 if os2 ; then
@@ -2406,19 +2406,19 @@ elif test -z "$CFLAGS" ; then
     CFLAGS="-O2 $_march $_mcpu $_pipe"
   else
     CFLAGS="-Wall -Wno-switch -Wpointer-arith -Wredundant-decls -O4 $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer"
-    _extra_ldflags="$_extra_ldflags -ffast-math"
+    extra_ldflags="$extra_ldflags -ffast-math"
   fi
 else
   _warn_CFLAGS=yes
 fi
 if test -n "$LDFLAGS" ; then
-  _extra_ldflags="$_extra_ldflags $LDFLAGS"
+  extra_ldflags="$extra_ldflags $LDFLAGS"
   _warn_CFLAGS=yes
 elif test "$cc_vendor" = "intel" ; then
-  _extra_ldflags="$_extra_ldflags -i-static"
+  extra_ldflags="$extra_ldflags -i-static"
 fi
 if test -n "$CPPFLAGS" ; then
-  _extra_cflags="$_extra_cflags $CPPFLAGS"
+  extra_cflags="$extra_cflags $CPPFLAGS"
   _warn_CFLAGS=yes
 fi
 
@@ -2719,7 +2719,7 @@ cat > $TMPC <<EOF
 int main(void) { return 0; }
 EOF
 if cc_check -lposix ; then
-  _extra_ldflags="$_extra_ldflags -lposix"
+  extra_ldflags="$extra_ldflags -lposix"
   echores "yes"
 else
   echores "no"
@@ -2859,7 +2859,7 @@ _kstat=no
 cc_check -lkstat && _kstat=yes
 if test "$_kstat" = yes ; then
   def_kstat="#define HAVE_LIBKSTAT 1"
-  _extra_ldflags="$_extra_ldflags -lkstat"
+  extra_ldflags="$extra_ldflags -lkstat"
 else
   def_kstat="#undef HAVE_LIBKSTAT"
 fi
@@ -2875,7 +2875,7 @@ EOF
 _posix4=no
 cc_check -lposix4 && _posix4=yes
 if test "$_posix4" = yes ; then
-  _extra_ldflags="$_extra_ldflags -lposix4"
+  extra_ldflags="$extra_ldflags -lposix4"
 fi
 echores "$_posix4"
 
@@ -3046,7 +3046,7 @@ 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'
-  _extra_ldflags="$_extra_ldflags $_ld_sock"
+  extra_ldflags="$extra_ldflags $_ld_sock"
   _inputmodules="network $_inputmodules"
 else
   _noinputmodules="network $_noinputmodules"
@@ -3333,10 +3333,10 @@ echores "$_w32threads"
 echocheck "rpath"
 netbsd &&_rpath=yes
 if test "$_rpath" = yes ; then
-  for I in `echo $_extra_ldflags | sed 's/-L//g'` ; do
+  for I in `echo $extra_ldflags | sed 's/-L//g'` ; do
     tmp="$tmp ` echo $I | sed 's/.*/ -L& -Wl,-R&/'`"
   done
-_extra_ldflags=$tmp
+extra_ldflags=$tmp
 fi
 echores "$_rpath"
 
@@ -3376,7 +3376,7 @@ int main(void) {
 EOF
   _iconv=no
   for _ld_tmp in "" "-liconv" "-liconv $_ld_dl" ; do
-    cc_check $_ld_lm $_ld_tmp && _extra_ldflags="$_extra_ldflags $_ld_tmp" && \
+    cc_check $_ld_lm $_ld_tmp && extra_ldflags="$extra_ldflags $_ld_tmp" && \
       _iconv=yes && break
   done
 fi
@@ -3537,7 +3537,7 @@ int main(void) { tgetent(NULL, NULL); return 0; }
 EOF
   _termcap=no
   for _ld_tmp in "-lncurses" "-ltinfo" "-ltermcap"; do
-    cc_check $_ld_tmp && _extra_ldflags="$_extra_ldflags $_ld_tmp" \
+    cc_check $_ld_tmp && extra_ldflags="$extra_ldflags $_ld_tmp" \
       && _termcap=yes && break
   done
 fi
@@ -3788,7 +3788,7 @@ if test "$_macosx" = yes ; then
 int main(void) { return 0; }
 EOF
   if cc_check -framework CoreAudio; then
-    _extra_ldflags="$_extra_ldflags -framework CoreAudio -framework AudioUnit -framework AudioToolbox"
+    extra_ldflags="$extra_ldflags -framework CoreAudio -framework AudioUnit -framework AudioToolbox"
     _coreaudio=yes
     def_coreaudio='#define CONFIG_COREAUDIO 1'
     _aomodules="macosx $_aomodules"
@@ -3808,7 +3808,7 @@ int main(void) {
 }
 EOF
   if cc_check -framework Carbon -framework QuickTime; then
-    _extra_ldflags="$_extra_ldflags -framework Carbon -framework QuickTime"
+    extra_ldflags="$extra_ldflags -framework Carbon -framework QuickTime"
     _quartz=yes
     def_quartz='#define CONFIG_QUARTZ 1'
     _vomodules="quartz $_vomodules"
@@ -3826,7 +3826,7 @@ int main(void) { return 0; }
 EOF
 	if cc_check -framework Carbon -framework QuartzCore -framework OpenGL; then
 		_vomodules="macosx $_vomodules"
-		_extra_ldflags="$_extra_ldflags -framework Cocoa -framework QuartzCore -framework OpenGL"
+		extra_ldflags="$extra_ldflags -framework Cocoa -framework QuartzCore -framework OpenGL"
 		def_corevideo='#define CONFIG_COREVIDEO 1'
 		_corevideo=yes
 	else
@@ -3893,7 +3893,7 @@ EOF
 fi
 if test "$_apple_remote" = yes ; then
   def_apple_remote='#define CONFIG_APPLE_REMOTE 1'
-  _extra_ldflags="$_extra_ldflags -framework IOKit"
+  extra_ldflags="$extra_ldflags -framework IOKit"
 else
   def_apple_remote='#undef CONFIG_APPLE_REMOTE'
 fi
@@ -3940,7 +3940,7 @@ fi
 
 echocheck "Samba support (libsmbclient)"
 if test "$_smb" = yes; then
-  _extra_ldflags="$_extra_ldflags -lsmbclient"
+  extra_ldflags="$extra_ldflags -lsmbclient"
 fi
 if test "$_smb" = auto; then
     _smb=no
@@ -3949,7 +3949,7 @@ if test "$_smb" = auto; then
 int main(void) { smbc_opendir("smb://"); return 0; }
 EOF
   for _ld_tmp in "-lsmbclient" "-lsmbclient $_ld_dl" "-lsmbclient $_ld_dl -lnsl" "-lsmbclient $_ld_dl -lssl -lnsl" ; do
-    cc_check $_ld_tmp && _extra_ldflags="$_extra_ldflags $_ld_tmp" && \
+    cc_check $_ld_tmp && extra_ldflags="$extra_ldflags $_ld_tmp" && \
       _smb=yes && break
   done
 fi
@@ -4089,7 +4089,7 @@ EOF
   for _inc_tmp in "" -I/usr/local/include/directfb \
       -I/usr/include/directfb -I/usr/local/include; do
     cc_check $_inc_tmp -ldirectfb && _directfb=yes && \
-      _extra_cflags="$_extra_cflags $_inc_tmp" && break
+      extra_cflags="$extra_cflags $_inc_tmp" && break
   done
 fi
 
@@ -4104,7 +4104,7 @@ int
 dfb_ver = DIRECTFB_MAJOR_VERSION.DIRECTFB_MINOR_VERSION.DIRECTFB_MICRO_VERSION
 ;
 EOF
-  if $_cc -E $TMPC $_extra_cflags > "$TMPEXE"; then
+  if $_cc -E $TMPC $extra_cflags > "$TMPEXE"; then
     _directfb_version=`sed -n 's/^dfb_ver[^0-9]*\(.*\)/\1/p' "$TMPEXE" | tr -d '()'`
     _dfb_major=`echo $_directfb_version | cut -d . -f 1`
     _dfb_minor=`echo $_directfb_version | cut -d . -f 2`
@@ -4129,7 +4129,7 @@ echores "$_directfb"
 if test "$_directfb" = yes ; then
   def_directfb='#define CONFIG_DIRECTFB 1'
   _vomodules="directfb $_vomodules"
-  _libs_mplayer="$_libs_mplayer -ldirectfb"
+  libs_mplayer="$libs_mplayer -ldirectfb"
 else
   def_directfb='#undef CONFIG_DIRECTFB'
   _novomodules="directfb $_novomodules"
@@ -4146,7 +4146,7 @@ fi
 echocheck "X11 headers presence"
   _x11_headers="no"
   _res_comment="check if the dev(el) packages are installed"
-  for I in `echo $_extra_cflags | sed s/-I//g` /usr/include ; do
+  for I in `echo $extra_cflags | sed s/-I//g` /usr/include ; do
     if test -f "$I/X11/Xlib.h" ; then
       _x11_headers="yes"
       _res_comment=""
@@ -4157,7 +4157,7 @@ echocheck "X11 headers presence"
     for I in /usr/X11/include /usr/X11R7/include /usr/X11R6/include \
              /usr/include/X11R6 /usr/openwin/include ; do
       if test -f "$I/X11/Xlib.h" ; then
-        _extra_cflags="$_extra_cflags -I$I"
+        extra_cflags="$extra_cflags -I$I"
         _x11_headers="yes"
         _res_comment="using $I"
         break
@@ -4182,7 +4182,7 @@ EOF
     else
       _ld_tmp="$I -lXext -lX11 $_ld_pthread"
     fi
-    cc_check $_ld_tmp && _libs_mplayer="$_libs_mplayer $_ld_tmp" \
+    cc_check $_ld_tmp && libs_mplayer="$libs_mplayer $_ld_tmp" \
                       && _x11=yes && break
   done
 fi
@@ -4211,7 +4211,7 @@ EOF
 fi
 if test "$_xss" = yes ; then
   def_xss='#define CONFIG_XSS 1'
-  _libs_mplayer="$_libs_mplayer -lXss"
+  libs_mplayer="$libs_mplayer -lXss"
 else
   def_xss='#undef CONFIG_XSS'
 fi
@@ -4243,7 +4243,7 @@ if test "$_xdpms4" = yes ; then
   echores "yes"
 elif test "$_xdpms3" = yes ; then
   def_xdpms='#define CONFIG_XDPMS 1'
-  _libs_mplayer="$_libs_mplayer -lXdpms"
+  libs_mplayer="$libs_mplayer -lXdpms"
   _res_comment="using Xdpms 3"
   echores "yes"
 else
@@ -4268,7 +4268,7 @@ fi
 
 if test "$_xv" = yes ; then
   def_xv='#define CONFIG_XV 1'
-  _libs_mplayer="$_libs_mplayer -lXv"
+  libs_mplayer="$libs_mplayer -lXv"
   _vomodules="xv $_vomodules"
 else
   def_xv='#undef CONFIG_XV'
@@ -4295,7 +4295,7 @@ EOF
 fi
 if test "$_xvmc" = yes ; then
   def_xvmc='#define CONFIG_XVMC 1'
-  _libs_mplayer="$_libs_mplayer -lXvMC -l$_xvmclib"
+  libs_mplayer="$libs_mplayer -lXvMC -l$_xvmclib"
   _vomodules="xvmc $_vomodules"
   _res_comment="using $_xvmclib"
 else
@@ -4341,7 +4341,7 @@ fi
 
 if test "$_xinerama" = yes ; then
   def_xinerama='#define CONFIG_XINERAMA 1'
-  _libs_mplayer="$_libs_mplayer -lXinerama"
+  libs_mplayer="$libs_mplayer -lXinerama"
 else
   def_xinerama='#undef CONFIG_XINERAMA'
 fi
@@ -4365,7 +4365,7 @@ EOF
 fi
 if test "$_vm" = yes ; then
   def_vm='#define CONFIG_XF86VM 1'
-  _libs_mplayer="$_libs_mplayer -lXxf86vm"
+  libs_mplayer="$libs_mplayer -lXxf86vm"
 else
   def_vm='#undef CONFIG_XF86VM'
 fi
@@ -4427,7 +4427,7 @@ elif test "$_dga2" = yes ; then
 fi
 if test "$_dga" = yes ; then
   def_dga='#define CONFIG_DGA 1'
-  _libs_mplayer="$_libs_mplayer -lXxf86dga"
+  libs_mplayer="$libs_mplayer -lXxf86dga"
   _vomodules="dga $_vomodules"
 else
   _novomodules="dga $_novomodules"
@@ -4472,14 +4472,14 @@ EOF
   _gl=no
   if cc_check -lGL $_ld_lm ; then
     _gl=yes
-    _libs_mplayer="$_libs_mplayer -lGL $_ld_dl"
+    libs_mplayer="$libs_mplayer -lGL $_ld_dl"
   elif cc_check -lGL $_ld_lm $_ld_pthread ; then
     _gl=yes
-    _libs_mplayer="$_libs_mplayer -lGL $_ld_pthread $_ld_dl"
+    libs_mplayer="$libs_mplayer -lGL $_ld_pthread $_ld_dl"
   elif cc_check -DGL_WIN32 -lopengl32 ; then
     _gl=yes
     _gl_win32=yes
-    _libs_mplayer="$_libs_mplayer -lopengl32 -lgdi32"
+    libs_mplayer="$libs_mplayer -lopengl32 -lgdi32"
   fi
 else
   _gl=no
@@ -4578,7 +4578,7 @@ fi
 if test "$_vidix" = yes && win32; then
   winvidix=yes
   _vomodules="winvidix $_vomodules"
-  _libs_mplayer="$_libs_mplayer -lgdi32"
+  libs_mplayer="$libs_mplayer -lgdi32"
 else
   _novomodules="winvidix $_novomodules"
 fi
@@ -4630,7 +4630,7 @@ EOF
 fi
 if test "$_ggi" = yes ; then
   def_ggi='#define CONFIG_GGI 1'
-  _libs_mplayer="$_libs_mplayer -lggi"
+  libs_mplayer="$libs_mplayer -lggi"
   _vomodules="ggi $_vomodules"
 else
   def_ggi='#undef CONFIG_GGI'
@@ -4652,7 +4652,7 @@ fi
 # like --disable-ggi --enable-ggiwmh
 if test "$_ggi" = yes && test "$_ggiwmh" = yes ; then
   def_ggiwmh='#define CONFIG_GGIWMH 1'
-  _libs_mplayer="$_libs_mplayer -lggiwmh"
+  libs_mplayer="$libs_mplayer -lggiwmh"
 else
   _ggiwmh=no
   def_ggiwmh='#undef CONFIG_GGIWMH'
@@ -4677,13 +4677,13 @@ return 0; }
 EOF
   _aa=no
   for _ld_tmp in "-laa" ; do
-    cc_check $_ld_tmp && _libs_mplayer="$_libs_mplayer $_ld_tmp" && _aa=yes && break
+    cc_check $_ld_tmp && libs_mplayer="$libs_mplayer $_ld_tmp" && _aa=yes && break
   done
 fi
 if test "$_aa" = yes ; then
   def_aa='#define CONFIG_AA 1'
   if cygwin ; then
-    _libs_mplayer="$_libs_mplayer `aalib-config --libs | cut -d " " -f 2,5,6`"
+    libs_mplayer="$libs_mplayer `aalib-config --libs | cut -d " " -f 2,5,6`"
   fi
   _vomodules="aa $_vomodules"
 else
@@ -4709,8 +4709,8 @@ EOF
 fi
 if test "$_caca" = yes ; then
   def_caca='#define CONFIG_CACA 1'
-  _extra_cflags="$_extra_cflags `caca-config --cflags`"
-  _libs_mplayer="$_libs_mplayer `caca-config --libs`"
+  extra_cflags="$extra_cflags `caca-config --cflags`"
+  libs_mplayer="$libs_mplayer `caca-config --libs`"
   _vomodules="caca $_vomodules"
 else
   def_caca='#undef CONFIG_CACA'
@@ -4730,7 +4730,7 @@ EOF
 fi
 if test "$_svga" = yes ; then
   def_svga='#define CONFIG_SVGALIB 1'
-  _libs_mplayer="$_libs_mplayer -lvga"
+  libs_mplayer="$libs_mplayer -lvga"
   _vomodules="svga $_vomodules"
 else
   def_svga='#undef CONFIG_SVGALIB'
@@ -4773,7 +4773,7 @@ int main(void) {return 0;}
 EOF
   for _inc_tmp in "" "-I/usr/src/DVB/ost/include" ; do
     cc_check $_inc_tmp && _dvb=yes && \
-     _extra_cflags="$_extra_cflags $_inc_tmp" && break
+     extra_cflags="$extra_cflags $_inc_tmp" && break
   done
 fi
 echores "$_dvb"
@@ -4802,7 +4802,7 @@ int main(void) {return 0;}
 EOF
   for _inc_tmp in "" "-I/usr/src/DVB/include" ; do
     cc_check $_inc_tmp && _dvbhead=yes && \
-      _extra_cflags="$_extra_cflags $_inc_tmp" && break
+      extra_cflags="$extra_cflags $_inc_tmp" && break
   done
 fi
 echores "$_dvbhead"
@@ -4862,7 +4862,7 @@ fi
 echores "$_png"
 if test "$_png" = yes ; then
   def_png='#define CONFIG_PNG 1'
-  _extra_ldflags="$_extra_ldflags -lpng -lz"
+  extra_ldflags="$extra_ldflags -lpng -lz"
   _vomodules="png $_vomodules"
 else
   def_png='#undef CONFIG_PNG'
@@ -4886,7 +4886,7 @@ fi
 echores "$_mng"
 if test "$_mng" = yes ; then
   def_mng='#define CONFIG_MNG 1'
-  _extra_ldflags="$_extra_ldflags -lmng -lz"
+  extra_ldflags="$extra_ldflags -lmng -lz"
 else
   def_mng='#undef CONFIG_MNG'
 fi
@@ -4913,7 +4913,7 @@ echores "$_jpeg"
 if test "$_jpeg" = yes ; then
   def_jpeg='#define CONFIG_JPEG 1'
   _vomodules="jpeg $_vomodules"
-  _extra_ldflags="$_extra_ldflags -ljpeg"
+  extra_ldflags="$extra_ldflags -ljpeg"
 else
   def_jpeg='#undef CONFIG_JPEG'
   _novomodules="jpeg $_novomodules"
@@ -4973,7 +4973,7 @@ if test "$_gif" = yes ; then
   _vomodules="gif89a $_vomodules"
   _res_comment="old version, some encoding functions disabled"
   def_gif_4='#undef CONFIG_GIF_4'
-  _extra_ldflags="$_extra_ldflags $_ld_gif"
+  extra_ldflags="$extra_ldflags $_ld_gif"
 
   cat > $TMPC << EOF
 #include <signal.h>
@@ -5032,7 +5032,7 @@ EOF
 fi
 if test "$_vesa" = yes ; then
   def_vesa='#define CONFIG_VESA 1'
-  _libs_mplayer="$_libs_mplayer -lvbe -llrmi"
+  libs_mplayer="$libs_mplayer -lvbe -llrmi"
   _vomodules="vesa $_vomodules"
 else
   def_vesa='#undef CONFIG_VESA'
@@ -5081,14 +5081,14 @@ fi
 if test "$_sdl" = yes ; then
   def_sdl='#define CONFIG_SDL 1'
   if cygwin ; then
-    _libs_mplayer="$_libs_mplayer `$_sdlconfig --libs | cut -d " " -f 1,4,6 | sed s/no-cygwin/cygwin/`"
-    _extra_cflags="$_extra_cflags `$_sdlconfig --cflags | cut -d " " -f 1,5,6 | sed s/no-cygwin/cygwin/`"
+    libs_mplayer="$libs_mplayer `$_sdlconfig --libs | cut -d " " -f 1,4,6 | sed s/no-cygwin/cygwin/`"
+    extra_cflags="$extra_cflags `$_sdlconfig --cflags | cut -d " " -f 1,5,6 | sed s/no-cygwin/cygwin/`"
   elif mingw32 ; then
-    _libs_mplayer="$_libs_mplayer `$_sdlconfig --libs | sed -e s/-mwindows// -e s/-lmingw32//`"
-    _extra_cflags="$_extra_cflags `$_sdlconfig --cflags | sed s/-Dmain=SDL_main//`"
+    libs_mplayer="$libs_mplayer `$_sdlconfig --libs | sed -e s/-mwindows// -e s/-lmingw32//`"
+    extra_cflags="$extra_cflags `$_sdlconfig --cflags | sed s/-Dmain=SDL_main//`"
   else
-    _libs_mplayer="$_libs_mplayer `$_sdlconfig --libs`"
-    _extra_cflags="$_extra_cflags `$_sdlconfig --cflags | sed s/-D_GNU_SOURCE=1//`"
+    libs_mplayer="$libs_mplayer `$_sdlconfig --libs`"
+    extra_cflags="$extra_cflags `$_sdlconfig --cflags | sed s/-D_GNU_SOURCE=1//`"
   fi
   _vomodules="sdl $_vomodules"
   _aomodules="sdl $_aomodules"
@@ -5114,7 +5114,7 @@ EOF
 fi
 if test "$_kva" = yes ; then
   def_kva='#define CONFIG_KVA 1'
-  _libs_mplayer="$_libs_mplayer -lkva"
+  libs_mplayer="$libs_mplayer -lkva"
   _vomodules="kva $_vomodules"
 else
   def_kva='#undef CONFIG_KVA'
@@ -5138,7 +5138,7 @@ EOF
 fi
 if test "$_win32waveout" = yes ; then
   def_win32waveout='#define CONFIG_WIN32WAVEOUT 1'
-  _libs_mplayer="$_libs_mplayer -lwinmm"
+  libs_mplayer="$libs_mplayer -lwinmm"
   _aomodules="win32 $_aomodules"
 else
   def_win32waveout='#undef CONFIG_WIN32WAVEOUT'
@@ -5158,7 +5158,7 @@ EOF
 fi
 if test "$_direct3d" = yes ; then
   def_direct3d='#define CONFIG_DIRECT3D 1'
-  _libs_mplayer="$_libs_mplayer -ld3d9"
+  libs_mplayer="$libs_mplayer -ld3d9"
   _vomodules="direct3d $_vomodules"
 else
   def_direct3d='#undef CONFIG_DIRECT3D'
@@ -5179,7 +5179,7 @@ EOF
 fi
 if test "$_directx" = yes ; then
   def_directx='#define CONFIG_DIRECTX 1'
-  _libs_mplayer="$_libs_mplayer -lgdi32"
+  libs_mplayer="$libs_mplayer -lgdi32"
   _vomodules="directx $_vomodules"
   _aomodules="dsound $_aomodules"
 else
@@ -5201,7 +5201,7 @@ int main(void) { return 0; }
 EOF
   for _inc_tmp in "" -I/usr/local/include/dxr2 -I/usr/include/dxr2; do
     cc_check $_inc_tmp && _dxr2=yes && \
-     _extra_cflags="$_extra_cflags $_inc_tmp" && break
+     extra_cflags="$extra_cflags $_inc_tmp" && break
   done
 fi
 if test "$_dxr2" = yes; then
@@ -5336,7 +5336,7 @@ EOF
        def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/dsp"'
      elif netbsd || openbsd ; then
        def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/sound"'
-       _extra_ldflags="$_extra_ldflags -lossaudio"
+       extra_ldflags="$extra_ldflags -lossaudio"
      else
        def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/dsp"'
      fi
@@ -5368,8 +5368,8 @@ fi
 if test "$_arts" = yes ; then
   def_arts='#define CONFIG_ARTS 1'
   _aomodules="arts $_aomodules"
-  _libs_mplayer="$_libs_mplayer `artsc-config --libs`"
-  _extra_cflags="$_extra_cflags `artsc-config --cflags`"
+  libs_mplayer="$libs_mplayer `artsc-config --libs`"
+  extra_cflags="$extra_cflags `artsc-config --cflags`"
 else
   _noaomodules="arts $_noaomodules"
 fi
@@ -5394,8 +5394,8 @@ echores "$_esd"
 if test "$_esd" = yes ; then
   def_esd='#define CONFIG_ESD 1'
   _aomodules="esd $_aomodules"
-  _libs_mplayer="$_libs_mplayer `esd-config --libs`"
-  _extra_cflags="$_extra_cflags `esd-config --cflags`"
+  libs_mplayer="$libs_mplayer `esd-config --libs`"
+  extra_cflags="$extra_cflags `esd-config --cflags`"
 
   echocheck "esd_get_latency()"
   cat > $TMPC << EOF
@@ -5422,7 +5422,7 @@ EOF
 fi
 if test "$_nas" = yes ; then
   def_nas='#define CONFIG_NAS 1'
-  _libs_mplayer="$_libs_mplayer -laudio -lXt"
+  libs_mplayer="$libs_mplayer -laudio -lXt"
   _aomodules="nas $_aomodules"
 else
   _noaomodules="nas $_noaomodules"
@@ -5449,8 +5449,8 @@ echores "$_pulse"
 if test "$_pulse" = yes ; then
   def_pulse='#define CONFIG_PULSE 1'
   _aomodules="pulse $_aomodules"
-  _libs_mplayer="$_libs_mplayer `$_pkg_config --libs libpulse`"
-  _extra_cflags="$_extra_cflags `$_pkg_config --cflags libpulse`"
+  libs_mplayer="$libs_mplayer `$_pkg_config --libs libpulse`"
+  extra_cflags="$extra_cflags `$_pkg_config --cflags libpulse`"
 else
   def_pulse='#undef CONFIG_PULSE'
   _noaomodules="pulse $_noaomodules"
@@ -5466,10 +5466,10 @@ cat > $TMPC << EOF
 int main(void) { jack_client_open("test", JackUseExactName, NULL); return 0; }
 EOF
   if cc_check -ljack ; then
-    _libs_mplayer="$_libs_mplayer -ljack"
+    libs_mplayer="$libs_mplayer -ljack"
   elif cc_check `$_pkg_config --libs --cflags --silence-errors jack` ; then
-    _libs_mplayer="$_libs_mplayer `$_pkg_config --libs jack`"
-    _extra_cflags="$_extra_cflags "`$_pkg_config --cflags jack`""
+    libs_mplayer="$libs_mplayer `$_pkg_config --libs jack`"
+    extra_cflags="$extra_cflags "`$_pkg_config --cflags jack`""
   else
     _jack=no
   fi
@@ -5502,7 +5502,7 @@ EOF
     cc_check $I && _openal=yes && break
     cc_check -DOPENAL_AL_H=1 $I && def_openal_h='#define OPENAL_AL_H 1' && _openal=yes && break
   done
-  test "$_openal" = yes && _libs_mplayer="$_libs_mplayer $I"
+  test "$_openal" = yes && libs_mplayer="$libs_mplayer $I"
 fi
 if test "$_openal" = yes ; then
   def_openal='#define CONFIG_OPENAL 1'
@@ -5613,7 +5613,7 @@ if test "$_alsaver" ; then
     _alsa=no
     _res_comment="unknown version"
   fi
-  _extra_ldflags="$_extra_ldflags -lasound $_ld_dl $_ld_pthread"
+  extra_ldflags="$extra_ldflags -lasound $_ld_dl $_ld_pthread"
 else
   _noaomodules="alsa $_noaomodules"
 fi
@@ -5668,7 +5668,7 @@ EOF
 fi
 if test "$_sgiaudio" = "yes" ; then
   def_sgiaudio='#define CONFIG_SGI_AUDIO 1'
-  _libs_mplayer="$_libs_mplayer -laudio"
+  libs_mplayer="$libs_mplayer -laudio"
   _aomodules="sgi $_aomodules"
 else
   def_sgiaudio='#undef CONFIG_SGI_AUDIO'
@@ -5691,7 +5691,7 @@ EOF
 fi
 if test "$_dart" = yes ; then
   def_dart='#define CONFIG_DART 1'
-  _libs_mplayer="$_libs_mplayer -ldart"
+  libs_mplayer="$libs_mplayer -ldart"
   _aomodules="dart $_aomodules"
 else
   def_dart='#undef CONFIG_DART'
@@ -5754,7 +5754,7 @@ if test "$_dvdread_internal" = auto ; then
      || darwin || win32 || os2; then
     _dvdread_internal=yes
     _dvdread=yes
-    _extra_cflags="$_extra_cflags -Ilibdvdread4"
+    extra_cflags="$extra_cflags -Ilibdvdread4"
   fi
 elif test "$_dvdread" = auto ; then
   _dvdread=no
@@ -5773,8 +5773,8 @@ EOF
   if cc_check -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
     $_dvdreadcflags $_dvdreadlibs $_ld_dl ; then
     _dvdread=yes
-    _extra_cflags="$_extra_cflags $_dvdreadcflags"
-    _extra_ldflags="$_extra_ldflags $_dvdreadlibs"
+    extra_cflags="$extra_cflags $_dvdreadcflags"
+    extra_ldflags="$extra_ldflags $_dvdreadlibs"
     _res_comment="external"
   fi
 fi
@@ -5787,7 +5787,7 @@ if test "$_dvdread_internal" = yes; then
 elif test "$_dvdread" = yes; then
   def_dvdread='#define CONFIG_DVDREAD 1'
   _largefiles=yes
-  _extra_ldflags="$_extra_ldflags -ldvdread"
+  extra_ldflags="$extra_ldflags -ldvdread"
   _inputmodules="dvdread(external) $_inputmodules"
   _res_comment="external"
 else
@@ -5811,7 +5811,7 @@ if test "$_libdvdcss_internal" = yes ; then
     def_dvd_bsd='#define HAVE_BSD_DVD_STRUCT 1'
   elif darwin ; then
     def_dvd_darwin='#define DARWIN_DVD_IOCTL'
-    _extra_ldflags="$_extra_ldflags -framework IOKit"
+    extra_ldflags="$extra_ldflags -framework IOKit"
   elif cygwin ; then
     cflags_libdvdcss="-DSYS_CYGWIN -DWIN32"
   elif beos ; then
@@ -5839,13 +5839,13 @@ EOF
     _cdparanoia=no
     for _inc_tmp in "" "-I/usr/include/cdda" "-I/usr/local/include/cdda" ; do
       cc_check $_inc_tmp -lcdda_interface -lcdda_paranoia $_ld_lm && \
-        _cdparanoia=yes && _extra_cflags="$_extra_cflags $_inc_tmp" && break
+        _cdparanoia=yes && extra_cflags="$extra_cflags $_inc_tmp" && break
     done
 fi
 if test "$_cdparanoia" = yes ; then
     _cdda='yes'
-    _extra_ldflags="$_extra_ldflags -lcdda_interface -lcdda_paranoia"
-    openbsd && _extra_ldflags="$_extra_ldflags -lutil"
+    extra_ldflags="$extra_ldflags -lcdda_interface -lcdda_paranoia"
+    openbsd && extra_ldflags="$extra_ldflags -lutil"
 fi
 echores "$_cdparanoia"
 
@@ -5867,13 +5867,13 @@ EOF
     for _ld_tmp in "" "-lwinmm" ; do
         _ld_tmp="-lcdio_cdda -lcdio -lcdio_paranoia $_ld_tmp"
         cc_check $_ld_tmp $_ld_lm \
-          && _libcdio=yes && _extra_ldflags="$_extra_ldflags $_ld_tmp" && break
+          && _libcdio=yes && extra_ldflags="$extra_ldflags $_ld_tmp" && break
     done
     if test "$_libcdio" = no && $_pkg_config --exists libcdio_paranoia ; then
       _inc_tmp=`$_pkg_config --cflags libcdio_paranoia`
       _ld_tmp=`$_pkg_config --libs libcdio_paranoia`
       cc_check $_inc_tmp $_ld_tmp $_ld_lm && _libcdio=yes \
-        && _extra_ldflags="$_extra_ldflags $_ld_tmp" && _extra_cflags="$_extra_cflags $_inc_tmp"
+        && extra_ldflags="$extra_ldflags $_ld_tmp" && extra_cflags="$extra_cflags $_inc_tmp"
     fi
 fi
 if test "$_libcdio" = yes && test "$_cdparanoia" = no ; then
@@ -5960,8 +5960,8 @@ EOF
 fi
 if test "$_freetype" = yes ; then
     def_freetype='#define CONFIG_FREETYPE'
-    _extra_cflags="$_extra_cflags `$_freetypeconfig --cflags`"
-    _extra_ldflags="$_extra_ldflags `$_freetypeconfig --libs`"
+    extra_cflags="$extra_cflags `$_freetypeconfig --cflags`"
+    extra_ldflags="$extra_ldflags `$_freetypeconfig --libs`"
 else
     def_freetype='#undef CONFIG_FREETYPE'
 fi
@@ -5989,13 +5989,13 @@ EOF
   _fontconfig=no
   for _ld_tmp in "" "-lexpat -lfreetype" "-lexpat -lfreetype -lz" ; do
     _ld_tmp="-lfontconfig $_ld_tmp"
-    cc_check $_ld_tmp && _fontconfig=yes && _extra_ldflags="$_extra_ldflags $_ld_tmp" && break
+    cc_check $_ld_tmp && _fontconfig=yes && extra_ldflags="$extra_ldflags $_ld_tmp" && break
   done
   if test "$_fontconfig" = no && $_pkg_config --exists fontconfig ; then
     _inc_tmp=`$_pkg_config --cflags fontconfig`
     _ld_tmp=`$_pkg_config --libs fontconfig`
     cc_check $_inc_tmp $_ld_tmp && _fontconfig=yes \
-      && _extra_ldflags="$_extra_ldflags $_ld_tmp" && _extra_cflags="$_extra_cflags $_inc_tmp"
+      && extra_ldflags="$extra_ldflags $_ld_tmp" && extra_cflags="$extra_cflags $_inc_tmp"
   fi
 fi
 if test "$_fontconfig" = yes ; then
@@ -6060,8 +6060,8 @@ EOF
 fi
 if test "$_fribidi" = yes ; then
     def_fribidi='#define CONFIG_FRIBIDI'
-    _extra_cflags="$_extra_cflags `$_fribidiconfig --cflags`"
-    _extra_ldflags="$_extra_ldflags `$_fribidiconfig --libs`"
+    extra_cflags="$extra_cflags `$_fribidiconfig --cflags`"
+    extra_ldflags="$extra_ldflags `$_fribidiconfig --libs`"
 else
     def_fribidi='#undef CONFIG_FRIBIDI'
 fi
@@ -6085,7 +6085,7 @@ EOF
 fi
     if test "$_enca" = yes ; then
 	def_enca='#define CONFIG_ENCA 1'
-	_extra_ldflags="$_extra_ldflags -lenca"
+	extra_ldflags="$extra_ldflags -lenca"
     else
 	def_enca='#undef CONFIG_ENCA'
     fi
@@ -6101,7 +6101,7 @@ _zlib=no
 cc_check -lz && _zlib=yes
 if test "$_zlib" = yes ; then
   def_zlib='#define CONFIG_ZLIB 1'
-  _extra_ldflags="$_extra_ldflags -lz"
+  extra_ldflags="$extra_ldflags -lz"
 else
   def_zlib='#define CONFIG_ZLIB 0'
   _libavdecoders=`echo $_libavdecoders | sed -e s/FLASHSV_DECODER// -e s/PNG_DECODER// -e s/ZMBV_DECODER// -e s/DXA_DECODER// -e s/TSCC_DECODER// `
@@ -6120,7 +6120,7 @@ EOF
 cc_check -lbz2 && bzlib=yes
 if test "$bzlib" = yes ; then
   def_bzlib='#define CONFIG_BZLIB 1'
-  _extra_ldflags="$_extra_ldflags -lbz2"
+  extra_ldflags="$extra_ldflags -lbz2"
 fi
 echores "$bzlib"
 
@@ -6160,7 +6160,7 @@ EOF
 fi
 if test "$_liblzo" = yes ; then
   def_liblzo='#define CONFIG_LIBLZO 1'
-  _extra_ldflags="$_extra_ldflags -llzo2"
+  extra_ldflags="$extra_ldflags -llzo2"
   _codecmodules="liblzo $_codecmodules"
 else
   def_liblzo='#undef CONFIG_LIBLZO'
@@ -6180,7 +6180,7 @@ EOF
 fi
 if test "$_mad" = yes ; then
   def_mad='#define CONFIG_LIBMAD 1'
-  _extra_ldflags="$_extra_ldflags -lmad"
+  extra_ldflags="$extra_ldflags -lmad"
   _codecmodules="libmad $_codecmodules"
 else
   def_mad='#undef CONFIG_LIBMAD'
@@ -6199,7 +6199,7 @@ EOF
 fi
 if test "$_twolame" = yes ; then
   def_twolame='#define CONFIG_TWOLAME 1'
-  _libs_mencoder="$_libs_mencoder -ltwolame"
+  libs_mencoder="$libs_mencoder -ltwolame"
   _codecmodules="twolame $_codecmodules"
 else
   def_twolame='#undef CONFIG_TWOLAME'
@@ -6222,7 +6222,7 @@ fi
 fi
 if test "$_toolame" = yes ; then
   def_toolame='#define CONFIG_TOOLAME 1'
-  _libs_mencoder="$_libs_mencoder -ltoolame"
+  libs_mencoder="$libs_mencoder -ltoolame"
   _codecmodules="toolame $_codecmodules"
 else
   def_toolame='#undef CONFIG_TOOLAME'
@@ -6268,13 +6268,13 @@ elif test "$_tremor" = yes ; then
   def_tremor='#define CONFIG_TREMOR 1'
   _codecmodules="tremor(external) $_codecmodules"
   _res_comment="external Tremor"
-  _extra_ldflags="$_extra_ldflags -logg -lvorbisidec"
+  extra_ldflags="$extra_ldflags -logg -lvorbisidec"
 elif test "$_libvorbis" = yes ; then
   _vorbis=yes
   def_vorbis='#define CONFIG_OGGVORBIS 1'
   _codecmodules="libvorbis $_codecmodules"
   _res_comment="libvorbis"
-  _extra_ldflags="$_extra_ldflags -lvorbis -logg"
+  extra_ldflags="$extra_ldflags -lvorbis -logg"
 else
   _vorbis=no
   _nocodecmodules="libvorbis $_nocodecmodules"
@@ -6292,7 +6292,7 @@ EOF
 fi
 if test "$_speex" = yes ; then
   def_speex='#define CONFIG_SPEEX 1'
-  _extra_ldflags="$_extra_ldflags -lspeex"
+  extra_ldflags="$extra_ldflags -lspeex"
   _codecmodules="speex $_codecmodules"
 else
   def_speex='#undef CONFIG_SPEEX'
@@ -6337,22 +6337,22 @@ int main(void) {
 EOF
   _ld_theora=$($_pkg_config --silence-errors --libs theora)
   _inc_theora=$($_pkg_config --silence-errors --cflags theora)
-  cc_check $_inc_theora $_ld_theora && _extra_ldflags="$_extra_ldflags $_ld_theora" &&
-    _extra_cflags="$_extra_cflags $_inc_theora" && _theora=yes
+  cc_check $_inc_theora $_ld_theora && extra_ldflags="$extra_ldflags $_ld_theora" &&
+    extra_cflags="$extra_cflags $_inc_theora" && _theora=yes
   if test _theora = no; then
     _ld_theora="-ltheora -logg"
-    cc_check $_ld_theora && _extra_ldflags="$_extra_ldflags $_ld_theora" && _theora=yes
+    cc_check $_ld_theora && extra_ldflags="$extra_ldflags $_ld_theora" && _theora=yes
   fi
   if test "$_theora" = no && test "$_tremor_internal" = yes; then
     _ld_theora=$($_pkg_config --silence-errors --libs theora)
     _inc_theora=$($_pkg_config --silence-errors --cflags theora)
     cc_check tremor/bitwise.c $_inc_theora $_ld_theora &&
-      _extra_ldflags="$_extra_ldflags $_ld_theora" &&
-      _extra_cflags="$_extra_cflags $_inc_theora" && _theora=yes
+      extra_ldflags="$extra_ldflags $_ld_theora" &&
+      extra_cflags="$extra_cflags $_inc_theora" && _theora=yes
     if test _theora = no; then
       _ld_theora="-ltheora -logg"
       cc_check tremor/bitwise.c $_ld_theora &&
-        _extra_ldflags="$_extra_ldflags $_ld_theora" && _theora=yes
+        extra_ldflags="$extra_ldflags $_ld_theora" && _theora=yes
     fi
   fi
 fi
@@ -6361,7 +6361,7 @@ if test "$_theora" = yes ; then
   _codecmodules="libtheora $_codecmodules"
   # when --enable-theora is forced, we'd better provide a probably sane
   # $_ld_theora than nothing
-  test -z "$_ld_theora" && _extra_ldflags="$_extra_ldflags -ltheora -logg"
+  test -z "$_ld_theora" && extra_ldflags="$extra_ldflags -ltheora -logg"
 else
   def_theora='#undef CONFIG_OGGTHEORA'
   _nocodecmodules="libtheora $_nocodecmodules"
@@ -6398,7 +6398,7 @@ elif test "$_liba52_internal" = no && test "$_liba52" = auto ; then
 #include <a52dec/a52.h>
 int main(void) { a52_state_t *testHand; testHand=a52_init(0); return 0; }
 EOF
-  cc_check -la52 && _liba52=yes && _res_comment="external" && _extra_ldflags="$_extra_ldflags -la52"
+  cc_check -la52 && _liba52=yes && _res_comment="external" && extra_ldflags="$extra_ldflags -la52"
 fi
 if test "$_liba52" = yes ; then
   def_liba52='#define CONFIG_LIBA52 1'
@@ -6438,7 +6438,7 @@ if test "$_libdca" = auto ; then
 int main(void) { dts_init(0); return 0; }
 EOF
   for _ld_dca in -ldts -ldca ; do
-    cc_check $_ld_dca $_ld_lm && _extra_ldflags="$_extra_ldflags $_ld_dca" \
+    cc_check $_ld_dca $_ld_lm && extra_ldflags="$extra_ldflags $_ld_dca" \
       && _libdca=yes && break
   done
 fi
@@ -6469,7 +6469,7 @@ EOF
 fi
 if test "$_musepack" = yes ; then
   def_musepack='#define CONFIG_MUSEPACK 1'
-  _extra_ldflags="$_extra_ldflags -lmpcdec"
+  extra_ldflags="$extra_ldflags -lmpcdec"
   _codecmodules="musepack $_codecmodules"
 else
   def_musepack='#undef CONFIG_MUSEPACK'
@@ -6487,7 +6487,7 @@ int main(void) { unsigned long x, y; faacEncOpen(48000, 2, &x, &y); return 0; }
 EOF
   _faac=no
   for _ld_faac in "-lfaac" "-lfaac -lmp4v2 -lstdc++" ; do
-    cc_check -O4 $_ld_faac $_ld_lm && _libs_mencoder="$_libs_mencoder $_ld_faac" && _faac=yes && break
+    cc_check -O4 $_ld_faac $_ld_lm && libs_mencoder="$libs_mencoder $_ld_faac" && _faac=yes && break
   done
 fi
 if test "$_faac" = yes ; then
@@ -6495,7 +6495,7 @@ if test "$_faac" = yes ; then
   test "$_faac_lavc" = auto && _faac_lavc=yes
   if test "$_faac_lavc" = yes ; then
     def_faac_lavc="#define CONFIG_LIBFAAC 1"
-    _libs_mplayer="$_libs_mplayer $_ld_faac"
+    libs_mplayer="$libs_mplayer $_ld_faac"
     _libavencoders="$_libavencoders LIBFAAC_ENCODER"
   fi
   _codecmodules="faac $_codecmodules"
@@ -6551,7 +6551,7 @@ if test "$_faad_internal" = yes ; then
     _res_comment="internal fixed-point"
   fi
 elif test "$_faad" = yes ; then
-  _extra_ldflags="$_extra_ldflags -lfaad"
+  extra_ldflags="$extra_ldflags -lfaad"
 fi
 
 if test "$_faad" = yes ; then
@@ -6621,7 +6621,7 @@ if test "$_win32dll" = yes ; then
     def_win32_loader='#define WIN32_LOADER 1'
     _win32_emulation=yes
   else
-    _extra_ldflags="$_extra_ldflags -ladvapi32 -lole32"
+    extra_ldflags="$extra_ldflags -ladvapi32 -lole32"
     _res_comment="using native windows"
   fi
   _codecmodules="win32 $_codecmodules"
@@ -6699,8 +6699,8 @@ echocheck "Nemesi Streaming Media libraries"
 if test "$_nemesi" = auto  && test "$_network" = yes ; then
     _nemesi=no
     if $_pkg_config libnemesi --atleast-version=0.6.3 ; then
-        _extra_cflags="$_extra_cflags `$_pkg_config --cflags libnemesi`"
-        _extra_ldflags="$_extra_ldflags `$_pkg_config --libs libnemesi`"
+        extra_cflags="$extra_cflags `$_pkg_config --cflags libnemesi`"
+        extra_ldflags="$extra_ldflags `$_pkg_config --libs libnemesi`"
         _nemesi=yes
     fi
 fi
@@ -6727,15 +6727,15 @@ int main(void) { return 0; }
 EOF
 
   _live=no
-  for I in $_extra_cflags "-I$_libdir/live" "-I/usr/lib/live" "-I/usr/lib64/live" "-I/usr/local/live" "-I/usr/local/lib/live" ; do
+  for I in $extra_cflags "-I$_libdir/live" "-I/usr/lib/live" "-I/usr/lib64/live" "-I/usr/local/live" "-I/usr/local/lib/live" ; do
     cxx_check $I/liveMedia/include $I/UsageEnvironment/include \
       $I/groupsock/include && _livelibdir=`echo $I| sed s/-I//` && \
-      _extra_ldflags="$_livelibdir/liveMedia/libliveMedia.a \
+      extra_ldflags="$_livelibdir/liveMedia/libliveMedia.a \
                  $_livelibdir/groupsock/libgroupsock.a \
                  $_livelibdir/UsageEnvironment/libUsageEnvironment.a \
                  $_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a \
-                 $_extra_ldflags  -lstdc++" \
-      _extra_cxxflags="-I$_livelibdir/liveMedia/include \
+                 $extra_ldflags  -lstdc++" \
+      extra_cxxflags="-I$_livelibdir/liveMedia/include \
                   -I$_livelibdir/UsageEnvironment/include \
                   -I$_livelibdir/BasicUsageEnvironment/include \
                   -I$_livelibdir/groupsock/include" && \
@@ -6755,8 +6755,8 @@ elif test "$_live_dist" = yes && test "$_network" = yes; then
   _res_comment="using distribution version"
   _live="yes"
   def_live='#define CONFIG_LIVE555 1'
-  _extra_ldflags="$_extra_ldflags -lliveMedia -lgroupsock -lUsageEnvironment -lBasicUsageEnvironment -lstdc++"
-  _extra_cxxflags="-I/usr/include/liveMedia -I/usr/include/UsageEnvironment \
+  extra_ldflags="$extra_ldflags -lliveMedia -lgroupsock -lUsageEnvironment -lBasicUsageEnvironment -lstdc++"
+  extra_cxxflags="-I/usr/include/liveMedia -I/usr/include/UsageEnvironment \
              -I/usr/include/BasicUsageEnvironment -I/usr/include/groupsock"
  _inputmodules="live555 $_inputmodules"
 else
@@ -6784,10 +6784,10 @@ EOF
   if $_pkg_config --exists libavutil ; then
     _inc_libavutil=`$_pkg_config --cflags libavutil`
     _ld_tmp=`$_pkg_config --libs libavutil`
-    cc_check $_inc_libavutil $_ld_tmp && _extra_ldflags="$_extra_ldflags $_ld_tmp" \
+    cc_check $_inc_libavutil $_ld_tmp && extra_ldflags="$extra_ldflags $_ld_tmp" \
       && _libavutil_so=yes
   elif cc_check -lavutil $_ld_lm ; then
-    _extra_ldflags="$_extra_ldflags -lavutil"
+    extra_ldflags="$extra_ldflags -lavutil"
     _libavutil_so=yes
     _res_comment="using libavutil.so, but static libavutil is recommended"
   fi
@@ -6823,10 +6823,10 @@ EOF
   if $_pkg_config --exists libavcodec ; then
     _inc_libavcodec=`$_pkg_config --cflags libavcodec`
     _ld_tmp=`$_pkg_config --libs libavcodec`
-    cc_check $_inc_libavcodec $_ld_tmp && _extra_ldflags="$_extra_ldflags $_ld_tmp" \
+    cc_check $_inc_libavcodec $_ld_tmp && extra_ldflags="$extra_ldflags $_ld_tmp" \
       && _libavcodec_so=yes
   elif cc_check -lavcodec $_ld_lm ; then
-    _extra_ldflags="$_extra_ldflags -lavcodec"
+    extra_ldflags="$extra_ldflags -lavcodec"
     _libavcodec_so=yes
     _res_comment="using libavcodec.so, but static libavcodec is recommended"
   fi
@@ -6867,10 +6867,10 @@ EOF
   if $_pkg_config --exists libavformat ; then
     _inc_libavformat=`$_pkg_config --cflags libavformat`
     _ld_tmp=`$_pkg_config --libs libavformat`
-    cc_check $_inc_libavformat $_ld_tmp && _extra_ldflags="$_extra_ldflags $_ld_tmp" \
+    cc_check $_inc_libavformat $_ld_tmp && extra_ldflags="$extra_ldflags $_ld_tmp" \
       && _libavformat_so=yes
   elif cc_check $_ld_lm -lavformat ; then
-    _extra_ldflags="$_extra_ldflags -lavformat"
+    extra_ldflags="$extra_ldflags -lavformat"
     _libavformat_so=yes
     _res_comment="using libavformat.so, but static libavformat is recommended"
   fi
@@ -6901,7 +6901,7 @@ elif test "$_libpostproc_so" = auto ; then
   int main(void) { pp_get_mode_by_name_and_quality("de", 0); return 0; }
 EOF
   if cc_check -lpostproc $_ld_lm ; then
-    _extra_ldflags="$_extra_ldflags -lpostproc"
+    extra_ldflags="$extra_ldflags -lpostproc"
     _libpostproc_so=yes
     _res_comment="using libpostproc.so, but static libpostproc is recommended"
   fi
@@ -6934,10 +6934,10 @@ EOF
   if $_pkg_config --exists libswscale ; then
     _inc_libswscale=`$_pkg_config --cflags libswscale`
     _ld_tmp=`$_pkg_config --libs libswscale`
-    cc_check $_inc_libswscale $_ld_tmp && _extra_ldflags="$_extra_ldflags $_ld_tmp" \
+    cc_check $_inc_libswscale $_ld_tmp && extra_ldflags="$extra_ldflags $_ld_tmp" \
       && _libswscale_so=yes
   elif cc_check -lswscale ; then
-    _extra_ldflags="$_extra_ldflags -lswscale"
+    extra_ldflags="$extra_ldflags -lswscale"
     _libswscale_so=yes
   fi
 fi
@@ -6967,7 +6967,7 @@ EOF
 fi
 if test "$_libamr_nb" = yes ; then
   _libamr=yes
-  _extra_ldflags="$_extra_ldflags -lamrnb"
+  extra_ldflags="$extra_ldflags -lamrnb"
   def_libamr='#define CONFIG_LIBAMR 1'
   def_libamr_nb='#define CONFIG_LIBAMR_NB 1'
   _libavdecoders="$_libavdecoders LIBAMR_NB_DECODER"
@@ -6995,7 +6995,7 @@ EOF
 fi
 if test "$_libamr_wb" = yes ; then
   _libamr=yes
-  _extra_ldflags="$_extra_ldflags -lamrwb"
+  extra_ldflags="$extra_ldflags -lamrwb"
   def_libamr='#define CONFIG_LIBAMR 1'
   def_libamr_wb='#define CONFIG_LIBAMR_WB 1'
   _libavdecoders="$_libavdecoders LIBAMR_WB_DECODER"
@@ -7018,7 +7018,7 @@ EOF
 fi
 if test "$_libdv" = yes ; then
   def_libdv='#define CONFIG_LIBDV095 1'
-  _extra_ldflags="$_extra_ldflags -ldv"
+  extra_ldflags="$extra_ldflags -ldv"
   _codecmodules="libdv $_codecmodules"
 else
   def_libdv='#undef CONFIG_LIBDV095'
@@ -7035,7 +7035,7 @@ if test "$_xvid" = auto ; then
 int main(void) { xvid_global(0, 0, 0, 0); return 0; }
 EOF
   for _ld_tmp in "-lxvidcore $_ld_lm" "-lxvidcore $_ld_lm $_ld_pthread" ; do
-    cc_check $_ld_tmp && _extra_ldflags="$_extra_ldflags $_ld_tmp" && _xvid=yes && break
+    cc_check $_ld_tmp && extra_ldflags="$extra_ldflags $_ld_tmp" && _xvid=yes && break
   done
 fi
 
@@ -7078,7 +7078,7 @@ int main(void) { x264_encoder_open((void*)0); return 0; }
 EOF
   _x264=no
   for _ld_x264 in "-lx264 $_ld_pthread" "-lx264 $_ld_pthread $_ld_lm" ; do
-    cc_check $_ld_x264 && _libs_mencoder="$_libs_mencoder $_ld_x264" && _x264=yes && break
+    cc_check $_ld_x264 && libs_mencoder="$libs_mencoder $_ld_x264" && _x264=yes && break
   done
 fi
 
@@ -7088,7 +7088,7 @@ if test "$_x264" = yes ; then
   test "$_x264_lavc" = auto && _x264_lavc=yes
   if test "$_x264_lavc" = yes ; then
     def_x264_lavc='#define CONFIG_LIBX264 1'
-    _libs_mplayer="$_libs_mplayer $_ld_x264"
+    libs_mplayer="$libs_mplayer $_ld_x264"
     _libavencoders="$_libavencoders LIBX264_ENCODER"
   fi
 else
@@ -7126,8 +7126,8 @@ EOF
       _ld_dirac=`$_pkg_config --silence-errors --libs dirac`
       cc_check $_inc_dirac $_ld_dirac      &&
       _libdirac_lavc=yes                   &&
-      _extra_cflags="$_extra_cflags $_inc_dirac" &&
-      _extra_ldflags="$_extra_ldflags $_ld_dirac"
+      extra_cflags="$extra_cflags $_inc_dirac" &&
+      extra_ldflags="$extra_ldflags $_ld_dirac"
     fi
   fi
 fi
@@ -7158,8 +7158,8 @@ EOF
       _ld_schroedinger=`$_pkg_config --silence-errors --libs schroedinger-1.0`
       cc_check $_inc_schroedinger $_ld_schroedinger &&
       _libschroedinger_lavc=yes                     &&
-      _extra_cflags="$_extra_cflags $_inc_schroedinger"   &&
-      _extra_ldflags="$_extra_ldflags $_ld_schroedinger"
+      extra_cflags="$extra_cflags $_inc_schroedinger"   &&
+      extra_ldflags="$extra_ldflags $_ld_schroedinger"
     fi
   fi
 fi
@@ -7189,7 +7189,7 @@ fi
 
 if test "$_libnut" = yes ; then
   def_libnut='#define CONFIG_LIBNUT 1'
-  _extra_ldflags="$_extra_ldflags -lnut"
+  extra_ldflags="$extra_ldflags -lnut"
 else
   def_libnut='#undef CONFIG_LIBNUT'
 fi
@@ -7240,7 +7240,7 @@ fi
 if test "$_mp3lame" = yes ; then
   def_mp3lame="#define CONFIG_MP3LAME"
   _ld_mp3lame=-lmp3lame
-  _libs_mencoder="$_libs_mencoder $_ld_mp3lame"
+  libs_mencoder="$libs_mencoder $_ld_mp3lame"
   cat > $TMPC << EOF
 #include <lame/lame.h>
 int main(void) { lame_set_preset(NULL, STANDARD_FAST); return 0; }
@@ -7255,7 +7255,7 @@ EOF
   if test "$_mp3lame_lavc" = yes ; then
     def_mp3lame_lavc="#define CONFIG_LIBMP3LAME 1"
     _libavencoders="$_libavencoders LIBMP3LAME_ENCODER"
-    _libs_mplayer="$_libs_mplayer $_ld_mp3lame"
+    libs_mplayer="$libs_mplayer $_ld_mp3lame"
   fi
 else
   _mp3lame_lavc=no
@@ -7405,7 +7405,7 @@ fi
 if test "$_tv_dshow" = yes ; then
   _inputmodules="tv-dshow $_inputmodules"
   def_tv_dshow='#define CONFIG_TV_DSHOW 1'
-  _extra_ldflags="$_extra_ldflags -lole32 -luuid"
+  extra_ldflags="$extra_ldflags -lole32 -luuid"
 else
   _noinputmodules="tv-dshow $_noinputmodules"
   def_tv_dshow='#undef CONFIG_TV_DSHOW'
@@ -7619,7 +7619,7 @@ fi
 if test "$_vstream" = yes ; then
   def_vstream='#define CONFIG_VSTREAM 1'
   _inputmodules="vstream $_inputmodules"
-  _extra_ldflags="$_extra_ldflags -lvstream-client"
+  extra_ldflags="$extra_ldflags -lvstream-client"
 else
   _noinputmodules="vstream $_noinputmodules"
   def_vstream='#undef CONFIG_VSTREAM'
@@ -7659,9 +7659,9 @@ if test "$_xmms" = yes ; then
 
   def_xmms='#define CONFIG_XMMS 1'
   if darwin ; then
-     _extra_ldflags="$_extra_ldflags ${_xmmslibdir}/libxmms.dylib"
+     extra_ldflags="$extra_ldflags ${_xmmslibdir}/libxmms.dylib"
   else
-     _extra_ldflags="$_extra_ldflags ${_xmmslibdir}/libxmms.so.1 -export-dynamic"
+     extra_ldflags="$extra_ldflags ${_xmmslibdir}/libxmms.so.1 -export-dynamic"
   fi
 else
   def_xmms='#undef CONFIG_XMMS'
@@ -7724,15 +7724,15 @@ if test "$_gtk1" = no ; then
 
   if $_pkg_config gtk+-2.0 --exists ; then
     _gtk=`$_pkg_config gtk+-2.0 --modversion 2>/dev/null`
-    _extra_cflags="$_extra_cflags `$_pkg_config gtk+-2.0 --cflags 2>/dev/null`"
-    _libs_mplayer="$_libs_mplayer `$_pkg_config gtk+-2.0 --libs 2>/dev/null`"
+    extra_cflags="$extra_cflags `$_pkg_config gtk+-2.0 --cflags 2>/dev/null`"
+    libs_mplayer="$libs_mplayer `$_pkg_config gtk+-2.0 --libs 2>/dev/null`"
     echores "$_gtk"
 
     # Check for GLIB2
     if $_pkg_config glib-2.0 --exists ; then
       echocheck "glib version"
       _glib=`$_pkg_config glib-2.0 --modversion 2>/dev/null`
-      _libs_mplayer="$_libs_mplayer `$_pkg_config glib-2.0 --libs 2>/dev/null`"
+      libs_mplayer="$libs_mplayer `$_pkg_config glib-2.0 --libs 2>/dev/null`"
       echores "$_glib"
 
       def_gui='#define CONFIG_GUI 1'
@@ -7760,8 +7760,8 @@ if test "$_gtk1" = yes ; then
     fi
   fi
   _gtk=`$_gtkconfig --version 2>&1`
-  _extra_cflags="$_extra_cflags `$_gtkconfig --cflags 2>&1`"
-  _libs_mplayer="$_libs_mplayer `$_gtkconfig --libs 2>&1`"
+  extra_cflags="$extra_cflags `$_gtkconfig --cflags 2>&1`"
+  libs_mplayer="$libs_mplayer `$_gtkconfig --libs 2>&1`"
   echores "$_gtk (using $_gtkconfig)"
 
   # Check for GLIB
@@ -7776,7 +7776,7 @@ if test "$_gtk1" = yes ; then
     fi
   fi
   _glib=`$_glibconfig --version 2>&1`
-  _libs_mplayer="$_libs_mplayer `$_glibconfig --libs 2>&1`"
+  libs_mplayer="$libs_mplayer `$_glibconfig --libs 2>&1`"
   echores "$_glib (using $_glibconfig)"
 
   def_gui='#define CONFIG_GUI 1'
@@ -7785,7 +7785,7 @@ fi
 
 else #if ! win32
   _gui_win32=yes
-  _libs_mplayer="$_libs_mplayer -lcomdlg32 -lcomctl32 -lshell32 -lkernel32"
+  libs_mplayer="$libs_mplayer -lcomdlg32 -lcomctl32 -lshell32 -lkernel32"
   def_gui='#define CONFIG_GUI 1'
   def_gtk2='#undef CONFIG_GTK2'
 fi #if ! win32
@@ -7835,7 +7835,7 @@ cat > $TMPC <<EOF
 int main(void) { return 0; }
 EOF
 if cc_check -Wl,-z,noexecstack ; then
-  _extra_ldflags="-Wl,-z,noexecstack $_extra_ldflags"
+  extra_ldflags="-Wl,-z,noexecstack $extra_ldflags"
   echores "yes"
 else
   echores "no"
@@ -7850,9 +7850,9 @@ if test "$_real" = yes || test "$_xanim" = yes && ! win32 && ! qnx && ! darwin &
   _ld_dl_dynamic='-rdynamic'
 fi
 
-_extra_ldflags="$_extra_ldflags $_ld_pthread $_ld_dl $_ld_dl_dynamic"
-bsdos && _extra_ldflags="$_extra_ldflags -ldvd"
-(netbsd || openbsd) && x86_32 && _extra_ldflags="$_extra_ldflags -li386"
+extra_ldflags="$extra_ldflags $_ld_pthread $_ld_dl $_ld_dl_dynamic"
+bsdos && extra_ldflags="$extra_ldflags -ldvd"
+(netbsd || openbsd) && x86_32 && extra_ldflags="$extra_ldflags -li386"
 
 def_debug='#undef MP_DEBUG'
 test "$_debug" != "" && def_debug='#define MP_DEBUG 1'
@@ -7882,7 +7882,7 @@ EOF
 fi
 if test "$_lirc" = yes ; then
   def_lirc='#define CONFIG_LIRC 1'
-  _extra_ldflags="$_extra_ldflags -llirc_client"
+  extra_ldflags="$extra_ldflags -llirc_client"
 else
   def_lirc='#undef CONFIG_LIRC'
 fi
@@ -7899,7 +7899,7 @@ EOF
 fi
 if test "$_lircc" = yes ; then
   def_lircc='#define CONFIG_LIRCC 1'
-  _extra_ldflags="$_extra_ldflags -llircc"
+  extra_ldflags="$extra_ldflags -llircc"
 else
   def_lircc='#undef CONFIG_LIRCC'
 fi
@@ -7919,8 +7919,8 @@ EOF
 fi
 if test "$_maemo" = yes ; then
   def_maemo='#define CONFIG_MAEMO 1'
-  _extra_cflags="$_extra_cflags `$_pkg_config --cflags libosso`"
-  _extra_ldflags="$_extra_ldflags `$_pkg_config --libs libosso` -lXsp"
+  extra_cflags="$extra_cflags `$_pkg_config --cflags libosso`"
+  extra_ldflags="$extra_ldflags `$_pkg_config --libs libosso` -lXsp"
 else
   def_maemo='#undef CONFIG_MAEMO'
 fi
@@ -7933,20 +7933,20 @@ fi
 # the OMF format needs to come after the 'extern symbol prefix' check, which
 # uses nm.
 if os2 ; then
-  _extra_ldflags="$_extra_ldflags -Zomf -Zstack 16384 -Zbin-files -Zargs-wild"
+  extra_ldflags="$extra_ldflags -Zomf -Zstack 16384 -Zbin-files -Zargs-wild"
 fi
 
 # linker paths should be the same for mencoder and mplayer
 _ld_tmp=""
-for I in $_libs_mplayer ; do
+for I in $libs_mplayer ; do
   _tmp=`echo $I | sed -e 's/^-L.*$//'`
   if test -z "$_tmp" ; then
-    _extra_ldflags="$_extra_ldflags $I"
+    extra_ldflags="$extra_ldflags $I"
   else
     _ld_tmp="$_ld_tmp $I"
   fi
 done
-_libs_mplayer=$_ld_tmp
+libs_mplayer=$_ld_tmp
 
 
 #############################################################################
@@ -8026,8 +8026,8 @@ if test "$_dvdnav" = yes ; then
     cflags_libdvdnav="-Ilibdvdnav"
     _inputmodules="dvdnav(internal) $_inputmodules"
   else
-    _extra_cflags="$_extra_cflags `$_dvdnavconfig --cflags`"
-    _extra_ldflags="$_extra_ldflags `$_dvdnavconfig --minilibs`"
+    extra_cflags="$extra_cflags `$_dvdnavconfig --cflags`"
+    extra_ldflags="$extra_ldflags `$_dvdnavconfig --minilibs`"
     _inputmodules="dvdnav $_inputmodules"
   fi
 else
@@ -8072,9 +8072,9 @@ INSTALLSTRIP = $_install_strip
 RANLIB = $_ranlib
 WINDRES = $_windres
 
-CFLAGS = $CFLAGS $_extra_cflags
-OPTFLAGS = $CFLAGS $_extra_cflags
-CXXFLAGS = $CXXFLAGS $_extra_cflags $_extra_cxxflags
+CFLAGS = $CFLAGS $extra_cflags
+OPTFLAGS = $CFLAGS $extra_cflags
+CXXFLAGS = $CXXFLAGS $extra_cflags $extra_cxxflags
 CFLAGS_DHAHELPER = $cflags_dhahelper
 CFLAGS_FAAD_FIXED = $cflags_faad_fixed
 CFLAGS_LIBDVDCSS = $cflags_libdvdcss
@@ -8086,10 +8086,10 @@ CFLAGS_SVGALIB_HELPER = $cflags_svgalib_helper
 CFLAGS_TREMOR_LOW = $cflags_tremor_low
 YASMFLAGS = $YASMFLAGS
 
-EXTRALIBS = $_extra_libs
-EXTRA_LIB = $_extra_ldflags $_ld_static $_ld_lm
-EXTRALIBS_MPLAYER = $_libs_mplayer
-EXTRALIBS_MENCODER = $_libs_mencoder
+EXTRALIBS = $extra_libs
+EXTRA_LIB = $extra_ldflags $_ld_static $_ld_lm
+EXTRALIBS_MPLAYER = $libs_mplayer
+EXTRALIBS_MENCODER = $libs_mencoder
 
 DEPEND_CMD   = \$(CC) -MM \$(CFLAGS) \$(filter-out %.h,\$^) | sed "s,[0-9a-z._-]*: \(\$(SRC_DIR)/\)*\([a-z0-9]*/\)[^/]* ,\\2&,"