From 94a73ef6c1c0048a9e254c61a19f63c7f4a0cb2b Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@lokigames.com>
Date: Tue, 21 Dec 1999 17:13:05 +0000
Subject: [PATCH] Updated for SDL 1.0.1

---
 Makefile.in         | 13 ++++++-------
 configure           |  2 +-
 configure.in        |  2 +-
 mixer.c             |  4 ++--
 mixer.h             |  6 +++---
 music.c             |  4 ++--
 playmus.c           |  2 +-
 playwave.c          |  2 +-
 timidity/timidity.c |  2 +-
 wavestream.c        |  8 ++++----
 10 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 476aacff..531404d2 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 = :
@@ -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
 
@@ -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 \
@@ -495,7 +494,7 @@ 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) \
diff --git a/configure b/configure
index 6b8cd3e2..9f44b2fb 100755
--- a/configure
+++ b/configure
@@ -1688,7 +1688,7 @@ case "$target" in
         ;;
 esac
 
-SDL_VERSION=1.0.0
+SDL_VERSION=1.0.1
 # Check whether --with-sdl-prefix or --without-sdl-prefix was given.
 if test "${with_sdl_prefix+set}" = set; then
   withval="$with_sdl_prefix"
diff --git a/configure.in b/configure.in
index 45a462bb..d3566021 100644
--- a/configure.in
+++ b/configure.in
@@ -55,7 +55,7 @@ case "$target" in
 esac
 
 dnl Check for SDL
-SDL_VERSION=1.0.0
+SDL_VERSION=1.0.1
 AM_PATH_SDL($SDL_VERSION,
             :,
 	    AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])
diff --git a/mixer.c b/mixer.c
index fc124171..e209a516 100644
--- a/mixer.c
+++ b/mixer.c
@@ -28,8 +28,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <SDL/SDL_mutex.h>
-#include <SDL/SDL_endian.h>
+#include "SDL_mutex.h"
+#include "SDL_endian.h"
 
 #include "mixer.h"
 
diff --git a/mixer.h b/mixer.h
index ad192765..fd93970d 100644
--- a/mixer.h
+++ b/mixer.h
@@ -25,9 +25,9 @@
 #ifndef _MIXER_H_
 #define _MIXER_H_
 
-#include <SDL/SDL_types.h>
-#include <SDL/SDL_rwops.h>
-#include <SDL/SDL_audio.h>
+#include "SDL_types.h"
+#include "SDL_rwops.h"
+#include "SDL_audio.h"
 
 #include <SDL/begin_code.h>
 
diff --git a/music.c b/music.c
index dd2646c4..d2fb41de 100644
--- a/music.c
+++ b/music.c
@@ -24,8 +24,8 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <SDL/SDL_endian.h>
-#include <SDL/SDL_audio.h>
+#include "SDL_endian.h"
+#include "SDL_audio.h"
 
 #include "mixer.h"
 
diff --git a/playmus.c b/playmus.c
index b733182e..e8a63027 100644
--- a/playmus.c
+++ b/playmus.c
@@ -30,7 +30,7 @@
 #include <unistd.h>
 #endif
 
-#include <SDL/SDL.h>
+#include "SDL.h"
 #include "mixer.h"
 
 
diff --git a/playwave.c b/playwave.c
index 3875253a..d4f27488 100644
--- a/playwave.c
+++ b/playwave.c
@@ -30,7 +30,7 @@
 #include <unistd.h>
 #endif
 
-#include <SDL/SDL.h>
+#include "SDL.h"
 #include "mixer.h"
 
 
diff --git a/timidity/timidity.c b/timidity/timidity.c
index ea90f516..af7d3a54 100644
--- a/timidity/timidity.c
+++ b/timidity/timidity.c
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <SDL/SDL.h>
+#include "SDL.h"
 #include "config.h"
 #include "common.h"
 #include "instrum.h"
diff --git a/wavestream.c b/wavestream.c
index e7920834..a2ecfc5c 100644
--- a/wavestream.c
+++ b/wavestream.c
@@ -27,10 +27,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <SDL/SDL_audio.h>
-#include <SDL/SDL_mutex.h>
-#include <SDL/SDL_rwops.h>
-#include <SDL/SDL_endian.h>
+#include "SDL_audio.h"
+#include "SDL_mutex.h"
+#include "SDL_rwops.h"
+#include "SDL_endian.h"
 
 #include "wave.h"
 #include "wavestream.h"