--- a/autogen.sh	Wed Jun 04 13:44:05 2003 +0000
+++ b/autogen.sh	Wed Jun 04 13:45:05 2003 +0000
@@ -9,7 +9,7 @@
 
 # Touch the timestamps on all the files since CVS messes them up
 directory=`dirname $0`
-touch $directory/configure.ac
+touch $directory/configure.in
 
 # Regenerate configuration files
 echo "* aclocal"

--- a/configure.in	Wed Jun 04 13:44:05 2003 +0000
+++ b/configure.in	Wed Jun 04 13:45:05 2003 +0000
@@ -2,8 +2,16 @@
 dnl *** Process this file with autoconf to produce a configure script.
 dnl ***
 
-AC_INIT(README)
-AM_INIT_AUTOMAKE(xmms-sid, 0.7.4)
+dnl Require autoconf 2.54 or later
+AC_PREREQ(2.54)
+
+dnl Initialize
+AC_INIT(xmms-sid, 0.8.0rc1, ccr@tnsp.org)
+AC_COPYRIGHT([[(C) 2002 Michael Schwendt, Matti 'ccr' Hämäläinen]])
+AC_CONFIG_SRCDIR(src/xmms-sid.h)
+AM_INIT_AUTOMAKE
+AC_CONFIG_HEADERS(config.h)
+
 
 dnl ***
 dnl *** Some general checks
@@ -18,54 +26,88 @@
 dnl ***
 AC_PROG_CC
 AC_PROG_CXX
-AC_PROG_CPP
+dnl AC_PROG_CPP
 AC_PROG_INSTALL
 AC_HEADER_STDC
 
-AC_PATH_LIBSIDPLAY
 
-AM_PATH_XMMS(1.2.0, [
-# Check if the libdir has been set by user
-#if test "x$libdir" = "x$exec_prefix/lib"; then
-	libdir=$XMMS_INPUT_PLUGIN_DIR
-#fi
-], 
-AC_MSG_ERROR([*** XMMS >= 1.2.0 not found. You need XMMS v1.2.0 or later to use XMMS-SID plugin.]
-))
+dnl ***
+dnl *** Checks for libraries
+dnl ***
+AC_PATH_LIBSIDPLAY
+dnl AC_PATH_LIBSIDPLAY2
 
+AM_PATH_GLIB(1.2.8,,AC_MSG_ERROR([*** GLIB >= 1.2.8 not found. You either don't have GLIB at all or your GLIB is too old. Latest GLIB can be found from Gtk+ homepages (http://www.gtk.org/)]))
+
+AM_PATH_GTK(1.2.8,,AC_MSG_ERROR([*** Gtk+ >= 1.2.8 not found. You either don't have Gtk+ at all or your Gtk+ is too old. Latest Gtk+ can be found from Gtk+ homepages (http://www.gtk.org/)]), gthread)
 
 
 dnl ***
-dnl *** Checks for libraries.
+dnl *** Check XMMS version
 dnl ***
-AM_PATH_GLIB(1.2.2,,AC_MSG_ERROR([*** GLIB >= 1.2.2 not found. You either don't have GLIB at all or your GLIB is too old. Latest GLIB can be found from Gtk+ homepages (http://www.gtk.org/)]))
+AM_PATH_XMMS(1.2.0,, [
+AC_MSG_ERROR([*** XMMS >= 1.2.0 not found. You need XMMS v1.2.0 or later to use XMMS-SID plugin.])
+])
+libdir=$XMMS_INPUT_PLUGIN_DIR
 
-AM_PATH_GTK(1.2.2,,AC_MSG_ERROR([*** Gtk+ >= 1.2.2 not found. You either don't have Gtk+ at all or your Gtk+ is too old. Latest Gtk+ can be found from Gtk+ homepages (http://www.gtk.org/)]), gthread)
+XMMS_TEST_VERSION($XMMS_VERSION, 1.2.5, [
+AC_DEFINE(HAVE_XMMSEXTRA)
+OPT_XMMSEXTRA="yes"
+], [
+OPT_XMMSEXTRA="no"
+])
 
 
 dnl ***
-dnl *** Song position patch check
+dnl *** Check for optional settings
 dnl ***
-AC_MSG_CHECKING([for song position patch])
-dnl botte hack
-tmp_CPPFLAGS=$CPPFLAGS
-if test -d "$prefix" ;then
-  CPPFLAGS="$CPPFLAGS -I${prefix}/include"
+OPT_SUBSONGSEL="yes"
+
+AC_ARG_ENABLE(subsongsel,
+[
+XMMS-SID specific options:
+  --disable-subsongsel		Disable SIDAmp-style sub-song selector],
+[
+OPT_SUBSONGSEL="yes"
+], [
+OPT_SUBSONGSEL="no"
+])
+
+if test $OPT_SUBSONGSEL = "yes"; then
+AC_DEFINE(USE_SUBSONGSEL)
 fi
 
-AC_EGREP_HEADER(set_song_position,xmms/plugin.h,
-	AC_DEFINE(HAVE_SONG_POSITION)
-	AC_MSG_RESULT(yes),AC_MSG_RESULT(no))
 
-CPPFLAGS=$tmp_CPPFLAGS
+dnl ***
+dnl *** Define some templates
+dnl ***
+AC_DEFINE(USE_SUBSONGSEL, 0, Define to 1 if user wants to use SIDAmp-style sub-song selector)
+AC_DEFINE(HAVE_XMMSEXTRA, 0, Define to 1 if you have XMMS version 1.2.5 or later)
 
 
 dnl ***
 dnl *** And finally, output the all generatable files!
 dnl ***
-
-AC_OUTPUT([
+AC_CONFIG_FILES([
 Makefile
 src/Makefile
-dnl xmms-sid.spec
+xmms-sid.spec
 ])
+
+AC_OUTPUT
+
+
+dnl ***
+dnl *** Show the result message
+dnl ***
+AC_MSG_RESULT([
+	XMMS-SID has been configured successfully:
+
+	Installation directory        : $libdir
+	Sub-song selector enabled     : $OPT_SUBSONGSEL
+	XMMS >= v1.2.5 extra features : $OPT_XMMSEXTRA
+	libSIDPlay 1                  : $have_sidplay
+	libSIDPlay 2                  : $have_sidplay2
+
+	Now just run 'make && make install'!
+])