# HG changeset patch
# User fingolfin
# Date 1002111934 0
# Node ID 6d9fdec2f708e89169dc6631092764220548cfae
# Parent  3f0beddfd9c9f60a301cabbc114458a0f6eaf822
added config.h, added --enable-debug flag, various other changes to the build system

diff -r 3f0beddfd9c9 -r 6d9fdec2f708 SDL_sound_internal.h
--- a/SDL_sound_internal.h	Tue Oct 02 17:54:16 2001 +0000
+++ b/SDL_sound_internal.h	Wed Oct 03 12:25:34 2001 +0000
@@ -33,6 +33,10 @@
 #error Do not include this header from your applications.
 #endif
 
+#if HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include "SDL.h"
 
 #if (defined DEBUG_CHATTER)
diff -r 3f0beddfd9c9 -r 6d9fdec2f708 acconfig.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/acconfig.h	Wed Oct 03 12:25:34 2001 +0000
@@ -0,0 +1,11 @@
+
+#undef DEBUG
+#undef NDEBUG
+#undef SOUND_SUPPORTS_AIFF
+#undef SOUND_SUPPORTS_MOD
+#undef SOUND_SUPPORTS_MP3
+#undef SOUND_SUPPORTS_OGG
+#undef SOUND_SUPPORTS_RAW
+#undef SOUND_SUPPORTS_SHN
+#undef SOUND_SUPPORTS_VOC
+#undef SOUND_SUPPORTS_WAV
diff -r 3f0beddfd9c9 -r 6d9fdec2f708 bootstrap
--- a/bootstrap	Tue Oct 02 17:54:16 2001 +0000
+++ b/bootstrap	Wed Oct 03 12:25:34 2001 +0000
@@ -2,10 +2,7 @@
 
 aclocal
 libtoolize --automake --copy --force
-
-# rcg09252001 (I ain't got a --force option...?)
-#automake --foreign --add-missing --copy --force
-
+autoheader
 automake --foreign --add-missing --copy
 autoconf
 
diff -r 3f0beddfd9c9 -r 6d9fdec2f708 configure.in
--- a/configure.in	Tue Oct 02 17:54:16 2001 +0000
+++ b/configure.in	Wed Oct 03 12:25:34 2001 +0000
@@ -43,6 +43,7 @@
 AC_CANONICAL_TARGET
 
 dnl Setup for automake
+AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(SDL_sound, $VERSION)
 
 
@@ -57,6 +58,25 @@
 
 
 dnl ---------------------------------------------------------------------
+dnl Debug mode?
+dnl ---------------------------------------------------------------------
+
+AC_ARG_ENABLE(debug,
+[  --enable-debug             enable debug mode [default=no]],
+              , enable_smpeg=no)
+if test x$enable_debug = xyes; then
+  if test x$ac_cv_prog_cc_g = xyes; then
+    CFLAGS="-g -O0"
+  else
+    CFLAGS="-O0"
+  fi
+  AC_DEFINE(DEBUG)
+else
+  AC_DEFINE(NDEBUG)
+fi
+
+
+dnl ---------------------------------------------------------------------
 dnl Checks for libraries.
 dnl ---------------------------------------------------------------------
 
diff -r 3f0beddfd9c9 -r 6d9fdec2f708 decoders/aiff.c
--- a/decoders/aiff.c	Tue Oct 02 17:54:16 2001 +0000
+++ b/decoders/aiff.c	Wed Oct 03 12:25:34 2001 +0000
@@ -43,6 +43,9 @@
 
 #ifdef SOUND_SUPPORTS_AIFF
 
+#define __SDL_SOUND_INTERNAL__
+#include "SDL_sound_internal.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -52,9 +55,6 @@
 #include "SDL_endian.h"
 #include "SDL_sound.h"
 
-#define __SDL_SOUND_INTERNAL__
-#include "SDL_sound_internal.h"
-
 static int AIFF_init(void);
 static void AIFF_quit(void);
 static int AIFF_open(Sound_Sample *sample, const char *ext);
diff -r 3f0beddfd9c9 -r 6d9fdec2f708 decoders/mod.c
--- a/decoders/mod.c	Tue Oct 02 17:54:16 2001 +0000
+++ b/decoders/mod.c	Wed Oct 03 12:25:34 2001 +0000
@@ -30,6 +30,9 @@
 
 #ifdef SOUND_SUPPORTS_MOD
 
+#define __SDL_SOUND_INTERNAL__
+#include "SDL_sound_internal.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -37,8 +40,6 @@
 #include "SDL_sound.h"
 #include "mikmod.h"
 
-#define __SDL_SOUND_INTERNAL__
-#include "SDL_sound_internal.h"
 
 static int MOD_init(void);
 static void MOD_quit(void);
diff -r 3f0beddfd9c9 -r 6d9fdec2f708 decoders/mp3.c
--- a/decoders/mp3.c	Tue Oct 02 17:54:16 2001 +0000
+++ b/decoders/mp3.c	Wed Oct 03 12:25:34 2001 +0000
@@ -31,6 +31,9 @@
 
 #ifdef SOUND_SUPPORTS_MP3
 
+#define __SDL_SOUND_INTERNAL__
+#include "SDL_sound_internal.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -40,9 +43,6 @@
 #include "SDL_sound.h"
 #include "extra_rwops.h"
 
-#define __SDL_SOUND_INTERNAL__
-#include "SDL_sound_internal.h"
-
 
 static int MP3_init(void);
 static void MP3_quit(void);
diff -r 3f0beddfd9c9 -r 6d9fdec2f708 decoders/ogg.c
--- a/decoders/ogg.c	Tue Oct 02 17:54:16 2001 +0000
+++ b/decoders/ogg.c	Wed Oct 03 12:25:34 2001 +0000
@@ -34,6 +34,9 @@
 
 #ifdef SOUND_SUPPORTS_OGG
 
+#define __SDL_SOUND_INTERNAL__
+#include "SDL_sound_internal.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -41,11 +44,8 @@
 #include <assert.h>
 #include "vorbis/codec.h"
 #include "vorbis/vorbisfile.h"
-
 #include "SDL_sound.h"
 
-#define __SDL_SOUND_INTERNAL__
-#include "SDL_sound_internal.h"
 
 static int OGG_init(void);
 static void OGG_quit(void);
diff -r 3f0beddfd9c9 -r 6d9fdec2f708 decoders/raw.c
--- a/decoders/raw.c	Tue Oct 02 17:54:16 2001 +0000
+++ b/decoders/raw.c	Wed Oct 03 12:25:34 2001 +0000
@@ -40,15 +40,15 @@
 
 #ifdef SOUND_SUPPORTS_RAW
 
+#define __SDL_SOUND_INTERNAL__
+#include "SDL_sound_internal.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 #include "SDL_sound.h"
 
-#define __SDL_SOUND_INTERNAL__
-#include "SDL_sound_internal.h"
-
 
 static int RAW_init(void);
 static void RAW_quit(void);
diff -r 3f0beddfd9c9 -r 6d9fdec2f708 decoders/shn.c
--- a/decoders/shn.c	Tue Oct 02 17:54:16 2001 +0000
+++ b/decoders/shn.c	Wed Oct 03 12:25:34 2001 +0000
@@ -43,14 +43,15 @@
 
 #if (defined SOUND_SUPPORTS_SHN)
 
+#define __SDL_SOUND_INTERNAL__
+#include "SDL_sound_internal.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 #include "SDL_sound.h"
 
-#define __SDL_SOUND_INTERNAL__
-#include "SDL_sound_internal.h"
 
 static int SHN_init(void);
 static void SHN_quit(void);
diff -r 3f0beddfd9c9 -r 6d9fdec2f708 decoders/skeleton.c
--- a/decoders/skeleton.c	Tue Oct 02 17:54:16 2001 +0000
+++ b/decoders/skeleton.c	Wed Oct 03 12:25:34 2001 +0000
@@ -31,15 +31,15 @@
 
 #ifdef SOUND_SUPPORTS_FMT
 
+#define __SDL_SOUND_INTERNAL__
+#include "SDL_sound_internal.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 #include "SDL_sound.h"
 
-#define __SDL_SOUND_INTERNAL__
-#include "SDL_sound_internal.h"
-
 
 static int FMT_init(void);
 static void FMT_quit(void);
diff -r 3f0beddfd9c9 -r 6d9fdec2f708 decoders/voc.c
--- a/decoders/voc.c	Tue Oct 02 17:54:16 2001 +0000
+++ b/decoders/voc.c	Wed Oct 03 12:25:34 2001 +0000
@@ -39,15 +39,15 @@
 
 #if (defined SOUND_SUPPORTS_VOC)
 
+#define __SDL_SOUND_INTERNAL__
+#include "SDL_sound_internal.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 #include "SDL_sound.h"
 
-#define __SDL_SOUND_INTERNAL__
-#include "SDL_sound_internal.h"
-
 static int VOC_init(void);
 static void VOC_quit(void);
 static int VOC_open(Sound_Sample *sample, const char *ext);
diff -r 3f0beddfd9c9 -r 6d9fdec2f708 decoders/wav.c
--- a/decoders/wav.c	Tue Oct 02 17:54:16 2001 +0000
+++ b/decoders/wav.c	Wed Oct 03 12:25:34 2001 +0000
@@ -30,15 +30,15 @@
 
 #ifdef SOUND_SUPPORTS_WAV
 
+#define __SDL_SOUND_INTERNAL__
+#include "SDL_sound_internal.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 #include "SDL_sound.h"
 
-#define __SDL_SOUND_INTERNAL__
-#include "SDL_sound_internal.h"
-
 static int WAV_init(void);
 static void WAV_quit(void);
 static int WAV_open(Sound_Sample *sample, const char *ext);