Added a post-mix callback, and updated configure.in for Win32 cross-compile
authorSam Lantinga <slouken@lokigames.com>
Sun, 26 Dec 1999 11:17:50 +0000
changeset 2625edca541dc9
parent 25 570c888ed4ce
child 27 835aa411704b
Added a post-mix callback, and updated configure.in for Win32 cross-compile
aclocal.m4
configure
configure.in
ltconfig
ltmain.sh
mixer.c
mixer.h
music.c
     1.1 --- a/aclocal.m4	Tue Dec 21 17:41:12 1999 +0000
     1.2 +++ b/aclocal.m4	Sun Dec 26 11:17:50 1999 +0000
     1.3 @@ -74,7 +74,7 @@
     1.4  #include <stdio.h>
     1.5  #include <stdlib.h>
     1.6  #include <string.h>
     1.7 -#include <SDL/SDL.h>
     1.8 +#include "SDL.h"
     1.9  
    1.10  char*
    1.11  my_strdup (char *str)
    1.12 @@ -148,7 +148,7 @@
    1.13            LIBS="$LIBS $SDL_LIBS"
    1.14            AC_TRY_LINK([
    1.15  #include <stdio.h>
    1.16 -#include <SDL/SDL.h>
    1.17 +#include "SDL.h"
    1.18  ],      [ return 0; ],
    1.19          [ echo "*** The test program compiled, but did not run. This usually means"
    1.20            echo "*** that the run-time linker is not finding SDL or finding the wrong"
     2.1 --- a/configure	Tue Dec 21 17:41:12 1999 +0000
     2.2 +++ b/configure	Sun Dec 26 11:17:50 1999 +0000
     2.3 @@ -561,9 +561,9 @@
     2.4  
     2.5  MAJOR_VERSION=1
     2.6  MINOR_VERSION=0
     2.7 -MICRO_VERSION=0
     2.8 +MICRO_VERSION=1
     2.9  INTERFACE_AGE=0
    2.10 -BINARY_AGE=0
    2.11 +BINARY_AGE=1
    2.12  VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
    2.13  
    2.14  
    2.15 @@ -1087,6 +1087,7 @@
    2.16    fi
    2.17  fi
    2.18  
    2.19 +
    2.20  # Check whether --enable-shared or --disable-shared was given.
    2.21  if test "${enable_shared+set}" = set; then
    2.22    enableval="$enable_shared"
    2.23 @@ -1163,7 +1164,7 @@
    2.24  fi
    2.25  
    2.26  echo $ac_n "checking host system type""... $ac_c" 1>&6
    2.27 -echo "configure:1167: checking host system type" >&5
    2.28 +echo "configure:1168: checking host system type" >&5
    2.29  
    2.30  host_alias=$host
    2.31  case "$host_alias" in
    2.32 @@ -1184,7 +1185,7 @@
    2.33  echo "$ac_t""$host" 1>&6
    2.34  
    2.35  echo $ac_n "checking build system type""... $ac_c" 1>&6
    2.36 -echo "configure:1188: checking build system type" >&5
    2.37 +echo "configure:1189: checking build system type" >&5
    2.38  
    2.39  build_alias=$build
    2.40  case "$build_alias" in
    2.41 @@ -1213,7 +1214,7 @@
    2.42  if test "$ac_cv_prog_gcc" = yes; then
    2.43    # Check if gcc -print-prog-name=ld gives a path.
    2.44    echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
    2.45 -echo "configure:1217: checking for ld used by GCC" >&5
    2.46 +echo "configure:1218: checking for ld used by GCC" >&5
    2.47    case $host in
    2.48    *-*-mingw*)
    2.49      # gcc leaves a trailing carriage return which upsets mingw
    2.50 @@ -1243,10 +1244,10 @@
    2.51    esac
    2.52  elif test "$with_gnu_ld" = yes; then
    2.53    echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
    2.54 -echo "configure:1247: checking for GNU ld" >&5
    2.55 +echo "configure:1248: checking for GNU ld" >&5
    2.56  else
    2.57    echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
    2.58 -echo "configure:1250: checking for non-GNU ld" >&5
    2.59 +echo "configure:1251: checking for non-GNU ld" >&5
    2.60  fi
    2.61  if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
    2.62    echo $ac_n "(cached) $ac_c" 1>&6
    2.63 @@ -1282,7 +1283,7 @@
    2.64  test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
    2.65  
    2.66  echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
    2.67 -echo "configure:1286: checking if the linker ($LD) is GNU ld" >&5
    2.68 +echo "configure:1287: checking if the linker ($LD) is GNU ld" >&5
    2.69  if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
    2.70    echo $ac_n "(cached) $ac_c" 1>&6
    2.71  else
    2.72 @@ -1298,7 +1299,7 @@
    2.73  
    2.74  
    2.75  echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
    2.76 -echo "configure:1302: checking for BSD-compatible nm" >&5
    2.77 +echo "configure:1303: checking for BSD-compatible nm" >&5
    2.78  if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
    2.79    echo $ac_n "(cached) $ac_c" 1>&6
    2.80  else
    2.81 @@ -1335,7 +1336,7 @@
    2.82  
    2.83  
    2.84  echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
    2.85 -echo "configure:1339: checking whether ln -s works" >&5
    2.86 +echo "configure:1340: checking whether ln -s works" >&5
    2.87  if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
    2.88    echo $ac_n "(cached) $ac_c" 1>&6
    2.89  else
    2.90 @@ -1365,7 +1366,7 @@
    2.91  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
    2.92  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
    2.93  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    2.94 -echo "configure:1369: checking for $ac_word" >&5
    2.95 +echo "configure:1370: checking for $ac_word" >&5
    2.96  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
    2.97    echo $ac_n "(cached) $ac_c" 1>&6
    2.98  else
    2.99 @@ -1397,7 +1398,7 @@
   2.100    # Extract the first word of "ranlib", so it can be a program name with args.
   2.101  set dummy ranlib; ac_word=$2
   2.102  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   2.103 -echo "configure:1401: checking for $ac_word" >&5
   2.104 +echo "configure:1402: checking for $ac_word" >&5
   2.105  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   2.106    echo $ac_n "(cached) $ac_c" 1>&6
   2.107  else
   2.108 @@ -1438,7 +1439,7 @@
   2.109  test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
   2.110  test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
   2.111  
   2.112 -
   2.113 +libtool_flags="$libtool_flags --enable-win32-dll"
   2.114  # Check whether --enable-libtool-lock or --disable-libtool-lock was given.
   2.115  if test "${enable_libtool_lock+set}" = set; then
   2.116    enableval="$enable_libtool_lock"
   2.117 @@ -1464,8 +1465,8 @@
   2.118  case "$host" in
   2.119  *-*-irix6*)
   2.120    # Find out which ABI we are using.
   2.121 -  echo '#line 1468 "configure"' > conftest.$ac_ext
   2.122 -  if { (eval echo configure:1469: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   2.123 +  echo '#line 1469 "configure"' > conftest.$ac_ext
   2.124 +  if { (eval echo configure:1470: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   2.125      case "`/usr/bin/file conftest.o`" in
   2.126      *32-bit*)
   2.127        LD="${LD-ld} -32"
   2.128 @@ -1486,19 +1487,19 @@
   2.129    SAVE_CFLAGS="$CFLAGS"
   2.130    CFLAGS="$CFLAGS -belf"
   2.131    echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
   2.132 -echo "configure:1490: checking whether the C compiler needs -belf" >&5
   2.133 +echo "configure:1491: checking whether the C compiler needs -belf" >&5
   2.134  if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   2.135    echo $ac_n "(cached) $ac_c" 1>&6
   2.136  else
   2.137    cat > conftest.$ac_ext <<EOF
   2.138 -#line 1495 "configure"
   2.139 +#line 1496 "configure"
   2.140  #include "confdefs.h"
   2.141  
   2.142  int main() {
   2.143  
   2.144  ; return 0; }
   2.145  EOF
   2.146 -if { (eval echo configure:1502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   2.147 +if { (eval echo configure:1503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   2.148    rm -rf conftest*
   2.149    lt_cv_cc_needs_belf=yes
   2.150  else
   2.151 @@ -1517,7 +1518,278 @@
   2.152    fi
   2.153    ;;
   2.154  
   2.155 +*-*-cygwin* | *-*-mingw*)
   2.156 +  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
   2.157 +set dummy ${ac_tool_prefix}dlltool; ac_word=$2
   2.158 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   2.159 +echo "configure:1526: checking for $ac_word" >&5
   2.160 +if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   2.161 +  echo $ac_n "(cached) $ac_c" 1>&6
   2.162 +else
   2.163 +  if test -n "$DLLTOOL"; then
   2.164 +  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
   2.165 +else
   2.166 +  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   2.167 +  ac_dummy="$PATH"
   2.168 +  for ac_dir in $ac_dummy; do
   2.169 +    test -z "$ac_dir" && ac_dir=.
   2.170 +    if test -f $ac_dir/$ac_word; then
   2.171 +      ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
   2.172 +      break
   2.173 +    fi
   2.174 +  done
   2.175 +  IFS="$ac_save_ifs"
   2.176 +fi
   2.177 +fi
   2.178 +DLLTOOL="$ac_cv_prog_DLLTOOL"
   2.179 +if test -n "$DLLTOOL"; then
   2.180 +  echo "$ac_t""$DLLTOOL" 1>&6
   2.181 +else
   2.182 +  echo "$ac_t""no" 1>&6
   2.183 +fi
   2.184  
   2.185 +
   2.186 +if test -z "$ac_cv_prog_DLLTOOL"; then
   2.187 +if test -n "$ac_tool_prefix"; then
   2.188 +  # Extract the first word of "dlltool", so it can be a program name with args.
   2.189 +set dummy dlltool; ac_word=$2
   2.190 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   2.191 +echo "configure:1558: checking for $ac_word" >&5
   2.192 +if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   2.193 +  echo $ac_n "(cached) $ac_c" 1>&6
   2.194 +else
   2.195 +  if test -n "$DLLTOOL"; then
   2.196 +  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
   2.197 +else
   2.198 +  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   2.199 +  ac_dummy="$PATH"
   2.200 +  for ac_dir in $ac_dummy; do
   2.201 +    test -z "$ac_dir" && ac_dir=.
   2.202 +    if test -f $ac_dir/$ac_word; then
   2.203 +      ac_cv_prog_DLLTOOL="dlltool"
   2.204 +      break
   2.205 +    fi
   2.206 +  done
   2.207 +  IFS="$ac_save_ifs"
   2.208 +  test -z "$ac_cv_prog_DLLTOOL" && ac_cv_prog_DLLTOOL="false"
   2.209 +fi
   2.210 +fi
   2.211 +DLLTOOL="$ac_cv_prog_DLLTOOL"
   2.212 +if test -n "$DLLTOOL"; then
   2.213 +  echo "$ac_t""$DLLTOOL" 1>&6
   2.214 +else
   2.215 +  echo "$ac_t""no" 1>&6
   2.216 +fi
   2.217 +
   2.218 +else
   2.219 +  DLLTOOL="false"
   2.220 +fi
   2.221 +fi
   2.222 +
   2.223 +  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
   2.224 +set dummy ${ac_tool_prefix}as; ac_word=$2
   2.225 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   2.226 +echo "configure:1593: checking for $ac_word" >&5
   2.227 +if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   2.228 +  echo $ac_n "(cached) $ac_c" 1>&6
   2.229 +else
   2.230 +  if test -n "$AS"; then
   2.231 +  ac_cv_prog_AS="$AS" # Let the user override the test.
   2.232 +else
   2.233 +  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   2.234 +  ac_dummy="$PATH"
   2.235 +  for ac_dir in $ac_dummy; do
   2.236 +    test -z "$ac_dir" && ac_dir=.
   2.237 +    if test -f $ac_dir/$ac_word; then
   2.238 +      ac_cv_prog_AS="${ac_tool_prefix}as"
   2.239 +      break
   2.240 +    fi
   2.241 +  done
   2.242 +  IFS="$ac_save_ifs"
   2.243 +fi
   2.244 +fi
   2.245 +AS="$ac_cv_prog_AS"
   2.246 +if test -n "$AS"; then
   2.247 +  echo "$ac_t""$AS" 1>&6
   2.248 +else
   2.249 +  echo "$ac_t""no" 1>&6
   2.250 +fi
   2.251 +
   2.252 +
   2.253 +if test -z "$ac_cv_prog_AS"; then
   2.254 +if test -n "$ac_tool_prefix"; then
   2.255 +  # Extract the first word of "as", so it can be a program name with args.
   2.256 +set dummy as; ac_word=$2
   2.257 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   2.258 +echo "configure:1625: checking for $ac_word" >&5
   2.259 +if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   2.260 +  echo $ac_n "(cached) $ac_c" 1>&6
   2.261 +else
   2.262 +  if test -n "$AS"; then
   2.263 +  ac_cv_prog_AS="$AS" # Let the user override the test.
   2.264 +else
   2.265 +  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   2.266 +  ac_dummy="$PATH"
   2.267 +  for ac_dir in $ac_dummy; do
   2.268 +    test -z "$ac_dir" && ac_dir=.
   2.269 +    if test -f $ac_dir/$ac_word; then
   2.270 +      ac_cv_prog_AS="as"
   2.271 +      break
   2.272 +    fi
   2.273 +  done
   2.274 +  IFS="$ac_save_ifs"
   2.275 +  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="false"
   2.276 +fi
   2.277 +fi
   2.278 +AS="$ac_cv_prog_AS"
   2.279 +if test -n "$AS"; then
   2.280 +  echo "$ac_t""$AS" 1>&6
   2.281 +else
   2.282 +  echo "$ac_t""no" 1>&6
   2.283 +fi
   2.284 +
   2.285 +else
   2.286 +  AS="false"
   2.287 +fi
   2.288 +fi
   2.289 +
   2.290 +  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
   2.291 +set dummy ${ac_tool_prefix}objdump; ac_word=$2
   2.292 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   2.293 +echo "configure:1660: checking for $ac_word" >&5
   2.294 +if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   2.295 +  echo $ac_n "(cached) $ac_c" 1>&6
   2.296 +else
   2.297 +  if test -n "$OBJDUMP"; then
   2.298 +  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
   2.299 +else
   2.300 +  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   2.301 +  ac_dummy="$PATH"
   2.302 +  for ac_dir in $ac_dummy; do
   2.303 +    test -z "$ac_dir" && ac_dir=.
   2.304 +    if test -f $ac_dir/$ac_word; then
   2.305 +      ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
   2.306 +      break
   2.307 +    fi
   2.308 +  done
   2.309 +  IFS="$ac_save_ifs"
   2.310 +fi
   2.311 +fi
   2.312 +OBJDUMP="$ac_cv_prog_OBJDUMP"
   2.313 +if test -n "$OBJDUMP"; then
   2.314 +  echo "$ac_t""$OBJDUMP" 1>&6
   2.315 +else
   2.316 +  echo "$ac_t""no" 1>&6
   2.317 +fi
   2.318 +
   2.319 +
   2.320 +if test -z "$ac_cv_prog_OBJDUMP"; then
   2.321 +if test -n "$ac_tool_prefix"; then
   2.322 +  # Extract the first word of "objdump", so it can be a program name with args.
   2.323 +set dummy objdump; ac_word=$2
   2.324 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   2.325 +echo "configure:1692: checking for $ac_word" >&5
   2.326 +if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   2.327 +  echo $ac_n "(cached) $ac_c" 1>&6
   2.328 +else
   2.329 +  if test -n "$OBJDUMP"; then
   2.330 +  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
   2.331 +else
   2.332 +  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   2.333 +  ac_dummy="$PATH"
   2.334 +  for ac_dir in $ac_dummy; do
   2.335 +    test -z "$ac_dir" && ac_dir=.
   2.336 +    if test -f $ac_dir/$ac_word; then
   2.337 +      ac_cv_prog_OBJDUMP="objdump"
   2.338 +      break
   2.339 +    fi
   2.340 +  done
   2.341 +  IFS="$ac_save_ifs"
   2.342 +  test -z "$ac_cv_prog_OBJDUMP" && ac_cv_prog_OBJDUMP="false"
   2.343 +fi
   2.344 +fi
   2.345 +OBJDUMP="$ac_cv_prog_OBJDUMP"
   2.346 +if test -n "$OBJDUMP"; then
   2.347 +  echo "$ac_t""$OBJDUMP" 1>&6
   2.348 +else
   2.349 +  echo "$ac_t""no" 1>&6
   2.350 +fi
   2.351 +
   2.352 +else
   2.353 +  OBJDUMP="false"
   2.354 +fi
   2.355 +fi
   2.356 +
   2.357 +
   2.358 +  # recent cygwin and mingw systems supply a stub DllMain which the user
   2.359 +  # can override, but on older systems we have to supply one
   2.360 +  echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6
   2.361 +echo "configure:1728: checking if libtool should supply DllMain function" >&5
   2.362 +if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then
   2.363 +  echo $ac_n "(cached) $ac_c" 1>&6
   2.364 +else
   2.365 +  cat > conftest.$ac_ext <<EOF
   2.366 +#line 1733 "configure"
   2.367 +#include "confdefs.h"
   2.368 +DllMain (0, 0, 0);
   2.369 +int main() {
   2.370 +extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
   2.371 +; return 0; }
   2.372 +EOF
   2.373 +if { (eval echo configure:1740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   2.374 +  rm -rf conftest*
   2.375 +  lt_cv_need_dllmain=yes
   2.376 +else
   2.377 +  echo "configure: failed program was:" >&5
   2.378 +  cat conftest.$ac_ext >&5
   2.379 +  rm -rf conftest*
   2.380 +  lt_cv_need_dllmain=no
   2.381 +fi
   2.382 +rm -f conftest*
   2.383 +fi
   2.384 +
   2.385 +echo "$ac_t""$lt_cv_need_dllmain" 1>&6
   2.386 +
   2.387 +  case $host in
   2.388 +  *-*-cygwin*)
   2.389 +    # cygwin systems need to pass --dll to the linker, and not link
   2.390 +    # crt.o which will require a WinMain@16 definition.
   2.391 +    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
   2.392 +  *-*-mingw*)
   2.393 +    # old mingw systems require "-dll" to link a DLL, while more recent ones
   2.394 +    # require "-mdll"
   2.395 +    SAVE_CFLAGS="$CFLAGS"
   2.396 +    CFLAGS="$CFLAGS -mdll"
   2.397 +    echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6
   2.398 +echo "configure:1765: checking how to link DLLs" >&5
   2.399 +if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then
   2.400 +  echo $ac_n "(cached) $ac_c" 1>&6
   2.401 +else
   2.402 +  cat > conftest.$ac_ext <<EOF
   2.403 +#line 1770 "configure"
   2.404 +#include "confdefs.h"
   2.405 +
   2.406 +int main() {
   2.407 +
   2.408 +; return 0; }
   2.409 +EOF
   2.410 +if { (eval echo configure:1777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   2.411 +  rm -rf conftest*
   2.412 +  lt_cv_cc_dll_switch=-mdll
   2.413 +else
   2.414 +  echo "configure: failed program was:" >&5
   2.415 +  cat conftest.$ac_ext >&5
   2.416 +  rm -rf conftest*
   2.417 +  lt_cv_cc_dll_switch=-dll
   2.418 +fi
   2.419 +rm -f conftest*
   2.420 +fi
   2.421 +
   2.422 +echo "$ac_t""$lt_cv_cc_dll_switch" 1>&6
   2.423 +    CFLAGS="$SAVE_CFLAGS" ;;
   2.424 +  esac
   2.425 +  ;;
   2.426 +  
   2.427  esac
   2.428  
   2.429  
   2.430 @@ -1611,7 +1883,7 @@
   2.431  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
   2.432  # ./install, which can be erroneously created by make from ./install.sh.
   2.433  echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
   2.434 -echo "configure:1615: checking for a BSD compatible install" >&5
   2.435 +echo "configure:1887: checking for a BSD compatible install" >&5
   2.436  if test -z "$INSTALL"; then
   2.437  if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   2.438    echo $ac_n "(cached) $ac_c" 1>&6
   2.439 @@ -1665,7 +1937,7 @@
   2.440  
   2.441  
   2.442  echo $ac_n "checking target system type""... $ac_c" 1>&6
   2.443 -echo "configure:1669: checking target system type" >&5
   2.444 +echo "configure:1941: checking target system type" >&5
   2.445  
   2.446  target_alias=$target
   2.447  case "$target_alias" in
   2.448 @@ -1730,7 +2002,7 @@
   2.449    # Extract the first word of "sdl-config", so it can be a program name with args.
   2.450  set dummy sdl-config; ac_word=$2
   2.451  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   2.452 -echo "configure:1734: checking for $ac_word" >&5
   2.453 +echo "configure:2006: checking for $ac_word" >&5
   2.454  if eval "test \"`echo '$''{'ac_cv_path_SDL_CONFIG'+set}'`\" = set"; then
   2.455    echo $ac_n "(cached) $ac_c" 1>&6
   2.456  else
   2.457 @@ -1765,7 +2037,7 @@
   2.458  
   2.459    min_sdl_version=$SDL_VERSION
   2.460    echo $ac_n "checking for SDL - version >= $min_sdl_version""... $ac_c" 1>&6
   2.461 -echo "configure:1769: checking for SDL - version >= $min_sdl_version" >&5
   2.462 +echo "configure:2041: checking for SDL - version >= $min_sdl_version" >&5
   2.463    no_sdl=""
   2.464    if test "$SDL_CONFIG" = "no" ; then
   2.465      no_sdl=yes
   2.466 @@ -1789,13 +2061,13 @@
   2.467    echo $ac_n "cross compiling; assumed OK... $ac_c"
   2.468  else
   2.469    cat > conftest.$ac_ext <<EOF
   2.470 -#line 1793 "configure"
   2.471 +#line 2065 "configure"
   2.472  #include "confdefs.h"
   2.473  
   2.474  #include <stdio.h>
   2.475  #include <stdlib.h>
   2.476  #include <string.h>
   2.477 -#include <SDL/SDL.h>
   2.478 +#include "SDL.h"
   2.479  
   2.480  char*
   2.481  my_strdup (char *str)
   2.482 @@ -1847,7 +2119,7 @@
   2.483  
   2.484  
   2.485  EOF
   2.486 -if { (eval echo configure:1851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
   2.487 +if { (eval echo configure:2123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
   2.488  then
   2.489    :
   2.490  else
   2.491 @@ -1881,17 +2153,17 @@
   2.492            CFLAGS="$CFLAGS $SDL_CFLAGS"
   2.493            LIBS="$LIBS $SDL_LIBS"
   2.494            cat > conftest.$ac_ext <<EOF
   2.495 -#line 1885 "configure"
   2.496 +#line 2157 "configure"
   2.497  #include "confdefs.h"
   2.498  
   2.499  #include <stdio.h>
   2.500 -#include <SDL/SDL.h>
   2.501 +#include "SDL.h"
   2.502  
   2.503  int main() {
   2.504   return 0; 
   2.505  ; return 0; }
   2.506  EOF
   2.507 -if { (eval echo configure:1895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   2.508 +if { (eval echo configure:2167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   2.509    rm -rf conftest*
   2.510     echo "*** The test program compiled, but did not run. This usually means"
   2.511            echo "*** that the run-time linker is not finding SDL or finding the wrong"
   2.512 @@ -1984,10 +2256,10 @@
   2.513  
   2.514  if test x$enable_music_mp3 = xyes; then
   2.515      echo $ac_n "checking for SMPEG headers and libraries""... $ac_c" 1>&6
   2.516 -echo "configure:1988: checking for SMPEG headers and libraries" >&5
   2.517 +echo "configure:2260: checking for SMPEG headers and libraries" >&5
   2.518      have_smpeg=no
   2.519      cat > conftest.$ac_ext <<EOF
   2.520 -#line 1991 "configure"
   2.521 +#line 2263 "configure"
   2.522  #include "confdefs.h"
   2.523  
   2.524       #include <smpeg/smpeg.h>
   2.525 @@ -1997,7 +2269,7 @@
   2.526      
   2.527  ; return 0; }
   2.528  EOF
   2.529 -if { (eval echo configure:2001: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   2.530 +if { (eval echo configure:2273: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   2.531    rm -rf conftest*
   2.532    
   2.533      have_smpeg=yes
   2.534 @@ -2219,6 +2491,9 @@
   2.535  s%@NM@%$NM%g
   2.536  s%@LN_S@%$LN_S%g
   2.537  s%@RANLIB@%$RANLIB%g
   2.538 +s%@DLLTOOL@%$DLLTOOL%g
   2.539 +s%@AS@%$AS%g
   2.540 +s%@OBJDUMP@%$OBJDUMP%g
   2.541  s%@LIBTOOL@%$LIBTOOL%g
   2.542  s%@target@%$target%g
   2.543  s%@target_alias@%$target_alias%g
     3.1 --- a/configure.in	Tue Dec 21 17:41:12 1999 +0000
     3.2 +++ b/configure.in	Sun Dec 26 11:17:50 1999 +0000
     3.3 @@ -13,9 +13,9 @@
     3.4  
     3.5  MAJOR_VERSION=1
     3.6  MINOR_VERSION=0
     3.7 -MICRO_VERSION=0
     3.8 +MICRO_VERSION=1
     3.9  INTERFACE_AGE=0
    3.10 -BINARY_AGE=0
    3.11 +BINARY_AGE=1
    3.12  VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
    3.13  
    3.14  AC_SUBST(MAJOR_VERSION)
    3.15 @@ -43,6 +43,7 @@
    3.16  
    3.17  AC_PROG_MAKE_SET
    3.18  AC_PROG_CC
    3.19 +AC_LIBTOOL_WIN32_DLL
    3.20  AM_PROG_LIBTOOL
    3.21  AC_PROG_INSTALL
    3.22  
     4.1 --- a/ltconfig	Tue Dec 21 17:41:12 1999 +0000
     4.2 +++ b/ltconfig	Sun Dec 26 11:17:50 1999 +0000
     4.3 @@ -170,7 +170,7 @@
     4.4  PROGRAM=ltconfig
     4.5  PACKAGE=libtool
     4.6  VERSION=1.3c
     4.7 -TIMESTAMP=" (1.612 1999/09/30 00:26:50)"
     4.8 +TIMESTAMP=" (1.620 1999/10/07 15:40:07)"
     4.9  ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5'
    4.10  ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS 1>&5'
    4.11  rm="rm -f"
    4.12 @@ -511,219 +511,28 @@
    4.13  old_postinstall_cmds='chmod 644 $oldlib'
    4.14  old_postuninstall_cmds=
    4.15  
    4.16 -# Set a sane default for `AR'.
    4.17 +# Set sane defaults for various commands
    4.18 +#   -- these are usually overridden from the command line by make
    4.19  test -z "$AR" && AR=ar
    4.20 -
    4.21 -# Set a sane default for `OBJDUMP'.
    4.22 -test -z "$OBJDUMP" && OBJDUMP=objdump
    4.23 -
    4.24 -# Set sane defaults for `DLLTOOL'
    4.25 -test -z "$DLLTOOL" && DLLTOOL=dlltool
    4.26 -
    4.27 -# Set sane defaults for `AS'
    4.28 -test -z "$AS" && AS=as
    4.29 -
    4.30 -# Check to see if we can use ln -s, or we need hard links.
    4.31 -echo $ac_n "checking whether ln -s works... $ac_c" 1>&6
    4.32 -echo "$progname:528: checking for ln -s" 1>&5
    4.33 -result=yes
    4.34 -if test "X${ac_cv_prog_LN_S+set}" = Xset; then
    4.35 -  echo $ac_n "(cached) $ac_c" 1>&6
    4.36 -  if test "X$ac_cv_prog_LN_S" != "Xln -s"; then
    4.37 -    result=no
    4.38 -  fi
    4.39 -else
    4.40 -  if test -n "$LN_S"; then
    4.41 -    ac_cv_prog_LN_S="$LN_S"
    4.42 -  else
    4.43 -    $rm conftest.dat
    4.44 -    if ln -s X conftest.dat 2>/dev/null; then
    4.45 -      $rm conftest.dat
    4.46 -      ac_cv_prog_LN_S="ln -s"
    4.47 -    else
    4.48 -      ac_cv_prog_LN_S=ln
    4.49 -      result=no
    4.50 -    fi
    4.51 -  fi
    4.52 -fi
    4.53 -LN_S="$ac_cv_prog_LN_S"
    4.54 -echo "$ac_t""$result" 1>&6
    4.55 -
    4.56 -# Search for a ranlib program
    4.57 -for ac_prog in "${ac_host_prefix}ranlib" ranlib :
    4.58 -do
    4.59 -  echo $ac_n "checking for $ac_prog... $ac_c" 1>&6
    4.60 -  echo "$progname:556: checking for $ac_prog" 1>&5
    4.61 -  if test "X${ac_cv_prog_RANLIB+set}" = Xset; then
    4.62 -    echo $ac_n "(cached) $ac_c" 1>&6
    4.63 -  else
    4.64 -    if test -n "$RANLIB"; then
    4.65 -      ac_cv_prog_RANLIB="$RANLIB"	# Let the user override the test.
    4.66 -    else
    4.67 -      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
    4.68 -      for dir in $PATH; do
    4.69 -        test -z "$dir" && dir=.
    4.70 -        if test -f $dir/$ac_prog || test -f $dir/$ac_prog$ac_exeext; then
    4.71 -	  ac_cv_prog_RANLIB="$ac_prog"
    4.72 -	  break
    4.73 -        fi
    4.74 -      done
    4.75 -      IFS="$save_ifs"
    4.76 -    fi
    4.77 -  fi
    4.78 -  if test -n "$ac_cv_prog_RANLIB"; then
    4.79 -    RANLIB="$ac_cv_prog_RANLIB"
    4.80 -    old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
    4.81 -    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
    4.82 -    echo "$ac_t$RANLIB" 1>&6
    4.83 -  else
    4.84 -    echo "$ac_t""no" 1>&6
    4.85 -  fi
    4.86 -
    4.87 -  test -n "$RANLIB" && break
    4.88 -done
    4.89 -
    4.90 -if test -z "$NM"; then
    4.91 -  echo $ac_n "checking for BSD-compatible nm... $ac_c" 1>&6
    4.92 -  case "$NM" in
    4.93 -  [\\/]* | [A-Za-z]:[\\/]*) ;; # Let the user override the test with a path.
    4.94 -  *)
    4.95 -    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
    4.96 -    for ac_dir in $PATH /usr/ucb /usr/ccs/bin /bin; do
    4.97 -      test -z "$ac_dir" && ac_dir=.
    4.98 -      if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext; then
    4.99 -	# Check to see if the nm accepts a BSD-compat flag.
   4.100 -	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
   4.101 -	#   nm: unknown option "B" ignored
   4.102 -	if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
   4.103 -	  NM="$ac_dir/nm -B"
   4.104 -	  break
   4.105 -	elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
   4.106 -	  NM="$ac_dir/nm -p"
   4.107 -	  break
   4.108 -	else
   4.109 -	  NM=${NM="$ac_dir/nm"} # keep the first match, but
   4.110 -	  continue # so that we can try to find one that supports BSD flags
   4.111 -	fi
   4.112 -      fi
   4.113 -    done
   4.114 -    IFS="$ac_save_ifs"
   4.115 -    test -z "$NM" && NM=nm
   4.116 -    ;;
   4.117 -  esac
   4.118 -  echo "$ac_t$NM" 1>&6
   4.119 -fi
   4.120 -
   4.121 -# Search for a strip program
   4.122 -echo $ac_n "checking for strip... $ac_c" 1>&6
   4.123 -echo "$progname:619: checking for strip" 1>&5
   4.124 -if test "X${ac_cv_prog_STRIP+set}" = Xset; then
   4.125 -  echo $ac_n "(cached) $ac_c" 1>&6
   4.126 -  result="$ac_cv_prog_STRIP"
   4.127 -else
   4.128 -  if test -n "$STRIP"; then
   4.129 -    result="$STRIP"		# Let the user override the test.
   4.130 -    ac_cv_prog_STRIP="$result"
   4.131 -  else
   4.132 -    result=no
   4.133 -    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
   4.134 -    for dir in $PATH; do
   4.135 -      test -z "$dir" && dir=.
   4.136 -      if test -f $dir/strip || test -f $dir/strip$ac_exeext; then
   4.137 -	result="strip"
   4.138 -	ac_cv_prog_STRIP="$result"
   4.139 -	break
   4.140 -      fi
   4.141 -    done
   4.142 -    IFS="$save_ifs"
   4.143 -  fi
   4.144 -fi
   4.145 -test -n "$ac_cv_prog_STRIP" && STRIP="$ac_cv_prog_STRIP"
   4.146 -echo "$ac_t$result" 1>&6
   4.147 -
   4.148 -# Check to see if we are using GCC.
   4.149 -if test "$with_gcc" != yes || test -z "$CC"; then
   4.150 -  # If CC is not set, then try to find GCC or a usable CC.
   4.151 -  if test -z "$CC"; then
   4.152 -    echo $ac_n "checking for gcc... $ac_c" 1>&6
   4.153 -    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
   4.154 -    for dir in $PATH; do
   4.155 -      test -z "$dir" && dir=.
   4.156 -      if test -f $dir/gcc || test -f $dir/gcc$ac_exeext; then
   4.157 -	CC="gcc"
   4.158 -	break
   4.159 -      fi
   4.160 -    done
   4.161 -    IFS="$save_ifs"
   4.162 -
   4.163 -    if test -n "$CC"; then
   4.164 -      echo "$ac_t$CC" 1>&6
   4.165 -    else
   4.166 -      echo "$ac_t"no 1>&6
   4.167 -    fi
   4.168 -  fi
   4.169 -
   4.170 -  # Not "gcc", so try "cc", rejecting "/usr/ucb/cc".
   4.171 -  if test -z "$CC"; then
   4.172 -    echo $ac_n "checking for cc... $ac_c" 1>&6
   4.173 -    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
   4.174 -    cc_rejected=no
   4.175 -    for dir in $PATH; do
   4.176 -      test -z "$dir" && dir=.
   4.177 -      if test -f $dir/cc || test -f $dir/cc$ac_exeext; then
   4.178 -	if test "$dir/cc" = "/usr/ucb/cc"; then
   4.179 -	  cc_rejected=yes
   4.180 -	  continue
   4.181 -	fi
   4.182 -	CC="cc"
   4.183 -	break
   4.184 -      fi
   4.185 -    done
   4.186 -    IFS="$save_ifs"
   4.187 -    if test $cc_rejected = yes; then
   4.188 -      # We found a bogon in the path, so make sure we never use it.
   4.189 -      set dummy $CC
   4.190 -      shift
   4.191 -      if test $# -gt 0; then
   4.192 -	# We chose a different compiler from the bogus one.
   4.193 -	# However, it has the same name, so the bogon will be chosen
   4.194 -	# first if we set CC to just the name; use the full file name.
   4.195 -	shift
   4.196 -	set dummy "$dir/cc" "$@"
   4.197 -	shift
   4.198 -	CC="$@"
   4.199 -      fi
   4.200 -    fi
   4.201 -
   4.202 -    if test -n "$CC"; then
   4.203 -      echo "$ac_t$CC" 1>&6
   4.204 -    else
   4.205 -      echo "$ac_t"no 1>&6
   4.206 -    fi
   4.207 -
   4.208 -    if test -z "$CC"; then
   4.209 -      echo "$progname: error: no acceptable cc found in \$PATH" 1>&2
   4.210 -      exit 1
   4.211 -    fi
   4.212 -  fi
   4.213 -
   4.214 -  # Now see if the compiler is really GCC.
   4.215 -  with_gcc=no
   4.216 -  echo $ac_n "checking whether we are using GNU C... $ac_c" 1>&6
   4.217 -  echo "$progname:713: checking whether we are using GNU C" >&5
   4.218 -
   4.219 -  $rm conftest.c
   4.220 -  cat > conftest.c <<EOF
   4.221 -#ifdef __GNUC__
   4.222 -  yes;
   4.223 -#endif
   4.224 -EOF
   4.225 -  if { ac_try='${CC-cc} -E conftest.c'; { (eval echo $progname:721: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   4.226 -    with_gcc=yes
   4.227 -  fi
   4.228 -  $rm conftest.c
   4.229 -  echo "$ac_t$with_gcc" 1>&6
   4.230 -fi
   4.231 +test -z "$AS" && AS=
   4.232 +test -z "$DLLTOOL" && DLLTOOL=
   4.233 +test -z "$LN_S" && LN_S=ln -s
   4.234 +test -z "$NM" && NM=/usr/bin/nm -B
   4.235 +test -z "$OBJDUMP" && OBJDUMP=
   4.236 +test -z "$RANLIB" && RANLIB=ranlib
   4.237 +
   4.238 +# Commands probed in libtool.m4
   4.239 +#   -- let the user override the result from configure
   4.240 +test -z "$CC" && CC=gcc
   4.241 +test -z "$FILE" && FILE=file
   4.242 +test -z "$LD" && LD=/usr/bin/ld
   4.243 +test -z "$STRIP" && STRIP=strip
   4.244 +
   4.245 +# Other config vars probed in libtool.m4
   4.246 +test -z "$with_gcc" && with_gcc=yes
   4.247 +test -z "$with_gnu_ld" && with_gnu_ld=yes
   4.248 +objext=o
   4.249 +exeext=
   4.250  
   4.251  echo $ac_n "checking for objdir... $ac_c" 1>&6
   4.252  rm -f .libs 2>/dev/null
   4.253 @@ -737,70 +546,6 @@
   4.254  rmdir .libs 2>/dev/null
   4.255  echo "$ac_t$objdir" 1>&6
   4.256  
   4.257 -echo $ac_n "checking for object suffix... $ac_c" 1>&6
   4.258 -echo "$progname:741: checking for object suffix" 1>&5
   4.259 -if test "X${ac_cv_objext+set}" = Xset; then
   4.260 -  echo $ac_n "(cached) $ac_c" 1>&6
   4.261 -else
   4.262 -  ac_cv_objext="no"
   4.263 -  $rm conftest*
   4.264 -  echo 'int i = 1;' > conftest.c
   4.265 -  if { (eval echo $progname:748: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; }; then
   4.266 -    # Append any warnings to the config.log.
   4.267 -    cat conftest.err 1>&5
   4.268 -
   4.269 -    for ac_file in conftest.*; do
   4.270 -      case $ac_file in
   4.271 -      *.c | *.err) ;;
   4.272 -      *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;;
   4.273 -      esac
   4.274 -    done
   4.275 -  else
   4.276 -    cat conftest.err 1>&5
   4.277 -    echo "$progname: failed program was:" >&5
   4.278 -    cat conftest.c >&5
   4.279 -  fi
   4.280 -  $rm conftest*
   4.281 -fi
   4.282 -if test "X$ac_cv_objext" = Xno; then
   4.283 -  objext=""
   4.284 -else
   4.285 -  objext="$ac_cv_objext"
   4.286 -fi
   4.287 -echo "$ac_t$ac_cv_objext" 1>&6
   4.288 -
   4.289 -echo $ac_n "checking for executable suffix... $ac_c" 1>&6
   4.290 -echo "$progname:773: checking for executable suffix" 1>&5
   4.291 -if test "X${ac_cv_exeext+set}" = Xset; then
   4.292 -  echo $ac_n "(cached) $ac_c" 1>&6
   4.293 -else
   4.294 -  ac_cv_exeext="no"
   4.295 -  $rm conftest*
   4.296 -  echo 'main () { return 0; }' > conftest.c
   4.297 -  if { (eval echo $progname:780: \"$ac_link\") 1>&5; (eval $ac_link) 2>conftest.err; }; then
   4.298 -    # Append any warnings to the config.log.
   4.299 -    cat conftest.err 1>&5
   4.300 -
   4.301 -    for ac_file in conftest.*; do
   4.302 -      case $ac_file in
   4.303 -      *.c | *.err | *.$objext ) ;;
   4.304 -      *) ac_cv_exeext=.`echo $ac_file | sed -e s/conftest.//` ;;
   4.305 -      esac
   4.306 -    done
   4.307 -  else
   4.308 -    cat conftest.err 1>&5
   4.309 -    echo "$progname: failed program was:" >&5
   4.310 -    cat conftest.c >&5
   4.311 -  fi
   4.312 -  $rm conftest*
   4.313 -fi
   4.314 -if test "X$ac_cv_exeext" = Xno; then
   4.315 -  exeext=""
   4.316 -else
   4.317 -  exeext="$ac_cv_exeext"
   4.318 -fi
   4.319 -echo "$ac_t$ac_cv_exeext" 1>&6
   4.320 -
   4.321  # Allow CC to be a program name with arguments.
   4.322  set dummy $CC
   4.323  compiler="$2"
   4.324 @@ -809,7 +554,7 @@
   4.325  # in isolation, and that seeing it set (from the cache) indicates that
   4.326  # the associated values are set (in the cache) correctly too.
   4.327  echo $ac_n "checking for $compiler option to produce PIC... $ac_c" 1>&6
   4.328 -echo "$progname:812:checking for $compiler option to produce PIC" 1>&5
   4.329 +echo "$progname:557:checking for $compiler option to produce PIC" 1>&5
   4.330  if test "X${ac_cv_prog_cc_pic+set}" = Xset; then
   4.331    echo $ac_n "(cached) $ac_c" 1>&6
   4.332  else
   4.333 @@ -825,7 +570,7 @@
   4.334      ac_cv_prog_cc_static='-static'
   4.335  
   4.336      case "$host_os" in
   4.337 -    beos* | irix5* | irix6* | osf3* | osf4*)
   4.338 +    beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
   4.339        # PIC is the default for these OSes.
   4.340        ;;
   4.341      aix*)
   4.342 @@ -884,7 +629,7 @@
   4.343        ac_cv_prog_cc_pic='-DDLL_EXPORT'
   4.344        ;;
   4.345  
   4.346 -    osf3* | osf4*)
   4.347 +    osf3* | osf4* | osf5*)
   4.348        # All OSF/1 code is PIC.
   4.349        ac_cv_prog_cc_wl='-Wl,'
   4.350        ac_cv_prog_cc_static='-non_shared'
   4.351 @@ -939,7 +684,7 @@
   4.352  
   4.353    # Check to make sure the pic_flag actually works.
   4.354    echo $ac_n "checking if $compiler PIC flag $ac_cv_prog_cc_pic works... $ac_c" 1>&6
   4.355 -  echo "$progname:942:checking that $compiler PIC flag $ac_cv_prog_cc_pic works." 1>&5
   4.356 +  echo "$progname:687:checking that $compiler PIC flag $ac_cv_prog_cc_pic works." 1>&5
   4.357    if test "X${ac_cv_prog_cc_pic_works+set}" = Xset; then
   4.358      echo $ac_n "(cached) $ac_c" 1>&6
   4.359    else
   4.360 @@ -948,7 +693,7 @@
   4.361      echo "int some_variable = 0;" > conftest.c
   4.362      save_CFLAGS="$CFLAGS"
   4.363      CFLAGS="$CFLAGS $ac_cv_prog_cc_pic -DPIC"
   4.364 -    if { (eval echo $progname:951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
   4.365 +    if { (eval echo $progname:696: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
   4.366        # Append any warnings to the config.log.
   4.367        cat conftest.err 1>&5
   4.368      
   4.369 @@ -1000,7 +745,7 @@
   4.370  fi
   4.371  
   4.372  echo $ac_n "checking if $compiler static flag $ac_cv_prog_cc_static works... $ac_c" 1>&6
   4.373 -echo "$progname:1003: checking if $compiler static flag $ac_cv_prog_cc_static works" >&5
   4.374 +echo "$progname:748: checking if $compiler static flag $ac_cv_prog_cc_static works" >&5
   4.375  if test "X${ac_cv_prog_cc_static_works+set}" = Xset; then
   4.376    echo $ac_n "(cached) $ac_c" 1>&6
   4.377  else
   4.378 @@ -1008,7 +753,7 @@
   4.379    echo 'main(){return(0);}' > conftest.c
   4.380    save_LDFLAGS="$LDFLAGS"
   4.381    LDFLAGS="$LDFLAGS $ac_cv_prog_cc_static"
   4.382 -  if { (eval echo $progname:1011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   4.383 +  if { (eval echo $progname:756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   4.384      ac_cv_prog_cc_static_works=yes
   4.385    else
   4.386      ac_cv_prog_cc_static_works=no
   4.387 @@ -1045,8 +790,8 @@
   4.388  chmod -w .
   4.389  save_CFLAGS="$CFLAGS"
   4.390  CFLAGS="$CFLAGS -o out/conftest2.o"
   4.391 -echo "$progname:1048: checking if $compiler supports -c -o file.o" >&5
   4.392 -if { (eval echo $progname:1049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.o; then
   4.393 +echo "$progname:793: checking if $compiler supports -c -o file.o" >&5
   4.394 +if { (eval echo $progname:794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.o; then
   4.395  
   4.396    # The compiler can only warn and ignore the option if not recognized
   4.397    # So say no if there are warnings
   4.398 @@ -1078,8 +823,8 @@
   4.399    echo "int some_variable = 0;" > conftest.c
   4.400    save_CFLAGS="$CFLAGS"
   4.401    CFLAGS="$CFLAGS -c -o conftest.lo"
   4.402 -  echo "$progname:1081: checking if $compiler supports -c -o file.lo" >&5
   4.403 -if { (eval echo $progname:1082: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.lo; then
   4.404 +  echo "$progname:826: checking if $compiler supports -c -o file.lo" >&5
   4.405 +if { (eval echo $progname:827: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.lo; then
   4.406  
   4.407      # The compiler can only warn and ignore the option if not recognized
   4.408      # So say no if there are warnings
   4.409 @@ -1130,8 +875,8 @@
   4.410    echo "int some_variable = 0;" > conftest.c
   4.411    save_CFLAGS="$CFLAGS"
   4.412    CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.c"
   4.413 -  echo "$progname:1133: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
   4.414 -  if { (eval echo $progname:1134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then
   4.415 +  echo "$progname:878: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
   4.416 +  if { (eval echo $progname:879: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then
   4.417  
   4.418      # The compiler can only warn and ignore the option if not recognized
   4.419      # So say no if there are warnings
   4.420 @@ -1159,89 +904,6 @@
   4.421    
   4.422  fi
   4.423  
   4.424 -# Make sure LD is an absolute path.
   4.425 -if test -z "$LD"; then
   4.426 -  ac_prog=ld
   4.427 -  if test "$with_gcc" = yes; then
   4.428 -    # Check if gcc -print-prog-name=ld gives a path.
   4.429 -    echo $ac_n "checking for ld used by GCC... $ac_c" 1>&6
   4.430 -    echo "$progname:1168: checking for ld used by GCC" >&5
   4.431 -    case $host in
   4.432 -    *-*-mingw*)
   4.433 -      # gcc leaves a trailing carriage return which upsets mingw
   4.434 -      ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
   4.435 -    *)
   4.436 -      ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
   4.437 -    esac
   4.438 -    case "$ac_prog" in
   4.439 -    # Accept absolute paths.
   4.440 -    [\\/]* | [A-Za-z]:[\\/]*)
   4.441 -      re_direlt='/[^/][^/]*/\.\./'
   4.442 -      # Canonicalize the path of ld
   4.443 -      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
   4.444 -      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
   4.445 -	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
   4.446 -      done
   4.447 -      test -z "$LD" && LD="$ac_prog"
   4.448 -      ;;
   4.449 -    "")
   4.450 -      # If it fails, then pretend we are not using GCC.
   4.451 -      ac_prog=ld
   4.452 -      ;;
   4.453 -    *)
   4.454 -      # If it is relative, then search for the first ld in PATH.
   4.455 -      with_gnu_ld=unknown
   4.456 -      ;;
   4.457 -    esac
   4.458 -  elif test "$with_gnu_ld" = yes; then
   4.459 -    echo $ac_n "checking for GNU ld... $ac_c" 1>&6
   4.460 -    echo "$progname:1198: checking for GNU ld" >&5
   4.461 -  else
   4.462 -    echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
   4.463 -    echo "$progname:1201: checking for non-GNU ld" >&5
   4.464 -  fi
   4.465 -
   4.466 -  if test -z "$LD"; then
   4.467 -    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
   4.468 -    for ac_dir in $PATH; do
   4.469 -      test -z "$ac_dir" && ac_dir=.
   4.470 -      if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
   4.471 -	LD="$ac_dir/$ac_prog"
   4.472 -	# Check to see if the program is GNU ld.  I'd rather use --version,
   4.473 -	# but apparently some GNU ld's only accept -v.
   4.474 -	# Break only if it was the GNU/non-GNU ld that we prefer.
   4.475 -	if "$LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
   4.476 -	  test "$with_gnu_ld" != no && break
   4.477 -	else
   4.478 -	  test "$with_gnu_ld" != yes && break
   4.479 -	fi
   4.480 -      fi
   4.481 -    done
   4.482 -    IFS="$ac_save_ifs"
   4.483 -  fi
   4.484 -
   4.485 -  if test -n "$LD"; then
   4.486 -    echo "$ac_t$LD" 1>&6
   4.487 -  else
   4.488 -    echo "$ac_t"no 1>&6
   4.489 -  fi
   4.490 -
   4.491 -  if test -z "$LD"; then
   4.492 -    echo "$progname: error: no acceptable ld found in \$PATH" 1>&2
   4.493 -    exit 1
   4.494 -  fi
   4.495 -fi
   4.496 -
   4.497 -# Check to see if it really is or is not GNU ld.
   4.498 -echo $ac_n "checking if the linker ($LD) is GNU ld... $ac_c" 1>&6
   4.499 -# I'd rather use --version here, but apparently some GNU ld's only accept -v.
   4.500 -if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
   4.501 -  with_gnu_ld=yes
   4.502 -else
   4.503 -  with_gnu_ld=no
   4.504 -fi
   4.505 -echo "$ac_t$with_gnu_ld" 1>&6
   4.506 -
   4.507  # See if the linker supports building shared libraries.
   4.508  echo $ac_n "checking whether the linker ($LD) supports shared libraries... $ac_c" 1>&6
   4.509  
   4.510 @@ -1334,7 +996,7 @@
   4.511  
   4.512    beos*)
   4.513      if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
   4.514 -      allow_undefined_flag=unsupported
   4.515 +      #allow_undefined_flag=unsupported
   4.516        # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
   4.517        # support --undefined.  This deserves some investigation.  FIXME
   4.518        archive_cmds='$CC -nostart $libobjs $deplibs $linker_flags ${wl}-soname $wl$soname -o $lib'
   4.519 @@ -1631,7 +1293,7 @@
   4.520      old_archive_from_new_cmds='emximp -o $objdir/$libname.a $objdir/$libname.def'
   4.521      ;;
   4.522  
   4.523 -  osf3* | osf4*)
   4.524 +  osf3* | osf4* | osf5*)
   4.525      if test "$with_gcc" = yes; then
   4.526        allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
   4.527        archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
   4.528 @@ -1667,17 +1329,6 @@
   4.529      link_all_deplibs=yes
   4.530      ;;
   4.531  
   4.532 -  sysv5*)
   4.533 -    no_undefined_flag=' -z text'
   4.534 -    # $CC -shared without GNU ld will not create a library from C++
   4.535 -    # object files and a static libstdc++, better avoid it by now
   4.536 -    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts'
   4.537 -    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
   4.538 -		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp'
   4.539 -    hardcode_libdir_flag_spec=
   4.540 -    hardcode_shlibpath_var=no
   4.541 -    ;;
   4.542 -
   4.543    sunos4*)
   4.544      archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
   4.545      hardcode_libdir_flag_spec='-L$libdir'
   4.546 @@ -1699,12 +1350,16 @@
   4.547      export_dynamic_flag_spec='-Bexport'
   4.548      ;;
   4.549  
   4.550 -  sysv5)
   4.551 -    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs
   4.552 -$linker_flags'
   4.553 +  sysv5*)
   4.554 +    no_undefined_flag=' -z text'
   4.555 +    # $CC -shared without GNU ld will not create a library from C++
   4.556 +    # object files and a static libstdc++, better avoid it by now
   4.557 +    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
   4.558 +    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
   4.559 +		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
   4.560 +    hardcode_libdir_flag_spec=
   4.561 +    hardcode_shlibpath_var=no
   4.562      runpath_var='LD_RUN_PATH'
   4.563 -    hardcode_shlibpath_var=no
   4.564 -    hardcode_direct=no
   4.565      ;;
   4.566  
   4.567    uts4*)
   4.568 @@ -1801,7 +1456,7 @@
   4.569  dynamic_linker="$host_os ld.so"
   4.570  sys_lib_dlsearch_path_spec="/lib /usr/lib"
   4.571  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
   4.572 -file_magic_cmd=
   4.573 +file_magic_cmd="$FILE"
   4.574  file_magic_test_file=
   4.575  deplibs_check_method='unknown'
   4.576  # Need to set the preceding variable on all platforms that support
   4.577 @@ -1861,7 +1516,6 @@
   4.578    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
   4.579    shlibpath_var=LD_LIBRARY_PATH
   4.580    deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
   4.581 -  file_magic_cmd=/usr/bin/file
   4.582    file_magic_test_file=/shlib/libc.so
   4.583    sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
   4.584    sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
   4.585 @@ -1881,7 +1535,9 @@
   4.586      library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib'
   4.587    fi
   4.588    dynamic_linker='Win32 ld.exe'
   4.589 -  deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
   4.590 +  # FIXME: mingw32 cross-compiler doesn't see shared versions of libs
   4.591 +  #deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
   4.592 +  deplibs_check_method=pass_all
   4.593    file_magic_cmd='${OBJDUMP} -f'
   4.594    # FIXME: first we should search . and the directory the executable is in
   4.595    shlibpath_var=PATH
   4.596 @@ -1977,9 +1633,8 @@
   4.597    shlibpath_overrides_runpath=no
   4.598    sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
   4.599    sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
   4.600 -  file_magic_cmd=/usr/bin/file
   4.601    file_magic_test_file=`echo /lib${libsuff}/libc.so*`
   4.602 -  deplibs_check_method='pass_all'
   4.603 +  deplibs_check_method=pass_all
   4.604    ;;
   4.605  
   4.606  # No shared lib support for Linux oldld, aout, or coff.
   4.607 @@ -1999,13 +1654,12 @@
   4.608    shlibpath_overrides_runpath=no
   4.609  
   4.610    case "$host_cpu" in
   4.611 -  alpha* | i*86 | sparc* )
   4.612 +  alpha* | i*86 | sparc* | powerpc* )
   4.613      deplibs_check_method=pass_all ;;
   4.614    *)
   4.615      # glibc up to 2.1.1 does not perform some relocations on ARM
   4.616      deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
   4.617    esac
   4.618 -  file_magic_cmd=/usr/bin/file
   4.619    file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
   4.620  
   4.621    if test -f /lib/ld.so.1; then
   4.622 @@ -2052,7 +1706,7 @@
   4.623    shlibpath_var=LIBPATH
   4.624    ;;
   4.625  
   4.626 -osf3* | osf4*)
   4.627 +osf3* | osf4* | osf5*)
   4.628    version_type=osf
   4.629    need_version=no
   4.630    soname_spec='${libname}${release}.so'
   4.631 @@ -2060,9 +1714,8 @@
   4.632    shlibpath_var=LD_LIBRARY_PATH
   4.633    # this will be overridden with pass_all, but let us keep it just in case
   4.634    deplibs_check_method='file_magic COFF format alpha shared library'
   4.635 -  file_magic_cmd=/usr/bin/file
   4.636    file_magic_test_file=/shlib/libc.so
   4.637 -  deplibs_check_method='pass_all'
   4.638 +  deplibs_check_method=pass_all
   4.639    sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
   4.640    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   4.641    ;;
   4.642 @@ -2086,7 +1739,6 @@
   4.643    # ldd complains unless libraries are executable
   4.644    postinstall_cmds='chmod +x $lib'
   4.645    deplibs_check_method=pass_all
   4.646 -  file_magic_cmd=/usr/bin/file
   4.647    file_magic_test_file=/lib/libc.so
   4.648    ;;
   4.649  
   4.650 @@ -2109,7 +1761,7 @@
   4.651    shlibpath_var=LD_LIBRARY_PATH
   4.652    case "$host_vendor" in
   4.653      ncr)
   4.654 -      deplibs_check_method='pass_all'
   4.655 +      deplibs_check_method=pass_all
   4.656        ;;
   4.657      motorola)
   4.658        need_lib_prefix=no
   4.659 @@ -2117,7 +1769,6 @@
   4.660        shlibpath_overrides_runpath=no
   4.661        sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
   4.662        deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
   4.663 -      file_magic_cmd=/usr/bin/file
   4.664        file_magic_test_file=`echo /usr/lib/libc.so*`
   4.665        ;;
   4.666    esac
   4.667 @@ -2221,11 +1872,11 @@
   4.668  main(){nm_test_var='a';nm_test_func();return(0);}
   4.669  EOF
   4.670  
   4.671 -  echo "$progname:2224: checking if global_symbol_pipe works" >&5
   4.672 -  if { (eval echo $progname:2225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then
   4.673 +  echo "$progname:1873: checking if global_symbol_pipe works" >&5
   4.674 +  if { (eval echo $progname:1874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then
   4.675      # Now try to grab the symbols.
   4.676      nlist=conftest.nm
   4.677 -    if { echo "$progname:2228: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
   4.678 +    if { echo "$progname:1877: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
   4.679  
   4.680        # Try sorting and uniquifying the output.
   4.681        if sort "$nlist" | uniq > "$nlist"T; then
   4.682 @@ -2277,7 +1928,7 @@
   4.683  	  save_CFLAGS="$CFLAGS"
   4.684  	  LIBS="conftstm.$objext"
   4.685  	  CFLAGS="$CFLAGS$no_builtin_flag"
   4.686 -	  if { (eval echo $progname:2280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   4.687 +	  if { (eval echo $progname:1929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   4.688  	    pipe_works=yes
   4.689  	  else
   4.690  	    echo "$progname: failed program was:" >&5
   4.691 @@ -2330,7 +1981,7 @@
   4.692  ;;
   4.693  esac
   4.694  
   4.695 -if test -n "$file_magic_test_file" && test -n "$file_magic_cmd"; then
   4.696 +if test -n "$file_magic_test_file"; then
   4.697    case "$deplibs_check_method" in
   4.698    "file_magic "*)
   4.699      file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
   4.700 @@ -2410,14 +2061,14 @@
   4.701  if test "X${lt_cv_dlopen+set}" != Xset; then
   4.702    lt_cv_dlopen=no lt_cv_dlopen_libs=
   4.703  echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
   4.704 -echo "$progname:2413: checking for dlopen in -ldl" >&5
   4.705 +echo "$progname:2062: checking for dlopen in -ldl" >&5
   4.706  if test "X${ac_cv_lib_dl_dlopen+set}" = Xset; then
   4.707    echo $ac_n "(cached) $ac_c" 1>&6
   4.708  else
   4.709    ac_save_LIBS="$LIBS"
   4.710  LIBS="-ldl  $LIBS"
   4.711  cat > conftest.$ac_ext <<EOF
   4.712 -#line 2420 "ltconfig"
   4.713 +#line 2069 "ltconfig"
   4.714  /* Override any gcc2 internal prototype to avoid an error.  */
   4.715  /* We use char because int might match the return type of a gcc2
   4.716      builtin and then its argument prototype would still apply.  */
   4.717 @@ -2427,7 +2078,7 @@
   4.718  dlopen()
   4.719  ; return 0; }
   4.720  EOF
   4.721 -if { (eval echo $progname:2430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   4.722 +if { (eval echo $progname:2079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   4.723    rm -rf conftest*
   4.724    ac_cv_lib_dl_dlopen=yes
   4.725  else
   4.726 @@ -2446,12 +2097,12 @@
   4.727  else
   4.728    echo "$ac_t""no" 1>&6
   4.729  echo $ac_n "checking for dlopen""... $ac_c" 1>&6
   4.730 -echo "$progname:2449: checking for dlopen" >&5
   4.731 +echo "$progname:2098: checking for dlopen" >&5
   4.732  if test "X${ac_cv_func_dlopen+set}" = Xset; then
   4.733    echo $ac_n "(cached) $ac_c" 1>&6
   4.734  else
   4.735    cat > conftest.$ac_ext <<EOF
   4.736 -#line 2454 "ltconfig"
   4.737 +#line 2103 "ltconfig"
   4.738  /* System header to define __stub macros and hopefully few prototypes,
   4.739      which can conflict with char dlopen(); below.  */
   4.740  #include <assert.h>
   4.741 @@ -2473,7 +2124,7 @@
   4.742  
   4.743  ; return 0; }
   4.744  EOF
   4.745 -if { (eval echo $progname:2476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   4.746 +if { (eval echo $progname:2125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   4.747    rm -rf conftest*
   4.748    ac_cv_func_dlopen=yes
   4.749  else
   4.750 @@ -2490,14 +2141,14 @@
   4.751  else
   4.752    echo "$ac_t""no" 1>&6
   4.753  echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
   4.754 -echo "$progname:2493: checking for dld_link in -ldld" >&5
   4.755 +echo "$progname:2142: checking for dld_link in -ldld" >&5
   4.756  if test "X${ac_cv_lib_dld_dld_link+set}" = Xset; then
   4.757    echo $ac_n "(cached) $ac_c" 1>&6
   4.758  else
   4.759    ac_save_LIBS="$LIBS"
   4.760  LIBS="-ldld  $LIBS"
   4.761  cat > conftest.$ac_ext <<EOF
   4.762 -#line 2500 "ltconfig"
   4.763 +#line 2149 "ltconfig"
   4.764  /* Override any gcc2 internal prototype to avoid an error.  */
   4.765  /* We use char because int might match the return type of a gcc2
   4.766      builtin and then its argument prototype would still apply.  */
   4.767 @@ -2507,7 +2158,7 @@
   4.768  dld_link()
   4.769  ; return 0; }
   4.770  EOF
   4.771 -if { (eval echo $progname:2510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   4.772 +if { (eval echo $progname:2159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   4.773    rm -rf conftest*
   4.774    ac_cv_lib_dld_dld_link=yes
   4.775  else
   4.776 @@ -2526,12 +2177,12 @@
   4.777  else
   4.778    echo "$ac_t""no" 1>&6
   4.779  echo $ac_n "checking for shl_load""... $ac_c" 1>&6
   4.780 -echo "$progname:2529: checking for shl_load" >&5
   4.781 +echo "$progname:2178: checking for shl_load" >&5
   4.782  if test "X${ac_cv_func_shl_load+set}" = Xset; then
   4.783    echo $ac_n "(cached) $ac_c" 1>&6
   4.784  else
   4.785    cat > conftest.$ac_ext <<EOF
   4.786 -#line 2534 "ltconfig"
   4.787 +#line 2183 "ltconfig"
   4.788  /* System header to define __stub macros and hopefully few prototypes,
   4.789      which can conflict with char shl_load(); below.  */
   4.790  #include <assert.h>
   4.791 @@ -2553,7 +2204,7 @@
   4.792  
   4.793  ; return 0; }
   4.794  EOF
   4.795 -if { (eval echo $progname:2556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   4.796 +if { (eval echo $progname:2205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   4.797    rm -rf conftest*
   4.798    ac_cv_func_shl_load=yes
   4.799  else
   4.800 @@ -2571,14 +2222,14 @@
   4.801  else
   4.802    echo "$ac_t""no" 1>&6
   4.803  echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
   4.804 -echo "$progname:2574: checking for shl_load in -ldld" >&5
   4.805 +echo "$progname:2223: checking for shl_load in -ldld" >&5
   4.806  if test "X${ac_cv_lib_dld_shl_load+set}" = Xset; then
   4.807    echo $ac_n "(cached) $ac_c" 1>&6
   4.808  else
   4.809    ac_save_LIBS="$LIBS"
   4.810  LIBS="-ldld  $LIBS"
   4.811  cat > conftest.$ac_ext <<EOF
   4.812 -#line 2581 "ltconfig"
   4.813 +#line 2230 "ltconfig"
   4.814  #include "confdefs.h"
   4.815  /* Override any gcc2 internal prototype to avoid an error.  */
   4.816  /* We use char because int might match the return type of a gcc2
   4.817 @@ -2589,7 +2240,7 @@
   4.818  shl_load()
   4.819  ; return 0; }
   4.820  EOF
   4.821 -if { (eval echo $progname:2592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   4.822 +if { (eval echo $progname:2241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   4.823    rm -rf conftest*
   4.824    ac_cv_lib_dld_shl_load=yes
   4.825  else
   4.826 @@ -2632,17 +2283,17 @@
   4.827  for ac_hdr in dlfcn.h; do
   4.828  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   4.829  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
   4.830 -echo "$progname:2635: checking for $ac_hdr" >&5
   4.831 +echo "$progname:2284: checking for $ac_hdr" >&5
   4.832  if eval "test \"`echo 'X$''{'ac_cv_header_$ac_safe'+set}'`\" = Xset"; then
   4.833    echo $ac_n "(cached) $ac_c" 1>&6
   4.834  else
   4.835    cat > conftest.$ac_ext <<EOF
   4.836 -#line 2640 "ltconfig"
   4.837 +#line 2289 "ltconfig"
   4.838  #include <$ac_hdr>
   4.839  int fnord = 0;
   4.840  EOF
   4.841  ac_try="$ac_compile conftest.$ac_ext >/dev/null 2>conftest.out"
   4.842 -{ (eval echo $progname:2645: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
   4.843 +{ (eval echo $progname:2294: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
   4.844  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
   4.845  if test -z "$ac_err"; then
   4.846    rm -rf conftest*
   4.847 @@ -2670,7 +2321,7 @@
   4.848      LIBS="$lt_cv_dlopen_libs $LIBS"
   4.849  
   4.850    echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
   4.851 -echo "$progname:2673: checking whether a program can dlopen itself" >&5
   4.852 +echo "$progname:2322: checking whether a program can dlopen itself" >&5
   4.853  if test "X${lt_cv_dlopen_self+set}" = Xset; then
   4.854    echo $ac_n "(cached) $ac_c" 1>&6
   4.855  else
   4.856 @@ -2678,7 +2329,7 @@
   4.857      lt_cv_dlopen_self=cross
   4.858    else
   4.859      cat > conftest.c <<EOF
   4.860 -#line 2681 "ltconfig"
   4.861 +#line 2330 "ltconfig"
   4.862  
   4.863  #if HAVE_DLFCN_H
   4.864  #include <dlfcn.h>
   4.865 @@ -2724,7 +2375,7 @@
   4.866  	       if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } 
   4.867  
   4.868  EOF
   4.869 -if { (eval echo $progname:2727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
   4.870 +if { (eval echo $progname:2376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
   4.871  then
   4.872    lt_cv_dlopen_self=yes
   4.873  else
   4.874 @@ -2743,7 +2394,7 @@
   4.875    if test "$lt_cv_dlopen_self" = yes; then
   4.876      LDFLAGS="$LDFLAGS $link_static_flag"
   4.877    echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
   4.878 -echo "$progname:2746: checking whether a statically linked program can dlopen itself" >&5
   4.879 +echo "$progname:2395: checking whether a statically linked program can dlopen itself" >&5
   4.880  if test "X${lt_cv_dlopen_self_static+set}" = Xset; then
   4.881    echo $ac_n "(cached) $ac_c" 1>&6
   4.882  else
   4.883 @@ -2751,7 +2402,7 @@
   4.884      lt_cv_dlopen_self_static=cross
   4.885    else
   4.886      cat > conftest.c <<EOF
   4.887 -#line 2754 "ltconfig"
   4.888 +#line 2403 "ltconfig"
   4.889  
   4.890  #if HAVE_DLFCN_H
   4.891  #include <dlfcn.h>
   4.892 @@ -2797,7 +2448,7 @@
   4.893      if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } 
   4.894  
   4.895  EOF
   4.896 -if { (eval echo $progname:2800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
   4.897 +if { (eval echo $progname:2449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
   4.898  then
   4.899    lt_cv_dlopen_self_static=yes
   4.900  else
   4.901 @@ -2892,7 +2543,7 @@
   4.902  # NOTE: Changes made to this file will be lost: look at ltconfig or ltmain.sh.
   4.903  #
   4.904  # Copyright (C) 1996-1999 Free Software Foundation, Inc.
   4.905 -# Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
   4.906 +# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
   4.907  #
   4.908  # This program is free software; you can redistribute it and/or modify
   4.909  # it under the terms of the GNU General Public License as published by
     5.1 --- a/ltmain.sh	Tue Dec 21 17:41:12 1999 +0000
     5.2 +++ b/ltmain.sh	Sun Dec 26 11:17:50 1999 +0000
     5.3 @@ -55,7 +55,7 @@
     5.4  PROGRAM=ltmain.sh
     5.5  PACKAGE=libtool
     5.6  VERSION=1.3c
     5.7 -TIMESTAMP=" (1.612 1999/09/30 00:26:50)"
     5.8 +TIMESTAMP=" (1.620 1999/10/07 15:40:07)"
     5.9  
    5.10  default_mode=
    5.11  help="Try \`$progname --help' for more information."
    5.12 @@ -682,6 +682,7 @@
    5.13      libobjs=
    5.14      ltlibs=
    5.15      module=no
    5.16 +    no_install=no
    5.17      objs=
    5.18      prefer_static_libs=no
    5.19      preload=no
    5.20 @@ -963,6 +964,22 @@
    5.21  	continue
    5.22  	;;
    5.23  
    5.24 +      -no-install)
    5.25 +	case "$host" in
    5.26 +	*-*-cygwin* | *-*-mingw* | *-*-os2*)
    5.27 +	  # The PATH hackery in wrapper scripts is required on Windows
    5.28 +	  # in order for the loader to find any dlls it needs.
    5.29 +	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
    5.30 +	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
    5.31 +	  fast_install=no
    5.32 +	  ;;
    5.33 +	*)
    5.34 +	  no_install=yes
    5.35 +	  ;;
    5.36 +	esac
    5.37 +	continue
    5.38 +	;;
    5.39 +
    5.40        -no-undefined)
    5.41  	allow_undefined=no
    5.42  	continue
    5.43 @@ -1240,24 +1257,23 @@
    5.44        linkmode=prog ;;
    5.45      esac
    5.46      
    5.47 -    if test $linkmode = lib || test $linkmode = prog; then
    5.48 -      output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
    5.49 -      if test "X$output_objdir" = "X$output"; then
    5.50 -	output_objdir="$objdir"
    5.51 -      else
    5.52 -	output_objdir="$output_objdir/$objdir"
    5.53 +    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
    5.54 +    if test "X$output_objdir" = "X$output"; then
    5.55 +      output_objdir="$objdir"
    5.56 +    else
    5.57 +      output_objdir="$output_objdir/$objdir"
    5.58 +    fi
    5.59 +
    5.60 +    # Create the object directory.
    5.61 +    if test ! -d $output_objdir; then
    5.62 +      $show "$mkdir $output_objdir"
    5.63 +      $run $mkdir $output_objdir
    5.64 +      status=$?
    5.65 +      if test $status -ne 0 && test ! -d $output_objdir; then
    5.66 +	exit $status
    5.67        fi
    5.68 -
    5.69 -      # Create the object directory.
    5.70 -      if test ! -d $output_objdir; then
    5.71 -	$show "$mkdir $output_objdir"
    5.72 -	$run $mkdir $output_objdir
    5.73 -	status=$?
    5.74 -	if test $status -ne 0 && test ! -d $output_objdir; then
    5.75 -	  exit $status
    5.76 -	fi
    5.77 -      fi
    5.78 -    else 
    5.79 +    fi
    5.80 +    if test $linkmode != lib && test $linkmode != prog; then
    5.81        # Find libtool convenience libraries
    5.82        for deplib in $deplibs; do
    5.83  	case "$deplib" in
    5.84 @@ -3381,6 +3397,19 @@
    5.85  	fi
    5.86        fi
    5.87  
    5.88 +      if test "$no_install" = yes; then
    5.89 +	# We don't need to create a wrapper script.
    5.90 +	link_command="$compile_var$compile_command$compile_rpath"
    5.91 +	# Replace the output file specification.
    5.92 +	link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
    5.93 +	# Delete the old output file.
    5.94 +	$run $rm $output
    5.95 +	# Link the executable and exit
    5.96 +	$show "$link_command"
    5.97 +	$run eval "$link_command" || exit $?
    5.98 +	exit 0
    5.99 +      fi
   5.100 +
   5.101        if test "$hardcode_action" = relink || test "$hardcode_into_libs" = yes; then
   5.102  	# Fast installation is not supported
   5.103  	link_command="$compile_var$compile_command$compile_rpath"
   5.104 @@ -3549,7 +3578,7 @@
   5.105    fi"
   5.106  	else
   5.107  	  echo >> $output "\
   5.108 -  program='$outputname$exeext'
   5.109 +  program='$outputname'
   5.110    progdir=\"\$thisdir/$objdir\"
   5.111  "
   5.112  	fi
   5.113 @@ -4754,6 +4783,8 @@
   5.114    -LLIBDIR          search LIBDIR for required installed libraries
   5.115    -lNAME            OUTPUT-FILE requires the installed library libNAME
   5.116    -module           build a library that can dlopened
   5.117 +  -no-fast-install  disable the fast-install mode
   5.118 +  -no-install       link a not-installable executable
   5.119    -no-undefined     declare that a library does not refer to external symbols
   5.120    -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
   5.121    -release RELEASE  specify package release information
     6.1 --- a/mixer.c	Tue Dec 21 17:41:12 1999 +0000
     6.2 +++ b/mixer.c	Sun Dec 26 11:17:50 1999 +0000
     6.3 @@ -56,6 +56,10 @@
     6.4  static int reserved_channels = 0;
     6.5  
     6.6  
     6.7 +/* Support for hooking into the mixer callback system */
     6.8 +static void (*mix_postmix)(void *udata, Uint8 *stream, int len) = NULL;
     6.9 +void *mix_postmix_data = NULL;
    6.10 +
    6.11  /* Support for user defined music functions, plus the default one */
    6.12  extern int music_active;
    6.13  extern void music_mixer(void *udata, Uint8 *stream, int len);
    6.14 @@ -133,6 +137,9 @@
    6.15  			}
    6.16  		}
    6.17  	}
    6.18 +	if ( mix_postmix ) {
    6.19 +		mix_postmix(mix_postmix_data, stream, len);
    6.20 +	}
    6.21  	SDL_mutexV(mixer_lock);
    6.22  }
    6.23  
    6.24 @@ -384,6 +391,19 @@
    6.25  	}
    6.26  }
    6.27  
    6.28 +/* Set a function that is called after all mixing is performed.
    6.29 +   This can be used to provide real-time visual display of the audio stream
    6.30 +   or add a custom mixer filter for the stream data.
    6.31 +*/
    6.32 +void Mix_SetPostMix(void (*mix_func)
    6.33 +                    (void *udata, Uint8 *stream, int len), void *arg)
    6.34 +{
    6.35 +	SDL_LockAudio();
    6.36 +	mix_postmix_data = arg;
    6.37 +	mix_postmix = mix_func;
    6.38 +	SDL_UnlockAudio();
    6.39 +}
    6.40 +
    6.41  /* Add your own music player or mixer function.
    6.42     If 'mix_func' is NULL, the default music player is re-enabled.
    6.43   */
     7.1 --- a/mixer.h	Tue Dec 21 17:41:12 1999 +0000
     7.2 +++ b/mixer.h	Sun Dec 26 11:17:50 1999 +0000
     7.3 @@ -93,11 +93,18 @@
     7.4  extern void Mix_FreeChunk(Mix_Chunk *chunk);
     7.5  extern void Mix_FreeMusic(Mix_Music *music);
     7.6  
     7.7 +/* Set a function that is called after all mixing is performed.
     7.8 +   This can be used to provide real-time visual display of the audio stream
     7.9 +   or add a custom mixer filter for the stream data.
    7.10 +*/
    7.11 +extern void Mix_SetPostMix(void (*mix_func)
    7.12 +                             (void *udata, Uint8 *stream, int len), void *arg);
    7.13 +
    7.14  /* Add your own music player or additional mixer function.
    7.15     If 'mix_func' is NULL, the default music player is re-enabled.
    7.16   */
    7.17 -extern void Mix_HookMusic(void (*mix_func)(void *udata, Uint8 *stream, int len),
    7.18 -                                                                void *arg);
    7.19 +extern void Mix_HookMusic(void (*mix_func)
    7.20 +                          (void *udata, Uint8 *stream, int len), void *arg);
    7.21  
    7.22  /* Get a pointer to the user data for the current music hook */
    7.23  extern void *Mix_GetMusicHookData(void);
     8.1 --- a/music.c	Tue Dec 21 17:41:12 1999 +0000
     8.2 +++ b/music.c	Sun Dec 26 11:17:50 1999 +0000
     8.3 @@ -1,25 +1,25 @@
     8.4  /*
     8.5 -    MIXERLIB:  An audio mixer library based on the SDL library
     8.6 -    Copyright (C) 1997-1999  Sam Lantinga
     8.7 +	MIXERLIB:  An audio mixer library based on the SDL library
     8.8 +	Copyright (C) 1997-1999  Sam Lantinga
     8.9  
    8.10 -    This library is free software; you can redistribute it and/or
    8.11 -    modify it under the terms of the GNU Library General Public
    8.12 -    License as published by the Free Software Foundation; either
    8.13 -    version 2 of the License, or (at your option) any later version.
    8.14 +	This library is free software; you can redistribute it and/or
    8.15 +	modify it under the terms of the GNU Library General Public
    8.16 +	License as published by the Free Software Foundation; either
    8.17 +	version 2 of the License, or (at your option) any later version.
    8.18  
    8.19 -    This library is distributed in the hope that it will be useful,
    8.20 -    but WITHOUT ANY WARRANTY; without even the implied warranty of
    8.21 -    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    8.22 -    Library General Public License for more details.
    8.23 +	This library is distributed in the hope that it will be useful,
    8.24 +	but WITHOUT ANY WARRANTY; without even the implied warranty of
    8.25 +	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    8.26 +	Library General Public License for more details.
    8.27  
    8.28 -    You should have received a copy of the GNU Library General Public
    8.29 -    License along with this library; if not, write to the Free
    8.30 -    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    8.31 +	You should have received a copy of the GNU Library General Public
    8.32 +	License along with this library; if not, write to the Free
    8.33 +	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    8.34  
    8.35 -    Sam Lantinga
    8.36 -    5635-34 Springhouse Dr.
    8.37 -    Pleasanton, CA 94588 (USA)
    8.38 -    slouken@devolution.com
    8.39 +	Sam Lantinga
    8.40 +	5635-34 Springhouse Dr.
    8.41 +	Pleasanton, CA 94588 (USA)
    8.42 +	slouken@devolution.com
    8.43  */
    8.44  
    8.45  #include <stdlib.h>
    8.46 @@ -117,9 +117,9 @@
    8.47  		/* Handle fading */
    8.48  		if ( music_playing->fading != MIX_NO_FADING ) {
    8.49  			if ( music_playing->fade_step++ < music_playing->fade_steps ) {
    8.50 -                int fade_volume = music_playing->fade_volume;
    8.51 -                int fade_step = music_playing->fade_step;
    8.52 -                int fade_steps = music_playing->fade_steps;
    8.53 +				int fade_volume = music_playing->fade_volume;
    8.54 +				int fade_step = music_playing->fade_step;
    8.55 +				int fade_steps = music_playing->fade_steps;
    8.56  
    8.57  				if ( music_playing->fading == MIX_FADING_OUT ) {
    8.58  					Mix_VolumeMusic((fade_volume * (fade_steps-fade_step)) 
    8.59 @@ -190,8 +190,8 @@
    8.60  				break;
    8.61  #endif
    8.62  #ifdef MP3_MUSIC
    8.63 -		    case MUS_MP3:
    8.64 -			    SMPEG_playAudio(music_playing->data.mp3, stream, len);
    8.65 +			case MUS_MP3:
    8.66 +				SMPEG_playAudio(music_playing->data.mp3, stream, len);
    8.67  				break;
    8.68  #endif
    8.69  			default:
    8.70 @@ -242,29 +242,29 @@
    8.71  		break;
    8.72  
    8.73  		default: {
    8.74 -			SDL_SetError("Unknown hardware audio format");
    8.75 +			Mix_SetError("Unknown hardware audio format");
    8.76  			++music_error;
    8.77  		}
    8.78  	}
    8.79  	if ( mixer->channels > 1 ) {
    8.80  		if ( mixer->channels > 2 ) {
    8.81 -			SDL_SetError("Hardware uses more channels than mixer");
    8.82 +			Mix_SetError("Hardware uses more channels than mixer");
    8.83  			++music_error;
    8.84  		}
    8.85  		md_mode |= DMODE_STEREO;
    8.86  	}
    8.87 -	samplesize     = mixer->size/mixer->samples;
    8.88 -	md_mixfreq     = mixer->freq;
    8.89 -	md_device      = 0;
    8.90 -	md_volume      = 96;
    8.91 +	samplesize	 = mixer->size/mixer->samples;
    8.92 +	md_mixfreq	 = mixer->freq;
    8.93 +	md_device	  = 0;
    8.94 +	md_volume	  = 96;
    8.95  	md_musicvolume = 128;
    8.96  	md_sndfxvolume = 128;
    8.97 -	md_pansep      = 128;
    8.98 -	md_reverb      = 0;
    8.99 +	md_pansep	  = 128;
   8.100 +	md_reverb	  = 0;
   8.101  	MikMod_RegisterAllLoaders();
   8.102  	MikMod_RegisterAllDrivers();
   8.103  	if ( MikMod_Init() ) {
   8.104 -		SDL_SetError("%s", _mm_errmsg[_mm_errno]);
   8.105 +		Mix_SetError("%s", _mm_errmsg[_mm_errno]);
   8.106  		++music_error;
   8.107  	}
   8.108  #endif
   8.109 @@ -287,8 +287,8 @@
   8.110  	}
   8.111  	Mix_VolumeMusic(SDL_MIX_MAXVOLUME);
   8.112  
   8.113 -    /* Calculate the number of ms for each callback */
   8.114 -    ms_per_step = ((float)mixer->samples * 1000.0) / mixer->freq;
   8.115 +	/* Calculate the number of ms for each callback */
   8.116 +	ms_per_step = ((float)mixer->samples * 1000.0) / mixer->freq;
   8.117  
   8.118  	return(0);
   8.119  }
   8.120 @@ -306,7 +306,7 @@
   8.121  		if ( fp != NULL ) {
   8.122  			fclose(fp);
   8.123  		}
   8.124 -		SDL_SetError("Couldn't read from '%s'", file);
   8.125 +		Mix_SetError("Couldn't read from '%s'", file);
   8.126  		return(NULL);
   8.127  	}
   8.128  	magic[4] = '\0';
   8.129 @@ -315,7 +315,7 @@
   8.130  	/* Allocate memory for the music structure */
   8.131  	music = (Mix_Music *)malloc(sizeof(Mix_Music));
   8.132  	if ( music == NULL ) {
   8.133 -		SDL_SetError("Out of memory");
   8.134 +		Mix_SetError("Out of memory");
   8.135  		return(NULL);
   8.136  	}
   8.137  	music->error = 0;
   8.138 @@ -348,12 +348,12 @@
   8.139  		if ( timidity_ok ) {
   8.140  			music->data.midi = Timidity_LoadSong((char *)file);
   8.141  			if ( music->data.midi == NULL ) {
   8.142 -				SDL_SetError("%s", Timidity_Error());
   8.143 +				Mix_SetError("%s", Timidity_Error());
   8.144  				music->error = 1;
   8.145  			}
   8.146  		}
   8.147  		else {
   8.148 -			SDL_SetError("%s", Timidity_Error());
   8.149 +			Mix_SetError("%s", Timidity_Error());
   8.150  			music->error = 1;
   8.151  		}
   8.152  	} else
   8.153 @@ -364,7 +364,7 @@
   8.154  		music->type = MUS_MP3;
   8.155  		music->data.mp3 = SMPEG_new(file, &info, 0);
   8.156  		if(!info.has_audio){
   8.157 -			SDL_SetError("MPEG file does not have any audio stream.");
   8.158 +			Mix_SetError("MPEG file does not have any audio stream.");
   8.159  			music->error = 1;
   8.160  		}else{
   8.161  			SMPEG_actualSpec(music->data.mp3, &used_mixer);
   8.162 @@ -376,13 +376,13 @@
   8.163  		music->type = MUS_MOD;
   8.164  		music->data.module = MikMod_LoadSong((char *)file, 64);
   8.165  		if ( music->data.module == NULL ) {
   8.166 -			SDL_SetError("%s", _mm_errmsg[_mm_errno]);
   8.167 +			Mix_SetError("%s", _mm_errmsg[_mm_errno]);
   8.168  			music->error = 1;
   8.169  		}
   8.170  	} else
   8.171  #endif
   8.172  	{
   8.173 -		SDL_SetError("Unrecognized music format");
   8.174 +		Mix_SetError("Unrecognized music format");
   8.175  		music->error = 1;
   8.176  	}
   8.177  	if ( music->error ) {
   8.178 @@ -428,7 +428,7 @@
   8.179  				break;
   8.180  #endif
   8.181  #ifdef MP3_MUSIC
   8.182 -		    case MUS_MP3:
   8.183 +			case MUS_MP3:
   8.184  				SMPEG_delete(music->data.mp3);
   8.185  				break;
   8.186  #endif
   8.187 @@ -472,7 +472,7 @@
   8.188  			break;
   8.189  #endif
   8.190  #ifdef MP3_MUSIC
   8.191 -	    case MUS_MP3:
   8.192 +		case MUS_MP3:
   8.193  			SMPEG_enableaudio(music->data.mp3,1);
   8.194  			SMPEG_enablevideo(music->data.mp3,0);
   8.195  			SMPEG_setvolume(music->data.mp3,((float)music_volume/(float)MIX_MAX_VOLUME)*100.0);
   8.196 @@ -501,7 +501,7 @@
   8.197  
   8.198  	if ( lowlevel_play(music) < 0 ) {
   8.199  		return(-1);
   8.200 -    }
   8.201 +	}
   8.202  	music_active = 1;
   8.203  	music_stopped = 0;
   8.204  	music_loops = loops;
   8.205 @@ -518,7 +518,7 @@
   8.206  		music_volume = 0;
   8.207  		if ( Mix_PlayMusic(music, loops) < 0 ) {
   8.208  			return(-1);
   8.209 -        }
   8.210 +		}
   8.211  		music_playing->fade_step = 0;
   8.212  		music_playing->fade_steps = ms/ms_per_step;
   8.213  		music_playing->fading = MIX_FADING_IN;
   8.214 @@ -631,12 +631,13 @@
   8.215  /* Progressively stop the music */
   8.216  int Mix_FadeOutMusic(int ms)
   8.217  {
   8.218 -	if ( music_playing && !music_stopped && (music_playing->fading == MIX_NO_FADING) ) {
   8.219 +	if ( music_playing && !music_stopped &&
   8.220 +	     (music_playing->fading == MIX_NO_FADING) ) {
   8.221  		if ( music_volume > 0 ) {
   8.222  			music_playing->fading = MIX_FADING_OUT;
   8.223  			music_playing->fade_volume = music_volume;
   8.224 -		    music_playing->fade_step = 0;
   8.225 -		    music_playing->fade_steps = ms/ms_per_step;
   8.226 +			music_playing->fade_step = 0;
   8.227 +			music_playing->fade_steps = ms/ms_per_step;
   8.228  			return(1);
   8.229  		}
   8.230  	}