From 75210ddf475402d0e9f0b4f6dfa1c87b7ca7645a Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Tue, 18 Jan 2000 03:37:49 +0000 Subject: [PATCH] * 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 | 8 +++- Makefile.am | 16 +++---- Makefile.in | 79 +++++++++++++++--------------- aclocal.m4 | 4 +- configure | 111 +++++++++++++++++++++---------------------- configure.in | 2 +- mikmod/Makefile.in | 9 ++-- timidity/Makefile.in | 9 ++-- 8 files changed, 118 insertions(+), 120 deletions(-) diff --git a/CHANGES b/CHANGES index daa15f21..ff1432a7 100644 --- a/CHANGES +++ b/CHANGES @@ -1,9 +1,13 @@ +1.0.3: +Sam Lantinga - Mon Jan 17 19:48:09 PST 2000 + * 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 + 1.0.2: Sam Lantinga - Fri Jan 14 11:06:56 PST 2000 * Made the CHANGELOG entries Y2K compliant. :) - * Changed the name of the library from "mixer" to "SDLmixer" - Instead of including "mixer.h", include "SDL_mixer.h" FXJ - Updated the mikmod support to MikMod 3.1.8 FXJ - Added Mix_HookMusicFinished() API function diff --git a/Makefile.am b/Makefile.am index a6260fc3..205dcb87 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,15 +1,15 @@ # Makefile.am for the SDL sample mixer library and players -lib_LTLIBRARIES = libSDLmixer.la +lib_LTLIBRARIES = libSDL_mixer.la SUBDIRS = @MUSIC_SUBDIRS@ DIST_SUBIDRS = mikmod timidity -libSDLmixerincludedir = $(includedir)/SDL -libSDLmixerinclude_HEADERS = \ +libSDL_mixerincludedir = $(includedir)/SDL +libSDL_mixerinclude_HEADERS = \ SDL_mixer.h -libSDLmixer_la_SOURCES = \ +libSDL_mixer_la_SOURCES = \ mixer.c \ music.c \ music_cmd.c \ @@ -29,12 +29,12 @@ else TIMIDITY_LIB = endif -libSDLmixer_la_LDFLAGS = \ +libSDL_mixer_la_LDFLAGS = \ -release $(LT_RELEASE) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -libSDLmixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB) +libSDL_mixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB) bin_PROGRAMS = playwave playmus -playwave_LDADD = libSDLmixer.la -playmus_LDADD = libSDLmixer.la +playwave_LDADD = libSDL_mixer.la +playmus_LDADD = libSDL_mixer.la diff --git a/Makefile.in b/Makefile.in index d2e6f8c1..6ed79a26 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4a from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -48,10 +48,9 @@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_FLAG = transform = @program_transform_name@ NORMAL_INSTALL = : @@ -88,30 +87,30 @@ SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ VERSION = @VERSION@ -lib_LTLIBRARIES = libSDLmixer.la +lib_LTLIBRARIES = libSDL_mixer.la SUBDIRS = @MUSIC_SUBDIRS@ DIST_SUBIDRS = mikmod timidity -libSDLmixerincludedir = $(includedir)/SDL -libSDLmixerinclude_HEADERS = SDL_mixer.h +libSDL_mixerincludedir = $(includedir)/SDL +libSDL_mixerinclude_HEADERS = SDL_mixer.h -libSDLmixer_la_SOURCES = mixer.c music.c music_cmd.c music_cmd.h wave.h wavestream.c wavestream.h +libSDL_mixer_la_SOURCES = mixer.c music.c music_cmd.c music_cmd.h wave.h wavestream.c wavestream.h @USE_MIKMOD_TRUE@MIKMOD_LIB = mikmod/libmikmod.la @USE_MIKMOD_FALSE@MIKMOD_LIB = @USE_TIMIDITY_TRUE@TIMIDITY_LIB = timidity/libtimidity.la @USE_TIMIDITY_FALSE@TIMIDITY_LIB = -libSDLmixer_la_LDFLAGS = -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) +libSDL_mixer_la_LDFLAGS = -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -libSDLmixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB) +libSDL_mixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB) bin_PROGRAMS = playwave playmus -playwave_LDADD = libSDLmixer.la -playmus_LDADD = libSDLmixer.la +playwave_LDADD = libSDL_mixer.la +playmus_LDADD = libSDL_mixer.la ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = @@ -122,31 +121,31 @@ DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -@USE_TIMIDITY_FALSE@@USE_MIKMOD_FALSE@libSDLmixer_la_DEPENDENCIES = -@USE_TIMIDITY_TRUE@@USE_MIKMOD_TRUE@libSDLmixer_la_DEPENDENCIES = \ +@USE_TIMIDITY_FALSE@@USE_MIKMOD_FALSE@libSDL_mixer_la_DEPENDENCIES = +@USE_TIMIDITY_TRUE@@USE_MIKMOD_TRUE@libSDL_mixer_la_DEPENDENCIES = \ @USE_TIMIDITY_TRUE@@USE_MIKMOD_TRUE@mikmod/libmikmod.la \ @USE_TIMIDITY_TRUE@@USE_MIKMOD_TRUE@timidity/libtimidity.la -@USE_TIMIDITY_TRUE@@USE_MIKMOD_FALSE@libSDLmixer_la_DEPENDENCIES = \ +@USE_TIMIDITY_TRUE@@USE_MIKMOD_FALSE@libSDL_mixer_la_DEPENDENCIES = \ @USE_TIMIDITY_TRUE@@USE_MIKMOD_FALSE@timidity/libtimidity.la -@USE_TIMIDITY_FALSE@@USE_MIKMOD_TRUE@libSDLmixer_la_DEPENDENCIES = \ +@USE_TIMIDITY_FALSE@@USE_MIKMOD_TRUE@libSDL_mixer_la_DEPENDENCIES = \ @USE_TIMIDITY_FALSE@@USE_MIKMOD_TRUE@mikmod/libmikmod.la -libSDLmixer_la_OBJECTS = mixer.lo music.lo music_cmd.lo wavestream.lo +libSDL_mixer_la_OBJECTS = mixer.lo music.lo music_cmd.lo wavestream.lo PROGRAMS = $(bin_PROGRAMS) playwave_SOURCES = playwave.c playwave_OBJECTS = playwave.o -playwave_DEPENDENCIES = libSDLmixer.la +playwave_DEPENDENCIES = libSDL_mixer.la playwave_LDFLAGS = playmus_SOURCES = playmus.c playmus_OBJECTS = playmus.o -playmus_DEPENDENCIES = libSDLmixer.la +playmus_DEPENDENCIES = libSDL_mixer.la playmus_LDFLAGS = CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -HEADERS = $(libSDLmixerinclude_HEADERS) +HEADERS = $(libSDL_mixerinclude_HEADERS) DIST_COMMON = README COPYING Makefile.am Makefile.in acinclude.m4 \ aclocal.m4 config.guess config.sub configure configure.in install-sh \ @@ -159,8 +158,8 @@ TAR = gtar GZIP_ENV = --best DEP_FILES = .deps/mixer.P .deps/music.P .deps/music_cmd.P \ .deps/playmus.P .deps/playwave.P .deps/wavestream.P -SOURCES = $(libSDLmixer_la_SOURCES) playwave.c playmus.c -OBJECTS = $(libSDLmixer_la_OBJECTS) playwave.o playmus.o +SOURCES = $(libSDL_mixer_la_SOURCES) playwave.c playmus.c +OBJECTS = $(libSDL_mixer_la_OBJECTS) playwave.o playmus.o all: all-redirect .SUFFIXES: @@ -237,8 +236,8 @@ distclean-libtool: maintainer-clean-libtool: -libSDLmixer.la: $(libSDLmixer_la_OBJECTS) $(libSDLmixer_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libSDLmixer_la_LDFLAGS) $(libSDLmixer_la_OBJECTS) $(libSDLmixer_la_LIBADD) $(LIBS) +libSDL_mixer.la: $(libSDL_mixer_la_OBJECTS) $(libSDL_mixer_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(libSDL_mixer_la_LDFLAGS) $(libSDL_mixer_la_OBJECTS) $(libSDL_mixer_la_LIBADD) $(LIBS) mostlyclean-binPROGRAMS: @@ -254,8 +253,8 @@ install-binPROGRAMS: $(bin_PROGRAMS) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done @@ -273,19 +272,19 @@ playmus: $(playmus_OBJECTS) $(playmus_DEPENDENCIES) @rm -f playmus $(LINK) $(playmus_LDFLAGS) $(playmus_OBJECTS) $(playmus_LDADD) $(LIBS) -install-libSDLmixerincludeHEADERS: $(libSDLmixerinclude_HEADERS) +install-libSDL_mixerincludeHEADERS: $(libSDL_mixerinclude_HEADERS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(libSDLmixerincludedir) - @list='$(libSDLmixerinclude_HEADERS)'; for p in $$list; do \ + $(mkinstalldirs) $(DESTDIR)$(libSDL_mixerincludedir) + @list='$(libSDL_mixerinclude_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libSDLmixerincludedir)/$$p"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libSDLmixerincludedir)/$$p; \ + echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libSDL_mixerincludedir)/$$p"; \ + $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libSDL_mixerincludedir)/$$p; \ done -uninstall-libSDLmixerincludeHEADERS: +uninstall-libSDL_mixerincludeHEADERS: @$(NORMAL_UNINSTALL) - list='$(libSDLmixerinclude_HEADERS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(libSDLmixerincludedir)/$$p; \ + list='$(libSDL_mixerinclude_HEADERS)'; for p in $$list; do \ + rm -f $(DESTDIR)$(libSDL_mixerincludedir)/$$p; \ done # This directory's subdirectories are mostly independent; you can cd @@ -423,7 +422,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -483,23 +482,23 @@ installcheck: installcheck-recursive install-exec-am: install-libLTLIBRARIES install-binPROGRAMS install-exec: install-exec-recursive -install-data-am: install-libSDLmixerincludeHEADERS +install-data-am: install-libSDL_mixerincludeHEADERS install-data: install-data-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-recursive uninstall-am: uninstall-libLTLIBRARIES uninstall-binPROGRAMS \ - uninstall-libSDLmixerincludeHEADERS + uninstall-libSDL_mixerincludeHEADERS uninstall: uninstall-recursive all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) all-redirect: all-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: installdirs-recursive installdirs-am: $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \ - $(DESTDIR)$(libSDLmixerincludedir) + $(DESTDIR)$(libSDL_mixerincludedir) mostlyclean-generic: @@ -549,8 +548,8 @@ distclean-compile clean-compile maintainer-clean-compile \ mostlyclean-libtool distclean-libtool clean-libtool \ maintainer-clean-libtool mostlyclean-binPROGRAMS distclean-binPROGRAMS \ clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \ -install-binPROGRAMS uninstall-libSDLmixerincludeHEADERS \ -install-libSDLmixerincludeHEADERS install-data-recursive \ +install-binPROGRAMS uninstall-libSDL_mixerincludeHEADERS \ +install-libSDL_mixerincludeHEADERS install-data-recursive \ uninstall-data-recursive install-exec-recursive \ uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ all-recursive check-recursive installcheck-recursive info-recursive \ diff --git a/aclocal.m4 b/aclocal.m4 index c8491685..dbf8fc07 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4a +dnl aclocal.m4 generated automatically by aclocal 1.4 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation @@ -627,8 +627,6 @@ dnl AM_INIT_AUTOMAKE(package,version, [no-define]) AC_DEFUN(AM_INIT_AUTOMAKE, [AC_REQUIRE([AC_PROG_INSTALL]) -dnl We require 2.13 because we rely on SHELL being computed by configure. -AC_PREREQ([2.13]) PACKAGE=[$1] AC_SUBST(PACKAGE) VERSION=[$2] diff --git a/configure b/configure index edf2263d..cfdc420e 100755 --- a/configure +++ b/configure @@ -752,8 +752,7 @@ else fi - -PACKAGE=SDLmixer +PACKAGE=SDL_mixer VERSION=$VERSION @@ -772,7 +771,7 @@ EOF missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:776: checking for working aclocal" >&5 +echo "configure:775: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -785,7 +784,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:789: checking for working autoconf" >&5 +echo "configure:788: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -798,7 +797,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:802: checking for working automake" >&5 +echo "configure:801: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -811,7 +810,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:815: checking for working autoheader" >&5 +echo "configure:814: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -824,7 +823,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:828: checking for working makeinfo" >&5 +echo "configure:827: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -840,7 +839,7 @@ fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:844: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:843: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -869,7 +868,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:873: checking for $ac_word" >&5 +echo "configure:872: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -899,7 +898,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:903: checking for $ac_word" >&5 +echo "configure:902: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -950,7 +949,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:954: checking for $ac_word" >&5 +echo "configure:953: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -982,7 +981,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:986: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:985: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -993,12 +992,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 997 "configure" +#line 996 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1024,12 +1023,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1028: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1027: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1033: checking whether we are using GNU C" >&5 +echo "configure:1032: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1038,7 +1037,7 @@ else yes; #endif EOF -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 +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 ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1057,7 +1056,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1061: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1060: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1165,7 +1164,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1169: checking host system type" >&5 +echo "configure:1168: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1186,7 +1185,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1190: checking build system type" >&5 +echo "configure:1189: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1215,7 +1214,7 @@ ac_prog=ld if test "$ac_cv_prog_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1219: checking for ld used by GCC" >&5 +echo "configure:1218: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1245,10 +1244,10 @@ echo "configure:1219: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1249: checking for GNU ld" >&5 +echo "configure:1248: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1252: checking for non-GNU ld" >&5 +echo "configure:1251: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1284,7 +1283,7 @@ fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1288: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1287: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1300,7 +1299,7 @@ echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1304: checking for BSD-compatible nm" >&5 +echo "configure:1303: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1337,7 +1336,7 @@ echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1341: checking whether ln -s works" >&5 +echo "configure:1340: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1367,7 +1366,7 @@ fi # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1371: checking for $ac_word" >&5 +echo "configure:1370: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1399,7 +1398,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1403: checking for $ac_word" >&5 +echo "configure:1402: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1466,8 +1465,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case "$host" in *-*-irix6*) # Find out which ABI we are using. - echo '#line 1470 "configure"' > conftest.$ac_ext - if { (eval echo configure:1471: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 1469 "configure"' > conftest.$ac_ext + if { (eval echo configure:1470: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) LD="${LD-ld} -32" @@ -1488,19 +1487,19 @@ case "$host" in SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:1492: checking whether the C compiler needs -belf" >&5 +echo "configure:1491: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -1523,7 +1522,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1527: checking for $ac_word" >&5 +echo "configure:1526: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1555,7 +1554,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1559: checking for $ac_word" >&5 +echo "configure:1558: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1590,7 +1589,7 @@ fi # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1594: checking for $ac_word" >&5 +echo "configure:1593: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1622,7 +1621,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1626: checking for $ac_word" >&5 +echo "configure:1625: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1657,7 +1656,7 @@ fi # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1661: checking for $ac_word" >&5 +echo "configure:1660: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1689,7 +1688,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1693: checking for $ac_word" >&5 +echo "configure:1692: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1725,19 +1724,19 @@ fi # recent cygwin and mingw systems supply a stub DllMain which the user # can override, but on older systems we have to supply one echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6 -echo "configure:1729: checking if libtool should supply DllMain function" >&5 +echo "configure:1728: checking if libtool should supply DllMain function" >&5 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_need_dllmain=yes else @@ -1762,19 +1761,19 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6 SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -mdll" echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6 -echo "configure:1766: checking how to link DLLs" >&5 +echo "configure:1765: checking how to link DLLs" >&5 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_dll_switch=-mdll else @@ -1884,7 +1883,7 @@ exec 5>>./config.log # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1888: checking for a BSD compatible install" >&5 +echo "configure:1887: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1938,7 +1937,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:1942: checking target system type" >&5 +echo "configure:1941: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -2003,7 +2002,7 @@ fi # Extract the first word of "sdl-config", so it can be a program name with args. set dummy sdl-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2007: checking for $ac_word" >&5 +echo "configure:2006: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SDL_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2038,7 +2037,7 @@ fi min_sdl_version=$SDL_VERSION echo $ac_n "checking for SDL - version >= $min_sdl_version""... $ac_c" 1>&6 -echo "configure:2042: checking for SDL - version >= $min_sdl_version" >&5 +echo "configure:2041: checking for SDL - version >= $min_sdl_version" >&5 no_sdl="" if test "$SDL_CONFIG" = "no" ; then no_sdl=yes @@ -2062,7 +2061,7 @@ echo "configure:2042: checking for SDL - version >= $min_sdl_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -2120,7 +2119,7 @@ int main () EOF -if { (eval echo configure:2124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2154,7 +2153,7 @@ fi CFLAGS="$CFLAGS $SDL_CFLAGS" LIBS="$LIBS $SDL_LIBS" cat > conftest.$ac_ext < @@ -2164,7 +2163,7 @@ int main() { return 0; ; return 0; } EOF -if { (eval echo configure:2168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding SDL or finding the wrong" @@ -2257,10 +2256,10 @@ fi if test x$enable_music_mp3 = xyes; then echo $ac_n "checking for SMPEG headers and libraries""... $ac_c" 1>&6 -echo "configure:2261: checking for SMPEG headers and libraries" >&5 +echo "configure:2260: checking for SMPEG headers and libraries" >&5 have_smpeg=no cat > conftest.$ac_ext < @@ -2270,7 +2269,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2274: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2273: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_smpeg=yes diff --git a/configure.in b/configure.in index b7816415..e554ae91 100644 --- a/configure.in +++ b/configure.in @@ -37,7 +37,7 @@ AC_SUBST(LT_REVISION) AC_SUBST(LT_AGE) dnl Setup for automake -AM_INIT_AUTOMAKE(SDLmixer, $VERSION) +AM_INIT_AUTOMAKE(SDL_mixer, $VERSION) dnl Check for tools diff --git a/mikmod/Makefile.in b/mikmod/Makefile.in index 769e835f..bfd914bb 100644 --- a/mikmod/Makefile.in +++ b/mikmod/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4a from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -46,10 +46,9 @@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_FLAG = transform = @program_transform_name@ NORMAL_INSTALL = : @@ -225,7 +224,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -286,7 +285,7 @@ uninstall: uninstall-am all-am: Makefile $(LTLIBRARIES) all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: diff --git a/timidity/Makefile.in b/timidity/Makefile.in index 46645f3b..c8954945 100644 --- a/timidity/Makefile.in +++ b/timidity/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4a from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -46,10 +46,9 @@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_FLAG = transform = @program_transform_name@ NORMAL_INSTALL = : @@ -222,7 +221,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -283,7 +282,7 @@ uninstall: uninstall-am all-am: Makefile $(LTLIBRARIES) all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: