--- a/configure.in	Tue Jul 02 03:57:48 2002 +0000
+++ b/configure.in	Tue Jul 02 03:58:24 2002 +0000
@@ -54,7 +54,7 @@
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LN_S
-AC_PROG_LIBTOOL
+AM_PROG_LIBTOOL
 
 
 dnl ---------------------------------------------------------------------
@@ -86,7 +86,7 @@
 SDL_VERSION=1.2.0
 AM_PATH_SDL($SDL_VERSION,
             :,
-	    AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])
+ 	     AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])
 )
 CFLAGS="$CFLAGS $SDL_CFLAGS"
 LIBS="$LIBS $SDL_LIBS"
@@ -150,25 +150,31 @@
   AC_DEFINE(SOUND_SUPPORTS_MIDI)
 fi
 
+dnl Hooray for shitty autoconf bugs!
+x="C__stream_decoder_new"
+flcsym="FLA$x"
 dnl Check for libFLAC
 AC_ARG_ENABLE(flac,
 [  --enable-flac              enable FLAC decoding via libFLAC [default=yes]],
               , enable_flac=yes)
 if test x$enable_flac = xyes; then
   AC_CHECK_HEADER(FLAC/stream_decoder.h, have_flac_hdr=yes)
-  AC_CHECK_LIB(FLAC, FLAC__stream_decoder_new, have_flac_lib=yes)
+  AC_CHECK_LIB(FLAC, $flcsym, have_flac_lib=yes)
   if test x$have_flac_hdr = xyes -a x$have_flac_lib = xyes; then
     LIBS="$LIBS -lFLAC"
     AC_DEFINE(SOUND_SUPPORTS_FLAC)
   fi
 fi
 
+dnl Hooray for shitty autoconf bugs!
+x="C__seekable_stream_decoder_new"
+flcsym="FLA$x"
 dnl Check if libFLAC is recent enough for a seekable decoder
 AC_ARG_ENABLE(seekable-flac,
 [  --enable-seekable-flac     enable the seekable decoder [default=yes]],
               , enable_seekable_flac=yes)
 if test x$enable_seekable_flac = xyes; then
-  AC_CHECK_LIB(FLAC, FLAC__seekable_stream_decoder_new, have_seekable_flac_lib=yes)
+  AC_CHECK_LIB(FLAC, $flcsym, have_seekable_flac_lib=yes)
   if test x$have_flac_hdr = xyes -a x$have_seekable_flac_lib = xyes; then
     AC_DEFINE(SOUND_SUPPORTS_SEEKABLE_FLAC)
   fi
@@ -270,7 +276,7 @@
 
 # Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([stdlib.h string.h])
+AC_CHECK_HEADERS([stdlib.h string.h signal.h assert.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -281,8 +287,9 @@
 # This is only in the bleeding edge autoconf distro...
 #AC_FUNC_MALLOC
 
+
 AC_FUNC_MEMCMP
-AC_CHECK_FUNCS([memset strrchr])
+AC_CHECK_FUNCS([memset strrchr setbuf])
 
 dnl Add Makefile conditionals
 AM_CONDITIONAL(USE_TIMIDITY, test x$enable_midi = xyes)