Updated for SDL 1.0
authorSam Lantinga <slouken@lokigames.com>
Tue, 23 Nov 1999 05:25:15 +0000
changeset 20ef0f22476bc5
parent 19 1e7588c1fb88
child 21 2d26b0f75a05
Updated for SDL 1.0
Makefile.in
aclocal.m4
configure
configure.in
mikmod/Makefile.in
timidity/Makefile.in
     1.1 --- a/Makefile.in	Thu Nov 11 20:07:05 1999 +0000
     1.2 +++ b/Makefile.in	Tue Nov 23 05:25:15 1999 +0000
     1.3 @@ -1,4 +1,4 @@
     1.4 -# Makefile.in generated automatically by automake 1.4a from Makefile.am
     1.5 +# Makefile.in generated automatically by automake 1.4 from Makefile.am
     1.6  
     1.7  # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
     1.8  # This Makefile.in is free software; the Free Software Foundation
     1.9 @@ -48,10 +48,9 @@
    1.10  AUTOHEADER = @AUTOHEADER@
    1.11  
    1.12  INSTALL = @INSTALL@
    1.13 -INSTALL_PROGRAM = @INSTALL_PROGRAM@
    1.14 +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
    1.15  INSTALL_DATA = @INSTALL_DATA@
    1.16  INSTALL_SCRIPT = @INSTALL_SCRIPT@
    1.17 -INSTALL_STRIP_FLAG =
    1.18  transform = @program_transform_name@
    1.19  
    1.20  NORMAL_INSTALL = :
    1.21 @@ -254,8 +253,8 @@
    1.22  	$(mkinstalldirs) $(DESTDIR)$(bindir)
    1.23  	@list='$(bin_PROGRAMS)'; for p in $$list; do \
    1.24  	  if test -f $$p; then \
    1.25 -	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
    1.26 -	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
    1.27 +	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
    1.28 +	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
    1.29  	  else :; fi; \
    1.30  	done
    1.31  
    1.32 @@ -423,7 +422,7 @@
    1.33  	@for file in $(DISTFILES); do \
    1.34  	  d=$(srcdir); \
    1.35  	  if test -d $$d/$$file; then \
    1.36 -	    cp -pr $$d/$$file $(distdir)/$$file; \
    1.37 +	    cp -pr $$/$$file $(distdir)/$$file; \
    1.38  	  else \
    1.39  	    test -f $(distdir)/$$file \
    1.40  	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
    1.41 @@ -495,7 +494,7 @@
    1.42  all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
    1.43  all-redirect: all-recursive
    1.44  install-strip:
    1.45 -	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
    1.46 +	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
    1.47  installdirs: installdirs-recursive
    1.48  installdirs-am:
    1.49  	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \
     2.1 --- a/aclocal.m4	Thu Nov 11 20:07:05 1999 +0000
     2.2 +++ b/aclocal.m4	Tue Nov 23 05:25:15 1999 +0000
     2.3 @@ -1,4 +1,4 @@
     2.4 -dnl aclocal.m4 generated automatically by aclocal 1.4a
     2.5 +dnl aclocal.m4 generated automatically by aclocal 1.4
     2.6  
     2.7  dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
     2.8  dnl This file is free software; the Free Software Foundation
     2.9 @@ -627,8 +627,6 @@
    2.10  
    2.11  AC_DEFUN(AM_INIT_AUTOMAKE,
    2.12  [AC_REQUIRE([AC_PROG_INSTALL])
    2.13 -dnl We require 2.13 because we rely on SHELL being computed by configure.
    2.14 -AC_PREREQ([2.13])
    2.15  PACKAGE=[$1]
    2.16  AC_SUBST(PACKAGE)
    2.17  VERSION=[$2]
     3.1 --- a/configure	Thu Nov 11 20:07:05 1999 +0000
     3.2 +++ b/configure	Tue Nov 23 05:25:15 1999 +0000
     3.3 @@ -752,7 +752,6 @@
     3.4  fi
     3.5  
     3.6  
     3.7 -
     3.8  PACKAGE=mixer
     3.9  
    3.10  VERSION=$VERSION
    3.11 @@ -772,7 +771,7 @@
    3.12  
    3.13  missing_dir=`cd $ac_aux_dir && pwd`
    3.14  echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
    3.15 -echo "configure:776: checking for working aclocal" >&5
    3.16 +echo "configure:775: checking for working aclocal" >&5
    3.17  # Run test in a subshell; some versions of sh will print an error if
    3.18  # an executable is not found, even if stderr is redirected.
    3.19  # Redirect stdin to placate older versions of autoconf.  Sigh.
    3.20 @@ -785,7 +784,7 @@
    3.21  fi
    3.22  
    3.23  echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
    3.24 -echo "configure:789: checking for working autoconf" >&5
    3.25 +echo "configure:788: checking for working autoconf" >&5
    3.26  # Run test in a subshell; some versions of sh will print an error if
    3.27  # an executable is not found, even if stderr is redirected.
    3.28  # Redirect stdin to placate older versions of autoconf.  Sigh.
    3.29 @@ -798,7 +797,7 @@
    3.30  fi
    3.31  
    3.32  echo $ac_n "checking for working automake""... $ac_c" 1>&6
    3.33 -echo "configure:802: checking for working automake" >&5
    3.34 +echo "configure:801: checking for working automake" >&5
    3.35  # Run test in a subshell; some versions of sh will print an error if
    3.36  # an executable is not found, even if stderr is redirected.
    3.37  # Redirect stdin to placate older versions of autoconf.  Sigh.
    3.38 @@ -811,7 +810,7 @@
    3.39  fi
    3.40  
    3.41  echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
    3.42 -echo "configure:815: checking for working autoheader" >&5
    3.43 +echo "configure:814: checking for working autoheader" >&5
    3.44  # Run test in a subshell; some versions of sh will print an error if
    3.45  # an executable is not found, even if stderr is redirected.
    3.46  # Redirect stdin to placate older versions of autoconf.  Sigh.
    3.47 @@ -824,7 +823,7 @@
    3.48  fi
    3.49  
    3.50  echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
    3.51 -echo "configure:828: checking for working makeinfo" >&5
    3.52 +echo "configure:827: checking for working makeinfo" >&5
    3.53  # Run test in a subshell; some versions of sh will print an error if
    3.54  # an executable is not found, even if stderr is redirected.
    3.55  # Redirect stdin to placate older versions of autoconf.  Sigh.
    3.56 @@ -840,7 +839,7 @@
    3.57  
    3.58  
    3.59  echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
    3.60 -echo "configure:844: checking whether ${MAKE-make} sets \${MAKE}" >&5
    3.61 +echo "configure:843: checking whether ${MAKE-make} sets \${MAKE}" >&5
    3.62  set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
    3.63  if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
    3.64    echo $ac_n "(cached) $ac_c" 1>&6
    3.65 @@ -869,7 +868,7 @@
    3.66  # Extract the first word of "gcc", so it can be a program name with args.
    3.67  set dummy gcc; ac_word=$2
    3.68  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    3.69 -echo "configure:873: checking for $ac_word" >&5
    3.70 +echo "configure:872: checking for $ac_word" >&5
    3.71  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    3.72    echo $ac_n "(cached) $ac_c" 1>&6
    3.73  else
    3.74 @@ -899,7 +898,7 @@
    3.75    # Extract the first word of "cc", so it can be a program name with args.
    3.76  set dummy cc; ac_word=$2
    3.77  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    3.78 -echo "configure:903: checking for $ac_word" >&5
    3.79 +echo "configure:902: checking for $ac_word" >&5
    3.80  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    3.81    echo $ac_n "(cached) $ac_c" 1>&6
    3.82  else
    3.83 @@ -950,7 +949,7 @@
    3.84        # Extract the first word of "cl", so it can be a program name with args.
    3.85  set dummy cl; ac_word=$2
    3.86  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    3.87 -echo "configure:954: checking for $ac_word" >&5
    3.88 +echo "configure:953: checking for $ac_word" >&5
    3.89  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    3.90    echo $ac_n "(cached) $ac_c" 1>&6
    3.91  else
    3.92 @@ -982,7 +981,7 @@
    3.93  fi
    3.94  
    3.95  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
    3.96 -echo "configure:986: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
    3.97 +echo "configure:985: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
    3.98  
    3.99  ac_ext=c
   3.100  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
   3.101 @@ -993,12 +992,12 @@
   3.102  
   3.103  cat > conftest.$ac_ext << EOF
   3.104  
   3.105 -#line 997 "configure"
   3.106 +#line 996 "configure"
   3.107  #include "confdefs.h"
   3.108  
   3.109  main(){return(0);}
   3.110  EOF
   3.111 -if { (eval echo configure:1002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   3.112 +if { (eval echo configure:1001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   3.113    ac_cv_prog_cc_works=yes
   3.114    # If we can't run a trivial program, we are probably using a cross compiler.
   3.115    if (./conftest; exit) 2>/dev/null; then
   3.116 @@ -1024,12 +1023,12 @@
   3.117    { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
   3.118  fi
   3.119  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
   3.120 -echo "configure:1028: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
   3.121 +echo "configure:1027: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
   3.122  echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
   3.123  cross_compiling=$ac_cv_prog_cc_cross
   3.124  
   3.125  echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
   3.126 -echo "configure:1033: checking whether we are using GNU C" >&5
   3.127 +echo "configure:1032: checking whether we are using GNU C" >&5
   3.128  if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   3.129    echo $ac_n "(cached) $ac_c" 1>&6
   3.130  else
   3.131 @@ -1038,7 +1037,7 @@
   3.132    yes;
   3.133  #endif
   3.134  EOF
   3.135 -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1042: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   3.136 +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1041: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   3.137    ac_cv_prog_gcc=yes
   3.138  else
   3.139    ac_cv_prog_gcc=no
   3.140 @@ -1057,7 +1056,7 @@
   3.141  ac_save_CFLAGS="$CFLAGS"
   3.142  CFLAGS=
   3.143  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
   3.144 -echo "configure:1061: checking whether ${CC-cc} accepts -g" >&5
   3.145 +echo "configure:1060: checking whether ${CC-cc} accepts -g" >&5
   3.146  if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   3.147    echo $ac_n "(cached) $ac_c" 1>&6
   3.148  else
   3.149 @@ -1164,7 +1163,7 @@
   3.150  fi
   3.151  
   3.152  echo $ac_n "checking host system type""... $ac_c" 1>&6
   3.153 -echo "configure:1168: checking host system type" >&5
   3.154 +echo "configure:1167: checking host system type" >&5
   3.155  
   3.156  host_alias=$host
   3.157  case "$host_alias" in
   3.158 @@ -1185,7 +1184,7 @@
   3.159  echo "$ac_t""$host" 1>&6
   3.160  
   3.161  echo $ac_n "checking build system type""... $ac_c" 1>&6
   3.162 -echo "configure:1189: checking build system type" >&5
   3.163 +echo "configure:1188: checking build system type" >&5
   3.164  
   3.165  build_alias=$build
   3.166  case "$build_alias" in
   3.167 @@ -1214,7 +1213,7 @@
   3.168  if test "$ac_cv_prog_gcc" = yes; then
   3.169    # Check if gcc -print-prog-name=ld gives a path.
   3.170    echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
   3.171 -echo "configure:1218: checking for ld used by GCC" >&5
   3.172 +echo "configure:1217: checking for ld used by GCC" >&5
   3.173    case $host in
   3.174    *-*-mingw*)
   3.175      # gcc leaves a trailing carriage return which upsets mingw
   3.176 @@ -1244,10 +1243,10 @@
   3.177    esac
   3.178  elif test "$with_gnu_ld" = yes; then
   3.179    echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
   3.180 -echo "configure:1248: checking for GNU ld" >&5
   3.181 +echo "configure:1247: checking for GNU ld" >&5
   3.182  else
   3.183    echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
   3.184 -echo "configure:1251: checking for non-GNU ld" >&5
   3.185 +echo "configure:1250: checking for non-GNU ld" >&5
   3.186  fi
   3.187  if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
   3.188    echo $ac_n "(cached) $ac_c" 1>&6
   3.189 @@ -1283,7 +1282,7 @@
   3.190  test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
   3.191  
   3.192  echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
   3.193 -echo "configure:1287: checking if the linker ($LD) is GNU ld" >&5
   3.194 +echo "configure:1286: checking if the linker ($LD) is GNU ld" >&5
   3.195  if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
   3.196    echo $ac_n "(cached) $ac_c" 1>&6
   3.197  else
   3.198 @@ -1299,7 +1298,7 @@
   3.199  
   3.200  
   3.201  echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
   3.202 -echo "configure:1303: checking for BSD-compatible nm" >&5
   3.203 +echo "configure:1302: checking for BSD-compatible nm" >&5
   3.204  if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
   3.205    echo $ac_n "(cached) $ac_c" 1>&6
   3.206  else
   3.207 @@ -1336,7 +1335,7 @@
   3.208  
   3.209  
   3.210  echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
   3.211 -echo "configure:1340: checking whether ln -s works" >&5
   3.212 +echo "configure:1339: checking whether ln -s works" >&5
   3.213  if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   3.214    echo $ac_n "(cached) $ac_c" 1>&6
   3.215  else
   3.216 @@ -1366,7 +1365,7 @@
   3.217  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
   3.218  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
   3.219  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   3.220 -echo "configure:1370: checking for $ac_word" >&5
   3.221 +echo "configure:1369: checking for $ac_word" >&5
   3.222  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   3.223    echo $ac_n "(cached) $ac_c" 1>&6
   3.224  else
   3.225 @@ -1398,7 +1397,7 @@
   3.226    # Extract the first word of "ranlib", so it can be a program name with args.
   3.227  set dummy ranlib; ac_word=$2
   3.228  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   3.229 -echo "configure:1402: checking for $ac_word" >&5
   3.230 +echo "configure:1401: checking for $ac_word" >&5
   3.231  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   3.232    echo $ac_n "(cached) $ac_c" 1>&6
   3.233  else
   3.234 @@ -1465,8 +1464,8 @@
   3.235  case "$host" in
   3.236  *-*-irix6*)
   3.237    # Find out which ABI we are using.
   3.238 -  echo '#line 1469 "configure"' > conftest.$ac_ext
   3.239 -  if { (eval echo configure:1470: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   3.240 +  echo '#line 1468 "configure"' > conftest.$ac_ext
   3.241 +  if { (eval echo configure:1469: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   3.242      case "`/usr/bin/file conftest.o`" in
   3.243      *32-bit*)
   3.244        LD="${LD-ld} -32"
   3.245 @@ -1487,19 +1486,19 @@
   3.246    SAVE_CFLAGS="$CFLAGS"
   3.247    CFLAGS="$CFLAGS -belf"
   3.248    echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
   3.249 -echo "configure:1491: checking whether the C compiler needs -belf" >&5
   3.250 +echo "configure:1490: checking whether the C compiler needs -belf" >&5
   3.251  if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   3.252    echo $ac_n "(cached) $ac_c" 1>&6
   3.253  else
   3.254    cat > conftest.$ac_ext <<EOF
   3.255 -#line 1496 "configure"
   3.256 +#line 1495 "configure"
   3.257  #include "confdefs.h"
   3.258  
   3.259  int main() {
   3.260  
   3.261  ; return 0; }
   3.262  EOF
   3.263 -if { (eval echo configure:1503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   3.264 +if { (eval echo configure:1502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   3.265    rm -rf conftest*
   3.266    lt_cv_cc_needs_belf=yes
   3.267  else
   3.268 @@ -1612,7 +1611,7 @@
   3.269  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
   3.270  # ./install, which can be erroneously created by make from ./install.sh.
   3.271  echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
   3.272 -echo "configure:1616: checking for a BSD compatible install" >&5
   3.273 +echo "configure:1615: checking for a BSD compatible install" >&5
   3.274  if test -z "$INSTALL"; then
   3.275  if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   3.276    echo $ac_n "(cached) $ac_c" 1>&6
   3.277 @@ -1666,7 +1665,7 @@
   3.278  
   3.279  
   3.280  echo $ac_n "checking target system type""... $ac_c" 1>&6
   3.281 -echo "configure:1670: checking target system type" >&5
   3.282 +echo "configure:1669: checking target system type" >&5
   3.283  
   3.284  target_alias=$target
   3.285  case "$target_alias" in
   3.286 @@ -1689,6 +1688,7 @@
   3.287          ;;
   3.288  esac
   3.289  
   3.290 +SDL_VERSION=1.0.0
   3.291  # Check whether --with-sdl-prefix or --without-sdl-prefix was given.
   3.292  if test "${with_sdl_prefix+set}" = set; then
   3.293    withval="$with_sdl_prefix"
   3.294 @@ -1763,7 +1763,7 @@
   3.295    echo "$ac_t""no" 1>&6
   3.296  fi
   3.297  
   3.298 -  min_sdl_version=0.11.2
   3.299 +  min_sdl_version=$SDL_VERSION
   3.300    echo $ac_n "checking for SDL - version >= $min_sdl_version""... $ac_c" 1>&6
   3.301  echo "configure:1769: checking for SDL - version >= $min_sdl_version" >&5
   3.302    no_sdl=""
   3.303 @@ -1918,7 +1918,8 @@
   3.304       fi
   3.305       SDL_CFLAGS=""
   3.306       SDL_LIBS=""
   3.307 -     :
   3.308 +     { echo "configure: error: *** SDL version $SDL_VERSION not found!" 1>&2; exit 1; }
   3.309 +
   3.310    fi
   3.311    
   3.312    
   3.313 @@ -1983,10 +1984,10 @@
   3.314  
   3.315  if test x$enable_music_mp3 = xyes; then
   3.316      echo $ac_n "checking for SMPEG headers and libraries""... $ac_c" 1>&6
   3.317 -echo "configure:1987: checking for SMPEG headers and libraries" >&5
   3.318 +echo "configure:1988: checking for SMPEG headers and libraries" >&5
   3.319      have_smpeg=no
   3.320      cat > conftest.$ac_ext <<EOF
   3.321 -#line 1990 "configure"
   3.322 +#line 1991 "configure"
   3.323  #include "confdefs.h"
   3.324  
   3.325       #include <smpeg/smpeg.h>
   3.326 @@ -1996,7 +1997,7 @@
   3.327      
   3.328  ; return 0; }
   3.329  EOF
   3.330 -if { (eval echo configure:2000: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   3.331 +if { (eval echo configure:2001: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   3.332    rm -rf conftest*
   3.333    
   3.334      have_smpeg=yes
     4.1 --- a/configure.in	Thu Nov 11 20:07:05 1999 +0000
     4.2 +++ b/configure.in	Tue Nov 23 05:25:15 1999 +0000
     4.3 @@ -54,8 +54,12 @@
     4.4          ;;
     4.5  esac
     4.6  
     4.7 -dnl Check for SDL 0.11.2
     4.8 -AM_PATH_SDL(0.11.2)
     4.9 +dnl Check for SDL
    4.10 +SDL_VERSION=1.0.0
    4.11 +AM_PATH_SDL($SDL_VERSION,
    4.12 +            :,
    4.13 +	    AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])
    4.14 +)
    4.15  CFLAGS="$CFLAGS $SDL_CFLAGS"
    4.16  LIBS="$LIBS $SDL_LIBS"
    4.17  
     5.1 --- a/mikmod/Makefile.in	Thu Nov 11 20:07:05 1999 +0000
     5.2 +++ b/mikmod/Makefile.in	Tue Nov 23 05:25:15 1999 +0000
     5.3 @@ -1,4 +1,4 @@
     5.4 -# Makefile.in generated automatically by automake 1.4a from Makefile.am
     5.5 +# Makefile.in generated automatically by automake 1.4 from Makefile.am
     5.6  
     5.7  # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
     5.8  # This Makefile.in is free software; the Free Software Foundation
     5.9 @@ -46,10 +46,9 @@
    5.10  AUTOHEADER = @AUTOHEADER@
    5.11  
    5.12  INSTALL = @INSTALL@
    5.13 -INSTALL_PROGRAM = @INSTALL_PROGRAM@
    5.14 +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
    5.15  INSTALL_DATA = @INSTALL_DATA@
    5.16  INSTALL_SCRIPT = @INSTALL_SCRIPT@
    5.17 -INSTALL_STRIP_FLAG =
    5.18  transform = @program_transform_name@
    5.19  
    5.20  NORMAL_INSTALL = :
    5.21 @@ -224,7 +223,7 @@
    5.22  	@for file in $(DISTFILES); do \
    5.23  	  d=$(srcdir); \
    5.24  	  if test -d $$d/$$file; then \
    5.25 -	    cp -pr $$d/$$file $(distdir)/$$file; \
    5.26 +	    cp -pr $$/$$file $(distdir)/$$file; \
    5.27  	  else \
    5.28  	    test -f $(distdir)/$$file \
    5.29  	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
    5.30 @@ -285,7 +284,7 @@
    5.31  all-am: Makefile $(LTLIBRARIES)
    5.32  all-redirect: all-am
    5.33  install-strip:
    5.34 -	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
    5.35 +	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
    5.36  installdirs:
    5.37  
    5.38  
     6.1 --- a/timidity/Makefile.in	Thu Nov 11 20:07:05 1999 +0000
     6.2 +++ b/timidity/Makefile.in	Tue Nov 23 05:25:15 1999 +0000
     6.3 @@ -1,4 +1,4 @@
     6.4 -# Makefile.in generated automatically by automake 1.4a from Makefile.am
     6.5 +# Makefile.in generated automatically by automake 1.4 from Makefile.am
     6.6  
     6.7  # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
     6.8  # This Makefile.in is free software; the Free Software Foundation
     6.9 @@ -46,10 +46,9 @@
    6.10  AUTOHEADER = @AUTOHEADER@
    6.11  
    6.12  INSTALL = @INSTALL@
    6.13 -INSTALL_PROGRAM = @INSTALL_PROGRAM@
    6.14 +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
    6.15  INSTALL_DATA = @INSTALL_DATA@
    6.16  INSTALL_SCRIPT = @INSTALL_SCRIPT@
    6.17 -INSTALL_STRIP_FLAG =
    6.18  transform = @program_transform_name@
    6.19  
    6.20  NORMAL_INSTALL = :
    6.21 @@ -222,7 +221,7 @@
    6.22  	@for file in $(DISTFILES); do \
    6.23  	  d=$(srcdir); \
    6.24  	  if test -d $$d/$$file; then \
    6.25 -	    cp -pr $$d/$$file $(distdir)/$$file; \
    6.26 +	    cp -pr $$/$$file $(distdir)/$$file; \
    6.27  	  else \
    6.28  	    test -f $(distdir)/$$file \
    6.29  	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
    6.30 @@ -283,7 +282,7 @@
    6.31  all-am: Makefile $(LTLIBRARIES)
    6.32  all-redirect: all-am
    6.33  install-strip:
    6.34 -	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
    6.35 +	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
    6.36  installdirs:
    6.37  
    6.38