* Changed the name of the library from "mixer" to "SDL_mixer"
authorSam Lantinga <slouken@lokigames.com>
Tue, 18 Jan 2000 03:37:49 +0000
changeset 36d86f1cebe419
parent 35 38b7b8e93dc6
child 37 7e477cb285c5
* Changed the name of the library from "mixer" to "SDL_mixer"
Instead of including "mixer.h", include "SDL_mixer.h",
Instead of linking with libmixer.a, link with libSDL_mixer.a
CHANGES
Makefile.am
Makefile.in
aclocal.m4
configure
configure.in
mikmod/Makefile.in
timidity/Makefile.in
     1.1 --- a/CHANGES	Fri Jan 14 19:12:56 2000 +0000
     1.2 +++ b/CHANGES	Tue Jan 18 03:37:49 2000 +0000
     1.3 @@ -1,9 +1,13 @@
     1.4 +
     1.5 +1.0.3:
     1.6 +Sam Lantinga - Mon Jan 17 19:48:09 PST 2000
     1.7 + * Changed the name of the library from "mixer" to "SDL_mixer"
     1.8 +   Instead of including "mixer.h", include "SDL_mixer.h",
     1.9 +   Instead of linking with libmixer.a, link with libSDL_mixer.a
    1.10  
    1.11  1.0.2:
    1.12  Sam Lantinga - Fri Jan 14 11:06:56 PST 2000
    1.13   * Made the CHANGELOG entries Y2K compliant. :)
    1.14 - * Changed the name of the library from "mixer" to "SDLmixer"
    1.15 -   Instead of including "mixer.h", include "SDL_mixer.h"
    1.16  FXJ -	Updated the mikmod support to MikMod 3.1.8
    1.17  FXJ -	Added Mix_HookMusicFinished() API function
    1.18  
     2.1 --- a/Makefile.am	Fri Jan 14 19:12:56 2000 +0000
     2.2 +++ b/Makefile.am	Tue Jan 18 03:37:49 2000 +0000
     2.3 @@ -1,15 +1,15 @@
     2.4  # Makefile.am for the SDL sample mixer library and players
     2.5  
     2.6 -lib_LTLIBRARIES = libSDLmixer.la
     2.7 +lib_LTLIBRARIES = libSDL_mixer.la
     2.8  
     2.9  SUBDIRS = @MUSIC_SUBDIRS@
    2.10  DIST_SUBIDRS = mikmod timidity
    2.11  
    2.12 -libSDLmixerincludedir = $(includedir)/SDL
    2.13 -libSDLmixerinclude_HEADERS =	\
    2.14 +libSDL_mixerincludedir = $(includedir)/SDL
    2.15 +libSDL_mixerinclude_HEADERS =	\
    2.16  	SDL_mixer.h
    2.17  
    2.18 -libSDLmixer_la_SOURCES =	\
    2.19 +libSDL_mixer_la_SOURCES =	\
    2.20  	mixer.c			\
    2.21  	music.c			\
    2.22  	music_cmd.c		\
    2.23 @@ -29,12 +29,12 @@
    2.24  TIMIDITY_LIB =
    2.25  endif
    2.26  
    2.27 -libSDLmixer_la_LDFLAGS = 		\
    2.28 +libSDL_mixer_la_LDFLAGS = 		\
    2.29          -release $(LT_RELEASE)	\
    2.30  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
    2.31 -libSDLmixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB)
    2.32 +libSDL_mixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB)
    2.33  
    2.34  bin_PROGRAMS = playwave playmus
    2.35  
    2.36 -playwave_LDADD = libSDLmixer.la
    2.37 -playmus_LDADD = libSDLmixer.la
    2.38 +playwave_LDADD = libSDL_mixer.la
    2.39 +playmus_LDADD = libSDL_mixer.la
     3.1 --- a/Makefile.in	Fri Jan 14 19:12:56 2000 +0000
     3.2 +++ b/Makefile.in	Tue Jan 18 03:37:49 2000 +0000
     3.3 @@ -1,4 +1,4 @@
     3.4 -# Makefile.in generated automatically by automake 1.4a from Makefile.am
     3.5 +# Makefile.in generated automatically by automake 1.4 from Makefile.am
     3.6  
     3.7  # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
     3.8  # This Makefile.in is free software; the Free Software Foundation
     3.9 @@ -48,10 +48,9 @@
    3.10  AUTOHEADER = @AUTOHEADER@
    3.11  
    3.12  INSTALL = @INSTALL@
    3.13 -INSTALL_PROGRAM = @INSTALL_PROGRAM@
    3.14 +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
    3.15  INSTALL_DATA = @INSTALL_DATA@
    3.16  INSTALL_SCRIPT = @INSTALL_SCRIPT@
    3.17 -INSTALL_STRIP_FLAG =
    3.18  transform = @program_transform_name@
    3.19  
    3.20  NORMAL_INSTALL = :
    3.21 @@ -88,30 +87,30 @@
    3.22  SDL_LIBS = @SDL_LIBS@
    3.23  VERSION = @VERSION@
    3.24  
    3.25 -lib_LTLIBRARIES = libSDLmixer.la
    3.26 +lib_LTLIBRARIES = libSDL_mixer.la
    3.27  
    3.28  SUBDIRS = @MUSIC_SUBDIRS@
    3.29  DIST_SUBIDRS = mikmod timidity
    3.30  
    3.31 -libSDLmixerincludedir = $(includedir)/SDL
    3.32 -libSDLmixerinclude_HEADERS =  	SDL_mixer.h
    3.33 +libSDL_mixerincludedir = $(includedir)/SDL
    3.34 +libSDL_mixerinclude_HEADERS =  	SDL_mixer.h
    3.35  
    3.36  
    3.37 -libSDLmixer_la_SOURCES =  	mixer.c				music.c				music_cmd.c			music_cmd.h			wave.h				wavestream.c			wavestream.h
    3.38 +libSDL_mixer_la_SOURCES =  	mixer.c				music.c				music_cmd.c			music_cmd.h			wave.h				wavestream.c			wavestream.h
    3.39  
    3.40  @USE_MIKMOD_TRUE@MIKMOD_LIB = mikmod/libmikmod.la
    3.41  @USE_MIKMOD_FALSE@MIKMOD_LIB = 
    3.42  @USE_TIMIDITY_TRUE@TIMIDITY_LIB = timidity/libtimidity.la
    3.43  @USE_TIMIDITY_FALSE@TIMIDITY_LIB = 
    3.44  
    3.45 -libSDLmixer_la_LDFLAGS =          -release $(LT_RELEASE)		-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
    3.46 +libSDL_mixer_la_LDFLAGS =          -release $(LT_RELEASE)		-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
    3.47  
    3.48 -libSDLmixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB)
    3.49 +libSDL_mixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB)
    3.50  
    3.51  bin_PROGRAMS = playwave playmus
    3.52  
    3.53 -playwave_LDADD = libSDLmixer.la
    3.54 -playmus_LDADD = libSDLmixer.la
    3.55 +playwave_LDADD = libSDL_mixer.la
    3.56 +playmus_LDADD = libSDL_mixer.la
    3.57  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    3.58  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
    3.59  CONFIG_CLEAN_FILES = 
    3.60 @@ -122,31 +121,31 @@
    3.61  CPPFLAGS = @CPPFLAGS@
    3.62  LDFLAGS = @LDFLAGS@
    3.63  LIBS = @LIBS@
    3.64 -@USE_TIMIDITY_FALSE@@USE_MIKMOD_FALSE@libSDLmixer_la_DEPENDENCIES = 
    3.65 -@USE_TIMIDITY_TRUE@@USE_MIKMOD_TRUE@libSDLmixer_la_DEPENDENCIES =  \
    3.66 +@USE_TIMIDITY_FALSE@@USE_MIKMOD_FALSE@libSDL_mixer_la_DEPENDENCIES = 
    3.67 +@USE_TIMIDITY_TRUE@@USE_MIKMOD_TRUE@libSDL_mixer_la_DEPENDENCIES =  \
    3.68  @USE_TIMIDITY_TRUE@@USE_MIKMOD_TRUE@mikmod/libmikmod.la \
    3.69  @USE_TIMIDITY_TRUE@@USE_MIKMOD_TRUE@timidity/libtimidity.la
    3.70 -@USE_TIMIDITY_TRUE@@USE_MIKMOD_FALSE@libSDLmixer_la_DEPENDENCIES =  \
    3.71 +@USE_TIMIDITY_TRUE@@USE_MIKMOD_FALSE@libSDL_mixer_la_DEPENDENCIES =  \
    3.72  @USE_TIMIDITY_TRUE@@USE_MIKMOD_FALSE@timidity/libtimidity.la
    3.73 -@USE_TIMIDITY_FALSE@@USE_MIKMOD_TRUE@libSDLmixer_la_DEPENDENCIES =  \
    3.74 +@USE_TIMIDITY_FALSE@@USE_MIKMOD_TRUE@libSDL_mixer_la_DEPENDENCIES =  \
    3.75  @USE_TIMIDITY_FALSE@@USE_MIKMOD_TRUE@mikmod/libmikmod.la
    3.76 -libSDLmixer_la_OBJECTS =  mixer.lo music.lo music_cmd.lo wavestream.lo
    3.77 +libSDL_mixer_la_OBJECTS =  mixer.lo music.lo music_cmd.lo wavestream.lo
    3.78  PROGRAMS =  $(bin_PROGRAMS)
    3.79  
    3.80  playwave_SOURCES = playwave.c
    3.81  playwave_OBJECTS =  playwave.o
    3.82 -playwave_DEPENDENCIES =  libSDLmixer.la
    3.83 +playwave_DEPENDENCIES =  libSDL_mixer.la
    3.84  playwave_LDFLAGS = 
    3.85  playmus_SOURCES = playmus.c
    3.86  playmus_OBJECTS =  playmus.o
    3.87 -playmus_DEPENDENCIES =  libSDLmixer.la
    3.88 +playmus_DEPENDENCIES =  libSDL_mixer.la
    3.89  playmus_LDFLAGS = 
    3.90  CFLAGS = @CFLAGS@
    3.91  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
    3.92  LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
    3.93  CCLD = $(CC)
    3.94  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
    3.95 -HEADERS =  $(libSDLmixerinclude_HEADERS)
    3.96 +HEADERS =  $(libSDL_mixerinclude_HEADERS)
    3.97  
    3.98  DIST_COMMON =  README COPYING Makefile.am Makefile.in acinclude.m4 \
    3.99  aclocal.m4 config.guess config.sub configure configure.in install-sh \
   3.100 @@ -159,8 +158,8 @@
   3.101  GZIP_ENV = --best
   3.102  DEP_FILES =  .deps/mixer.P .deps/music.P .deps/music_cmd.P \
   3.103  .deps/playmus.P .deps/playwave.P .deps/wavestream.P
   3.104 -SOURCES = $(libSDLmixer_la_SOURCES) playwave.c playmus.c
   3.105 -OBJECTS = $(libSDLmixer_la_OBJECTS) playwave.o playmus.o
   3.106 +SOURCES = $(libSDL_mixer_la_SOURCES) playwave.c playmus.c
   3.107 +OBJECTS = $(libSDL_mixer_la_OBJECTS) playwave.o playmus.o
   3.108  
   3.109  all: all-redirect
   3.110  .SUFFIXES:
   3.111 @@ -237,8 +236,8 @@
   3.112  
   3.113  maintainer-clean-libtool:
   3.114  
   3.115 -libSDLmixer.la: $(libSDLmixer_la_OBJECTS) $(libSDLmixer_la_DEPENDENCIES)
   3.116 -	$(LINK) -rpath $(libdir) $(libSDLmixer_la_LDFLAGS) $(libSDLmixer_la_OBJECTS) $(libSDLmixer_la_LIBADD) $(LIBS)
   3.117 +libSDL_mixer.la: $(libSDL_mixer_la_OBJECTS) $(libSDL_mixer_la_DEPENDENCIES)
   3.118 +	$(LINK) -rpath $(libdir) $(libSDL_mixer_la_LDFLAGS) $(libSDL_mixer_la_OBJECTS) $(libSDL_mixer_la_LIBADD) $(LIBS)
   3.119  
   3.120  mostlyclean-binPROGRAMS:
   3.121  
   3.122 @@ -254,8 +253,8 @@
   3.123  	$(mkinstalldirs) $(DESTDIR)$(bindir)
   3.124  	@list='$(bin_PROGRAMS)'; for p in $$list; do \
   3.125  	  if test -f $$p; then \
   3.126 -	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
   3.127 -	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
   3.128 +	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
   3.129 +	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
   3.130  	  else :; fi; \
   3.131  	done
   3.132  
   3.133 @@ -273,19 +272,19 @@
   3.134  	@rm -f playmus
   3.135  	$(LINK) $(playmus_LDFLAGS) $(playmus_OBJECTS) $(playmus_LDADD) $(LIBS)
   3.136  
   3.137 -install-libSDLmixerincludeHEADERS: $(libSDLmixerinclude_HEADERS)
   3.138 +install-libSDL_mixerincludeHEADERS: $(libSDL_mixerinclude_HEADERS)
   3.139  	@$(NORMAL_INSTALL)
   3.140 -	$(mkinstalldirs) $(DESTDIR)$(libSDLmixerincludedir)
   3.141 -	@list='$(libSDLmixerinclude_HEADERS)'; for p in $$list; do \
   3.142 +	$(mkinstalldirs) $(DESTDIR)$(libSDL_mixerincludedir)
   3.143 +	@list='$(libSDL_mixerinclude_HEADERS)'; for p in $$list; do \
   3.144  	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
   3.145 -	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libSDLmixerincludedir)/$$p"; \
   3.146 -	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libSDLmixerincludedir)/$$p; \
   3.147 +	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libSDL_mixerincludedir)/$$p"; \
   3.148 +	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libSDL_mixerincludedir)/$$p; \
   3.149  	done
   3.150  
   3.151 -uninstall-libSDLmixerincludeHEADERS:
   3.152 +uninstall-libSDL_mixerincludeHEADERS:
   3.153  	@$(NORMAL_UNINSTALL)
   3.154 -	list='$(libSDLmixerinclude_HEADERS)'; for p in $$list; do \
   3.155 -	  rm -f $(DESTDIR)$(libSDLmixerincludedir)/$$p; \
   3.156 +	list='$(libSDL_mixerinclude_HEADERS)'; for p in $$list; do \
   3.157 +	  rm -f $(DESTDIR)$(libSDL_mixerincludedir)/$$p; \
   3.158  	done
   3.159  
   3.160  # This directory's subdirectories are mostly independent; you can cd
   3.161 @@ -423,7 +422,7 @@
   3.162  	@for file in $(DISTFILES); do \
   3.163  	  d=$(srcdir); \
   3.164  	  if test -d $$d/$$file; then \
   3.165 -	    cp -pr $$d/$$file $(distdir)/$$file; \
   3.166 +	    cp -pr $$/$$file $(distdir)/$$file; \
   3.167  	  else \
   3.168  	    test -f $(distdir)/$$file \
   3.169  	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
   3.170 @@ -483,23 +482,23 @@
   3.171  install-exec-am: install-libLTLIBRARIES install-binPROGRAMS
   3.172  install-exec: install-exec-recursive
   3.173  
   3.174 -install-data-am: install-libSDLmixerincludeHEADERS
   3.175 +install-data-am: install-libSDL_mixerincludeHEADERS
   3.176  install-data: install-data-recursive
   3.177  
   3.178  install-am: all-am
   3.179  	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
   3.180  install: install-recursive
   3.181  uninstall-am: uninstall-libLTLIBRARIES uninstall-binPROGRAMS \
   3.182 -		uninstall-libSDLmixerincludeHEADERS
   3.183 +		uninstall-libSDL_mixerincludeHEADERS
   3.184  uninstall: uninstall-recursive
   3.185  all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
   3.186  all-redirect: all-recursive
   3.187  install-strip:
   3.188 -	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
   3.189 +	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
   3.190  installdirs: installdirs-recursive
   3.191  installdirs-am:
   3.192  	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \
   3.193 -		$(DESTDIR)$(libSDLmixerincludedir)
   3.194 +		$(DESTDIR)$(libSDL_mixerincludedir)
   3.195  
   3.196  
   3.197  mostlyclean-generic:
   3.198 @@ -549,8 +548,8 @@
   3.199  mostlyclean-libtool distclean-libtool clean-libtool \
   3.200  maintainer-clean-libtool mostlyclean-binPROGRAMS distclean-binPROGRAMS \
   3.201  clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \
   3.202 -install-binPROGRAMS uninstall-libSDLmixerincludeHEADERS \
   3.203 -install-libSDLmixerincludeHEADERS install-data-recursive \
   3.204 +install-binPROGRAMS uninstall-libSDL_mixerincludeHEADERS \
   3.205 +install-libSDL_mixerincludeHEADERS install-data-recursive \
   3.206  uninstall-data-recursive install-exec-recursive \
   3.207  uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
   3.208  all-recursive check-recursive installcheck-recursive info-recursive \
     4.1 --- a/aclocal.m4	Fri Jan 14 19:12:56 2000 +0000
     4.2 +++ b/aclocal.m4	Tue Jan 18 03:37:49 2000 +0000
     4.3 @@ -1,4 +1,4 @@
     4.4 -dnl aclocal.m4 generated automatically by aclocal 1.4a
     4.5 +dnl aclocal.m4 generated automatically by aclocal 1.4
     4.6  
     4.7  dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
     4.8  dnl This file is free software; the Free Software Foundation
     4.9 @@ -627,8 +627,6 @@
    4.10  
    4.11  AC_DEFUN(AM_INIT_AUTOMAKE,
    4.12  [AC_REQUIRE([AC_PROG_INSTALL])
    4.13 -dnl We require 2.13 because we rely on SHELL being computed by configure.
    4.14 -AC_PREREQ([2.13])
    4.15  PACKAGE=[$1]
    4.16  AC_SUBST(PACKAGE)
    4.17  VERSION=[$2]
     5.1 --- a/configure	Fri Jan 14 19:12:56 2000 +0000
     5.2 +++ b/configure	Tue Jan 18 03:37:49 2000 +0000
     5.3 @@ -752,8 +752,7 @@
     5.4  fi
     5.5  
     5.6  
     5.7 -
     5.8 -PACKAGE=SDLmixer
     5.9 +PACKAGE=SDL_mixer
    5.10  
    5.11  VERSION=$VERSION
    5.12  
    5.13 @@ -772,7 +771,7 @@
    5.14  
    5.15  missing_dir=`cd $ac_aux_dir && pwd`
    5.16  echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
    5.17 -echo "configure:776: checking for working aclocal" >&5
    5.18 +echo "configure:775: checking for working aclocal" >&5
    5.19  # Run test in a subshell; some versions of sh will print an error if
    5.20  # an executable is not found, even if stderr is redirected.
    5.21  # Redirect stdin to placate older versions of autoconf.  Sigh.
    5.22 @@ -785,7 +784,7 @@
    5.23  fi
    5.24  
    5.25  echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
    5.26 -echo "configure:789: checking for working autoconf" >&5
    5.27 +echo "configure:788: checking for working autoconf" >&5
    5.28  # Run test in a subshell; some versions of sh will print an error if
    5.29  # an executable is not found, even if stderr is redirected.
    5.30  # Redirect stdin to placate older versions of autoconf.  Sigh.
    5.31 @@ -798,7 +797,7 @@
    5.32  fi
    5.33  
    5.34  echo $ac_n "checking for working automake""... $ac_c" 1>&6
    5.35 -echo "configure:802: checking for working automake" >&5
    5.36 +echo "configure:801: checking for working automake" >&5
    5.37  # Run test in a subshell; some versions of sh will print an error if
    5.38  # an executable is not found, even if stderr is redirected.
    5.39  # Redirect stdin to placate older versions of autoconf.  Sigh.
    5.40 @@ -811,7 +810,7 @@
    5.41  fi
    5.42  
    5.43  echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
    5.44 -echo "configure:815: checking for working autoheader" >&5
    5.45 +echo "configure:814: checking for working autoheader" >&5
    5.46  # Run test in a subshell; some versions of sh will print an error if
    5.47  # an executable is not found, even if stderr is redirected.
    5.48  # Redirect stdin to placate older versions of autoconf.  Sigh.
    5.49 @@ -824,7 +823,7 @@
    5.50  fi
    5.51  
    5.52  echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
    5.53 -echo "configure:828: checking for working makeinfo" >&5
    5.54 +echo "configure:827: checking for working makeinfo" >&5
    5.55  # Run test in a subshell; some versions of sh will print an error if
    5.56  # an executable is not found, even if stderr is redirected.
    5.57  # Redirect stdin to placate older versions of autoconf.  Sigh.
    5.58 @@ -840,7 +839,7 @@
    5.59  
    5.60  
    5.61  echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
    5.62 -echo "configure:844: checking whether ${MAKE-make} sets \${MAKE}" >&5
    5.63 +echo "configure:843: checking whether ${MAKE-make} sets \${MAKE}" >&5
    5.64  set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
    5.65  if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
    5.66    echo $ac_n "(cached) $ac_c" 1>&6
    5.67 @@ -869,7 +868,7 @@
    5.68  # Extract the first word of "gcc", so it can be a program name with args.
    5.69  set dummy gcc; ac_word=$2
    5.70  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    5.71 -echo "configure:873: checking for $ac_word" >&5
    5.72 +echo "configure:872: checking for $ac_word" >&5
    5.73  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    5.74    echo $ac_n "(cached) $ac_c" 1>&6
    5.75  else
    5.76 @@ -899,7 +898,7 @@
    5.77    # Extract the first word of "cc", so it can be a program name with args.
    5.78  set dummy cc; ac_word=$2
    5.79  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    5.80 -echo "configure:903: checking for $ac_word" >&5
    5.81 +echo "configure:902: checking for $ac_word" >&5
    5.82  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    5.83    echo $ac_n "(cached) $ac_c" 1>&6
    5.84  else
    5.85 @@ -950,7 +949,7 @@
    5.86        # Extract the first word of "cl", so it can be a program name with args.
    5.87  set dummy cl; ac_word=$2
    5.88  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    5.89 -echo "configure:954: checking for $ac_word" >&5
    5.90 +echo "configure:953: checking for $ac_word" >&5
    5.91  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    5.92    echo $ac_n "(cached) $ac_c" 1>&6
    5.93  else
    5.94 @@ -982,7 +981,7 @@
    5.95  fi
    5.96  
    5.97  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
    5.98 -echo "configure:986: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
    5.99 +echo "configure:985: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
   5.100  
   5.101  ac_ext=c
   5.102  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
   5.103 @@ -993,12 +992,12 @@
   5.104  
   5.105  cat > conftest.$ac_ext << EOF
   5.106  
   5.107 -#line 997 "configure"
   5.108 +#line 996 "configure"
   5.109  #include "confdefs.h"
   5.110  
   5.111  main(){return(0);}
   5.112  EOF
   5.113 -if { (eval echo configure:1002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   5.114 +if { (eval echo configure:1001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   5.115    ac_cv_prog_cc_works=yes
   5.116    # If we can't run a trivial program, we are probably using a cross compiler.
   5.117    if (./conftest; exit) 2>/dev/null; then
   5.118 @@ -1024,12 +1023,12 @@
   5.119    { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
   5.120  fi
   5.121  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
   5.122 -echo "configure:1028: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
   5.123 +echo "configure:1027: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
   5.124  echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
   5.125  cross_compiling=$ac_cv_prog_cc_cross
   5.126  
   5.127  echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
   5.128 -echo "configure:1033: checking whether we are using GNU C" >&5
   5.129 +echo "configure:1032: checking whether we are using GNU C" >&5
   5.130  if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   5.131    echo $ac_n "(cached) $ac_c" 1>&6
   5.132  else
   5.133 @@ -1038,7 +1037,7 @@
   5.134    yes;
   5.135  #endif
   5.136  EOF
   5.137 -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
   5.138 +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
   5.139    ac_cv_prog_gcc=yes
   5.140  else
   5.141    ac_cv_prog_gcc=no
   5.142 @@ -1057,7 +1056,7 @@
   5.143  ac_save_CFLAGS="$CFLAGS"
   5.144  CFLAGS=
   5.145  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
   5.146 -echo "configure:1061: checking whether ${CC-cc} accepts -g" >&5
   5.147 +echo "configure:1060: checking whether ${CC-cc} accepts -g" >&5
   5.148  if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   5.149    echo $ac_n "(cached) $ac_c" 1>&6
   5.150  else
   5.151 @@ -1165,7 +1164,7 @@
   5.152  fi
   5.153  
   5.154  echo $ac_n "checking host system type""... $ac_c" 1>&6
   5.155 -echo "configure:1169: checking host system type" >&5
   5.156 +echo "configure:1168: checking host system type" >&5
   5.157  
   5.158  host_alias=$host
   5.159  case "$host_alias" in
   5.160 @@ -1186,7 +1185,7 @@
   5.161  echo "$ac_t""$host" 1>&6
   5.162  
   5.163  echo $ac_n "checking build system type""... $ac_c" 1>&6
   5.164 -echo "configure:1190: checking build system type" >&5
   5.165 +echo "configure:1189: checking build system type" >&5
   5.166  
   5.167  build_alias=$build
   5.168  case "$build_alias" in
   5.169 @@ -1215,7 +1214,7 @@
   5.170  if test "$ac_cv_prog_gcc" = yes; then
   5.171    # Check if gcc -print-prog-name=ld gives a path.
   5.172    echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
   5.173 -echo "configure:1219: checking for ld used by GCC" >&5
   5.174 +echo "configure:1218: checking for ld used by GCC" >&5
   5.175    case $host in
   5.176    *-*-mingw*)
   5.177      # gcc leaves a trailing carriage return which upsets mingw
   5.178 @@ -1245,10 +1244,10 @@
   5.179    esac
   5.180  elif test "$with_gnu_ld" = yes; then
   5.181    echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
   5.182 -echo "configure:1249: checking for GNU ld" >&5
   5.183 +echo "configure:1248: checking for GNU ld" >&5
   5.184  else
   5.185    echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
   5.186 -echo "configure:1252: checking for non-GNU ld" >&5
   5.187 +echo "configure:1251: checking for non-GNU ld" >&5
   5.188  fi
   5.189  if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
   5.190    echo $ac_n "(cached) $ac_c" 1>&6
   5.191 @@ -1284,7 +1283,7 @@
   5.192  test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
   5.193  
   5.194  echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
   5.195 -echo "configure:1288: checking if the linker ($LD) is GNU ld" >&5
   5.196 +echo "configure:1287: checking if the linker ($LD) is GNU ld" >&5
   5.197  if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
   5.198    echo $ac_n "(cached) $ac_c" 1>&6
   5.199  else
   5.200 @@ -1300,7 +1299,7 @@
   5.201  
   5.202  
   5.203  echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
   5.204 -echo "configure:1304: checking for BSD-compatible nm" >&5
   5.205 +echo "configure:1303: checking for BSD-compatible nm" >&5
   5.206  if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
   5.207    echo $ac_n "(cached) $ac_c" 1>&6
   5.208  else
   5.209 @@ -1337,7 +1336,7 @@
   5.210  
   5.211  
   5.212  echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
   5.213 -echo "configure:1341: checking whether ln -s works" >&5
   5.214 +echo "configure:1340: checking whether ln -s works" >&5
   5.215  if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   5.216    echo $ac_n "(cached) $ac_c" 1>&6
   5.217  else
   5.218 @@ -1367,7 +1366,7 @@
   5.219  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
   5.220  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
   5.221  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   5.222 -echo "configure:1371: checking for $ac_word" >&5
   5.223 +echo "configure:1370: checking for $ac_word" >&5
   5.224  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   5.225    echo $ac_n "(cached) $ac_c" 1>&6
   5.226  else
   5.227 @@ -1399,7 +1398,7 @@
   5.228    # Extract the first word of "ranlib", so it can be a program name with args.
   5.229  set dummy ranlib; ac_word=$2
   5.230  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   5.231 -echo "configure:1403: checking for $ac_word" >&5
   5.232 +echo "configure:1402: checking for $ac_word" >&5
   5.233  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   5.234    echo $ac_n "(cached) $ac_c" 1>&6
   5.235  else
   5.236 @@ -1466,8 +1465,8 @@
   5.237  case "$host" in
   5.238  *-*-irix6*)
   5.239    # Find out which ABI we are using.
   5.240 -  echo '#line 1470 "configure"' > conftest.$ac_ext
   5.241 -  if { (eval echo configure:1471: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   5.242 +  echo '#line 1469 "configure"' > conftest.$ac_ext
   5.243 +  if { (eval echo configure:1470: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   5.244      case "`/usr/bin/file conftest.o`" in
   5.245      *32-bit*)
   5.246        LD="${LD-ld} -32"
   5.247 @@ -1488,19 +1487,19 @@
   5.248    SAVE_CFLAGS="$CFLAGS"
   5.249    CFLAGS="$CFLAGS -belf"
   5.250    echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
   5.251 -echo "configure:1492: checking whether the C compiler needs -belf" >&5
   5.252 +echo "configure:1491: checking whether the C compiler needs -belf" >&5
   5.253  if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   5.254    echo $ac_n "(cached) $ac_c" 1>&6
   5.255  else
   5.256    cat > conftest.$ac_ext <<EOF
   5.257 -#line 1497 "configure"
   5.258 +#line 1496 "configure"
   5.259  #include "confdefs.h"
   5.260  
   5.261  int main() {
   5.262  
   5.263  ; return 0; }
   5.264  EOF
   5.265 -if { (eval echo configure:1504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   5.266 +if { (eval echo configure:1503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   5.267    rm -rf conftest*
   5.268    lt_cv_cc_needs_belf=yes
   5.269  else
   5.270 @@ -1523,7 +1522,7 @@
   5.271    # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
   5.272  set dummy ${ac_tool_prefix}dlltool; ac_word=$2
   5.273  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   5.274 -echo "configure:1527: checking for $ac_word" >&5
   5.275 +echo "configure:1526: checking for $ac_word" >&5
   5.276  if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   5.277    echo $ac_n "(cached) $ac_c" 1>&6
   5.278  else
   5.279 @@ -1555,7 +1554,7 @@
   5.280    # Extract the first word of "dlltool", so it can be a program name with args.
   5.281  set dummy dlltool; ac_word=$2
   5.282  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   5.283 -echo "configure:1559: checking for $ac_word" >&5
   5.284 +echo "configure:1558: checking for $ac_word" >&5
   5.285  if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   5.286    echo $ac_n "(cached) $ac_c" 1>&6
   5.287  else
   5.288 @@ -1590,7 +1589,7 @@
   5.289    # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
   5.290  set dummy ${ac_tool_prefix}as; ac_word=$2
   5.291  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   5.292 -echo "configure:1594: checking for $ac_word" >&5
   5.293 +echo "configure:1593: checking for $ac_word" >&5
   5.294  if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   5.295    echo $ac_n "(cached) $ac_c" 1>&6
   5.296  else
   5.297 @@ -1622,7 +1621,7 @@
   5.298    # Extract the first word of "as", so it can be a program name with args.
   5.299  set dummy as; ac_word=$2
   5.300  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   5.301 -echo "configure:1626: checking for $ac_word" >&5
   5.302 +echo "configure:1625: checking for $ac_word" >&5
   5.303  if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   5.304    echo $ac_n "(cached) $ac_c" 1>&6
   5.305  else
   5.306 @@ -1657,7 +1656,7 @@
   5.307    # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
   5.308  set dummy ${ac_tool_prefix}objdump; ac_word=$2
   5.309  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   5.310 -echo "configure:1661: checking for $ac_word" >&5
   5.311 +echo "configure:1660: checking for $ac_word" >&5
   5.312  if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   5.313    echo $ac_n "(cached) $ac_c" 1>&6
   5.314  else
   5.315 @@ -1689,7 +1688,7 @@
   5.316    # Extract the first word of "objdump", so it can be a program name with args.
   5.317  set dummy objdump; ac_word=$2
   5.318  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   5.319 -echo "configure:1693: checking for $ac_word" >&5
   5.320 +echo "configure:1692: checking for $ac_word" >&5
   5.321  if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   5.322    echo $ac_n "(cached) $ac_c" 1>&6
   5.323  else
   5.324 @@ -1725,19 +1724,19 @@
   5.325    # recent cygwin and mingw systems supply a stub DllMain which the user
   5.326    # can override, but on older systems we have to supply one
   5.327    echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6
   5.328 -echo "configure:1729: checking if libtool should supply DllMain function" >&5
   5.329 +echo "configure:1728: checking if libtool should supply DllMain function" >&5
   5.330  if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then
   5.331    echo $ac_n "(cached) $ac_c" 1>&6
   5.332  else
   5.333    cat > conftest.$ac_ext <<EOF
   5.334 -#line 1734 "configure"
   5.335 +#line 1733 "configure"
   5.336  #include "confdefs.h"
   5.337  DllMain (0, 0, 0);
   5.338  int main() {
   5.339  extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
   5.340  ; return 0; }
   5.341  EOF
   5.342 -if { (eval echo configure:1741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   5.343 +if { (eval echo configure:1740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   5.344    rm -rf conftest*
   5.345    lt_cv_need_dllmain=yes
   5.346  else
   5.347 @@ -1762,19 +1761,19 @@
   5.348      SAVE_CFLAGS="$CFLAGS"
   5.349      CFLAGS="$CFLAGS -mdll"
   5.350      echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6
   5.351 -echo "configure:1766: checking how to link DLLs" >&5
   5.352 +echo "configure:1765: checking how to link DLLs" >&5
   5.353  if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then
   5.354    echo $ac_n "(cached) $ac_c" 1>&6
   5.355  else
   5.356    cat > conftest.$ac_ext <<EOF
   5.357 -#line 1771 "configure"
   5.358 +#line 1770 "configure"
   5.359  #include "confdefs.h"
   5.360  
   5.361  int main() {
   5.362  
   5.363  ; return 0; }
   5.364  EOF
   5.365 -if { (eval echo configure:1778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   5.366 +if { (eval echo configure:1777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   5.367    rm -rf conftest*
   5.368    lt_cv_cc_dll_switch=-mdll
   5.369  else
   5.370 @@ -1884,7 +1883,7 @@
   5.371  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
   5.372  # ./install, which can be erroneously created by make from ./install.sh.
   5.373  echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
   5.374 -echo "configure:1888: checking for a BSD compatible install" >&5
   5.375 +echo "configure:1887: checking for a BSD compatible install" >&5
   5.376  if test -z "$INSTALL"; then
   5.377  if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   5.378    echo $ac_n "(cached) $ac_c" 1>&6
   5.379 @@ -1938,7 +1937,7 @@
   5.380  
   5.381  
   5.382  echo $ac_n "checking target system type""... $ac_c" 1>&6
   5.383 -echo "configure:1942: checking target system type" >&5
   5.384 +echo "configure:1941: checking target system type" >&5
   5.385  
   5.386  target_alias=$target
   5.387  case "$target_alias" in
   5.388 @@ -2003,7 +2002,7 @@
   5.389    # Extract the first word of "sdl-config", so it can be a program name with args.
   5.390  set dummy sdl-config; ac_word=$2
   5.391  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   5.392 -echo "configure:2007: checking for $ac_word" >&5
   5.393 +echo "configure:2006: checking for $ac_word" >&5
   5.394  if eval "test \"`echo '$''{'ac_cv_path_SDL_CONFIG'+set}'`\" = set"; then
   5.395    echo $ac_n "(cached) $ac_c" 1>&6
   5.396  else
   5.397 @@ -2038,7 +2037,7 @@
   5.398  
   5.399    min_sdl_version=$SDL_VERSION
   5.400    echo $ac_n "checking for SDL - version >= $min_sdl_version""... $ac_c" 1>&6
   5.401 -echo "configure:2042: checking for SDL - version >= $min_sdl_version" >&5
   5.402 +echo "configure:2041: checking for SDL - version >= $min_sdl_version" >&5
   5.403    no_sdl=""
   5.404    if test "$SDL_CONFIG" = "no" ; then
   5.405      no_sdl=yes
   5.406 @@ -2062,7 +2061,7 @@
   5.407    echo $ac_n "cross compiling; assumed OK... $ac_c"
   5.408  else
   5.409    cat > conftest.$ac_ext <<EOF
   5.410 -#line 2066 "configure"
   5.411 +#line 2065 "configure"
   5.412  #include "confdefs.h"
   5.413  
   5.414  #include <stdio.h>
   5.415 @@ -2120,7 +2119,7 @@
   5.416  
   5.417  
   5.418  EOF
   5.419 -if { (eval echo configure:2124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
   5.420 +if { (eval echo configure:2123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
   5.421  then
   5.422    :
   5.423  else
   5.424 @@ -2154,7 +2153,7 @@
   5.425            CFLAGS="$CFLAGS $SDL_CFLAGS"
   5.426            LIBS="$LIBS $SDL_LIBS"
   5.427            cat > conftest.$ac_ext <<EOF
   5.428 -#line 2158 "configure"
   5.429 +#line 2157 "configure"
   5.430  #include "confdefs.h"
   5.431  
   5.432  #include <stdio.h>
   5.433 @@ -2164,7 +2163,7 @@
   5.434   return 0; 
   5.435  ; return 0; }
   5.436  EOF
   5.437 -if { (eval echo configure:2168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   5.438 +if { (eval echo configure:2167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   5.439    rm -rf conftest*
   5.440     echo "*** The test program compiled, but did not run. This usually means"
   5.441            echo "*** that the run-time linker is not finding SDL or finding the wrong"
   5.442 @@ -2257,10 +2256,10 @@
   5.443  
   5.444  if test x$enable_music_mp3 = xyes; then
   5.445      echo $ac_n "checking for SMPEG headers and libraries""... $ac_c" 1>&6
   5.446 -echo "configure:2261: checking for SMPEG headers and libraries" >&5
   5.447 +echo "configure:2260: checking for SMPEG headers and libraries" >&5
   5.448      have_smpeg=no
   5.449      cat > conftest.$ac_ext <<EOF
   5.450 -#line 2264 "configure"
   5.451 +#line 2263 "configure"
   5.452  #include "confdefs.h"
   5.453  
   5.454       #include <smpeg/smpeg.h>
   5.455 @@ -2270,7 +2269,7 @@
   5.456      
   5.457  ; return 0; }
   5.458  EOF
   5.459 -if { (eval echo configure:2274: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   5.460 +if { (eval echo configure:2273: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   5.461    rm -rf conftest*
   5.462    
   5.463      have_smpeg=yes
     6.1 --- a/configure.in	Fri Jan 14 19:12:56 2000 +0000
     6.2 +++ b/configure.in	Tue Jan 18 03:37:49 2000 +0000
     6.3 @@ -37,7 +37,7 @@
     6.4  AC_SUBST(LT_AGE)
     6.5  
     6.6  dnl Setup for automake
     6.7 -AM_INIT_AUTOMAKE(SDLmixer, $VERSION)
     6.8 +AM_INIT_AUTOMAKE(SDL_mixer, $VERSION)
     6.9  
    6.10  dnl Check for tools
    6.11  
     7.1 --- a/mikmod/Makefile.in	Fri Jan 14 19:12:56 2000 +0000
     7.2 +++ b/mikmod/Makefile.in	Tue Jan 18 03:37:49 2000 +0000
     7.3 @@ -1,4 +1,4 @@
     7.4 -# Makefile.in generated automatically by automake 1.4a from Makefile.am
     7.5 +# Makefile.in generated automatically by automake 1.4 from Makefile.am
     7.6  
     7.7  # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
     7.8  # This Makefile.in is free software; the Free Software Foundation
     7.9 @@ -46,10 +46,9 @@
    7.10  AUTOHEADER = @AUTOHEADER@
    7.11  
    7.12  INSTALL = @INSTALL@
    7.13 -INSTALL_PROGRAM = @INSTALL_PROGRAM@
    7.14 +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
    7.15  INSTALL_DATA = @INSTALL_DATA@
    7.16  INSTALL_SCRIPT = @INSTALL_SCRIPT@
    7.17 -INSTALL_STRIP_FLAG =
    7.18  transform = @program_transform_name@
    7.19  
    7.20  NORMAL_INSTALL = :
    7.21 @@ -225,7 +224,7 @@
    7.22  	@for file in $(DISTFILES); do \
    7.23  	  d=$(srcdir); \
    7.24  	  if test -d $$d/$$file; then \
    7.25 -	    cp -pr $$d/$$file $(distdir)/$$file; \
    7.26 +	    cp -pr $$/$$file $(distdir)/$$file; \
    7.27  	  else \
    7.28  	    test -f $(distdir)/$$file \
    7.29  	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
    7.30 @@ -286,7 +285,7 @@
    7.31  all-am: Makefile $(LTLIBRARIES)
    7.32  all-redirect: all-am
    7.33  install-strip:
    7.34 -	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
    7.35 +	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
    7.36  installdirs:
    7.37  
    7.38  
     8.1 --- a/timidity/Makefile.in	Fri Jan 14 19:12:56 2000 +0000
     8.2 +++ b/timidity/Makefile.in	Tue Jan 18 03:37:49 2000 +0000
     8.3 @@ -1,4 +1,4 @@
     8.4 -# Makefile.in generated automatically by automake 1.4a from Makefile.am
     8.5 +# Makefile.in generated automatically by automake 1.4 from Makefile.am
     8.6  
     8.7  # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
     8.8  # This Makefile.in is free software; the Free Software Foundation
     8.9 @@ -46,10 +46,9 @@
    8.10  AUTOHEADER = @AUTOHEADER@
    8.11  
    8.12  INSTALL = @INSTALL@
    8.13 -INSTALL_PROGRAM = @INSTALL_PROGRAM@
    8.14 +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
    8.15  INSTALL_DATA = @INSTALL_DATA@
    8.16  INSTALL_SCRIPT = @INSTALL_SCRIPT@
    8.17 -INSTALL_STRIP_FLAG =
    8.18  transform = @program_transform_name@
    8.19  
    8.20  NORMAL_INSTALL = :
    8.21 @@ -222,7 +221,7 @@
    8.22  	@for file in $(DISTFILES); do \
    8.23  	  d=$(srcdir); \
    8.24  	  if test -d $$d/$$file; then \
    8.25 -	    cp -pr $$d/$$file $(distdir)/$$file; \
    8.26 +	    cp -pr $$/$$file $(distdir)/$$file; \
    8.27  	  else \
    8.28  	    test -f $(distdir)/$$file \
    8.29  	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
    8.30 @@ -283,7 +282,7 @@
    8.31  all-am: Makefile $(LTLIBRARIES)
    8.32  all-redirect: all-am
    8.33  install-strip:
    8.34 -	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
    8.35 +	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
    8.36  installdirs:
    8.37  
    8.38