# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1055043844 0
# Node ID 9cf8092ec7d30a0600d0dcb85eb95882ee04280a
# Parent  13db37492b6d0e6d3c16f18d91549358828e0ba7
More improvements on configuration, updated documentation.


diff -r 13db37492b6d -r 9cf8092ec7d3 Makefile.am
--- a/Makefile.am	Sun Jun 08 03:16:04 2003 +0000
+++ b/Makefile.am	Sun Jun 08 03:44:04 2003 +0000
@@ -9,13 +9,12 @@
 
 # All the rest of the distributed files
 EXTRA_DIST =			\
-	acsidplay.m4		\
 	FAQ			\
 	README.bugreport	\
 	BUGS			\
 	THANKS			\
 	autogen.sh		\
-	xmms-songpos.patch	\
+	bootstrap.sh		\
 	xmms-sid.glade		\
 	xmms-sid.spec.in	\
 	xmms-sid.spec		\
diff -r 13db37492b6d -r 9cf8092ec7d3 README
--- a/README	Sun Jun 08 03:16:04 2003 +0000
+++ b/README	Sun Jun 08 03:44:04 2003 +0000
@@ -23,11 +23,8 @@
 from old Commodore computer programs like games, demos, etc.
 
 For the actual playing, XMMS-SID uses the excellent libsidplay (1|2)
-SID-chip/6502 emulator engine that emulates 6510 CPU and 6581/8580
-Sound Interface Device (SID) chip.
-
-If you are not familiar with the term "SID tune" or "SID" concept
-at all, please read the longer introduction in the FAQ!
+emulator engine that emulates 6510 CPU and 6581/8580 Sound Interface
+Device (SID) chip.
 
 
 Usage
diff -r 13db37492b6d -r 9cf8092ec7d3 THANKS
--- a/THANKS	Sun Jun 08 03:16:04 2003 +0000
+++ b/THANKS	Sun Jun 08 03:44:04 2003 +0000
@@ -8,6 +8,10 @@
 	XMMS-SID would not exist without these guys!
 
 
+Simon White and other libSIDPlay 2 developers
+	Thanks for making my life a nightmare.
+
+
 All the users of XMMS-SID who have contacted me:
 	Thanks for support, bug-reports and ideas!
 
diff -r 13db37492b6d -r 9cf8092ec7d3 configure.in
--- a/configure.in	Sun Jun 08 03:16:04 2003 +0000
+++ b/configure.in	Sun Jun 08 03:44:04 2003 +0000
@@ -115,7 +115,7 @@
 if test "$xs_sidplay1" = yes; then
 XS_PATH_LIBSIDPLAY1
 if test "$xs_have_sidplay1" = yes; then
-AC_DEFINE(ENABLE_SIDPLAY1)
+AC_DEFINE(HAVE_SIDPLAY1)
 OPT_SIDPLAY1="yes"
 else
 AC_MSG_ERROR([libSIDPlay1 library and/or headers were not found!])
@@ -128,10 +128,11 @@
 LIBSIDPLAY2_REQUIRED_VERSION="2.1.0"
 XS_PATH_LIBSIDPLAY2
 if test "$xs_have_sidplay2" = yes; then
-AC_DEFINE(ENABLE_SIDPLAY2)
+AC_DEFINE(HAVE_SIDPLAY2)
 OPT_SIDPLAY2="yes"
 BUILDERS_FIND
 BUILDERS_FIND_RESID
+BUILDERS_FIND_HARDSID
 if test "$builders_available" = no; then
 AC_MSG_ERROR([No builder modules were found in the sidbuilders directory!]);
 fi
@@ -160,7 +161,7 @@
 libdir=$XMMS_INPUT_PLUGIN_DIR
 
 XMMS_TEST_VERSION($XMMS_VERSION, 1.2.5, [
-AC_DEFINE(ENABLE_XMMSEXTRA)
+AC_DEFINE(HAVE_XMMSEXTRA)
 OPT_XMMSEXTRA="yes"
 ], [
 OPT_XMMSEXTRA="no"
@@ -170,9 +171,9 @@
 dnl ***
 dnl *** Define some templates
 dnl ***
-AC_DEFINE(ENABLE_XMMSEXTRA, 0, Define to 1 if you have XMMS version 1.2.5 or later)
-AC_DEFINE(ENABLE_SIDPLAY1, 0, Define to 1 if you want to use libSIDPlay 1)
-AC_DEFINE(ENABLE_SIDPLAY2, 0, Define to 1 if you want to use libSIDPlay 2)
+AC_DEFINE(HAVE_XMMSEXTRA, 0, Define to 1 if you have XMMS version 1.2.5 or later)
+AC_DEFINE(HAVE_SIDPLAY1, 0, Define to 1 if you want to use libSIDPlay 1)
+AC_DEFINE(HAVE_SIDPLAY2, 0, Define to 1 if you want to use libSIDPlay 2)
 AC_DEFINE(HAVE_RESID_BUILDER, 0, Define to 1 if you have reSID with libSIDPlay 2)
 AC_DEFINE(HAVE_HARDSID_BUILDER, 0, Define to 1 if you have HardSID with libSIDPlay 2)