*** configure_orig.txt	Tue Oct 23 14:29:16 2001
--- configure.txt	Tue Oct 23 14:33:40 2001
***************
*** 4,13 ****
--- 4,16 ----
  # MPlayer configurator.   (C) 2000 Pontscho/fresh!mindworkz
  #				   pontscho@makacs.poliod.hu
  #
  # Changes in reversed order:
  #
+ # 2001/10/22 by Jeroen Dobbelaere
+ # - added selection of libmad
+ #
  # 2001/08/27 by Johannes Feigl
  # - added manual selection of language
  #
  # 2001/08/22 by Nick Kurshev
  # - added autodetection of local language
***************
*** 192,201 ****
--- 195,205 ----
    --enable-vorbis        build with OggVorbis support [autodetect]
  
    --enable-termcap       use termcap database for key codes
    --enable-xmmp          use XMMP audio drivers
    --enable-lirc          enable LIRC (remote control) support
+   --enable-mad           enable mad audio support
  
    --disable-iconv        do not use iconv(3) function [autodetect]
    --disable-ossaudio     disable OSS sound support [autodetect]
    --disable-alsa         disable alsa sound support [autodetect]
    --disable-esd          disable esd sound support [autodetect]
***************
*** 226,235 ****
--- 230,241 ----
                           (example: --with-sdl-config=/usr/sdl/bin/sdl-config)
    --with-extralibdir=DIR extra library files (png, SDL) are in DIR
                           (only needed if autodetection fails)
    --with-extraincdir=DIR extra headers (png, SDL) are in DIR
                           (only needed if autodetection fails)
+   --with-madlibdir=DIR   libmad library files are in DIR
+   --with-madincdir=DIR   libmad header is in DIR
    --size-x=SIZE          default screen width
    --size-y=SIZE          default screen height
  EOF
  exit 0
  fi
***************
*** 283,292 ****
--- 289,304 ----
          _extralibdir=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
          ;;
    --with-extraincdir=*)
          _extraincdir=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
          ;;
+  --with-madlibdir=*)
+         _madlibdir=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
+         ;;
+  --with-madincdir=*)
+         _madincdir=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
+         ;;
   esac
  done
  
  # LGB: Some inital help
  
***************
*** 1290,1299 ****
--- 1302,1317 ----
    	_streaming=yes
  	;;
    --enable-divx4)
    	_divx4linux=yes
  	;;
+   --enable-mad)
+ 	_madlibrary=yes
+ 	;;
+   --disable-mad)
+ 	_madlibrary=no
+ 	;;
    --disable-css)
  	_css=no
  	;;
    --disable-png)
  	_png=no
***************
*** 1622,1631 ****
--- 1640,1650 ----
  echo "Checking for Sun Audio ... $_sun_audio"
  echo "Checking for Sun mediaLib ... $_mlib"
  echo "Checking for DeCSS support ... $_css"
  echo "Checking for DVDread support ... $_dvdread"
  echo "Checking for PNG support ... $_png"
+ echo "Checking for mad support ... $_madlibrary"
  echo "Checking for OggVorbis support ... $_vorbis"
  echo "Checking for Win32 DLL support ... $_win32dll"
  echo "Checking for DirectShow ... $_dshow"
  echo "Checking for iconv function ... $_iconv"
  
***************
*** 1906,1915 ****
--- 1925,1938 ----
  
  if test "$_png" = yes ; then
     _libpng='-lpng -lz'
  fi
  
+ if test "$_madlibrary" = yes ; then
+     _libmad='-lmad'
+ fi
+ 
  if test "$_vorbis" = yes ; then
     _vorbis='#define HAVE_OGGVORBIS'
     _libvorbis='-lvorbis -lm'
  else
     _vorbis='#undef HAVE_OGGVORBIS'
***************
*** 2084,2093 ****
--- 2107,2121 ----
   _vosrc=$_vosrc' vo_png.c'
  else
     _png='#undef HAVE_PNG'
  fi
  
+ if test "$_madlibrary" = yes ; then
+  _madlibrary='#define USE_LIBMAD'
+ else
+  _madlibrary='#undef USE_LIBMAD'
+ fi
  
  if test "$_mlib" = yes ; then
   _mlibdef='#define HAVE_MLIB'
   _mlibinc="-I$_mlibdir/include"
   _mliblib="-L$_mlibdir/lib -R$_mlibdir/lib -lmlib"
***************
*** 2262,2272 ****
  EXTRA_INC=$_extraincdir $_gtkinc
  WIN32_PATH=-DWIN32_PATH=\\"$_win32libdir\\"
  
  X11_INC=$_x11incdir
  X11DIR=$_x11libdir
! X_LIBS=$_x11libdir $_extralibdir $_gllib $_ggilib $_sdllib $_dgalib $_x11lib $_xvlib $_vmlib $_svgalib $_libpng $_socklib $_aalib $_libvorbis $_xineramalib
  
  TERMCAP_LIB=$_libtermcap
  XMM_LIBS = $_xmmplibs
  LIRC_LIBS = $_lirclibs
  CSS_USE=$_css
--- 2290,2300 ----
  EXTRA_INC=$_extraincdir $_gtkinc
  WIN32_PATH=-DWIN32_PATH=\\"$_win32libdir\\"
  
  X11_INC=$_x11incdir
  X11DIR=$_x11libdir
! X_LIBS=$_x11libdir $_extralibdir $_gllib $_ggilib $_sdllib $_dgalib $_x11lib $_xvlib $_vmlib $_svgalib $_libpng $_socklib $_aalib $_libvorbis $_xineramalib $_libmad
  
  TERMCAP_LIB=$_libtermcap
  XMM_LIBS = $_xmmplibs
  LIRC_LIBS = $_lirclibs
  CSS_USE=$_css
***************
*** 2285,2294 ****
--- 2313,2324 ----
  STREAMING=$_streaming
  DECORE_LIBS = $_decorelibs
  DIVX4LINUX=$_divx4linux
  MLIB_INC = $_mlibinc
  MLIB_LIB = $_mliblib
+ MADLIB_INC = $_madincdir
+ MADLIB_LIB = $_madlibdir
  
  # --- Some stuff for autoconfigure ----
  $_target_arch
  $_confcygwin
  TARGET_CPU=$iproc
***************
*** 2473,2482 ****
--- 2503,2515 ----
  /* termcap flag for getch2.c */
  $_termcap
  
  /* enable PNG support */
  $_png
+ 
+ /* libmad support */
+ $_madlibrary
  
  /* enable OggVorbis support */
  $_vorbis
  
  $_streamingdef