--- a/configure.in	Sat Jan 06 11:05:05 2007 +0000
+++ b/configure.in	Sun Jan 07 09:47:03 2007 +0000
@@ -7,7 +7,7 @@
 
 dnl Initialize
 AC_INIT([XMMS-SID], [0.8.0beta16], [ccr@tnsp.org])
-AC_COPYRIGHT([[(C) 2003-2006 Matti 'ccr' Hämäläinen]])
+AC_COPYRIGHT([[(C) 2003-2007 Matti 'ccr' Hämäläinen]])
 AC_CONFIG_SRCDIR([src/xmms-sid.h])
 AM_INIT_AUTOMAKE
 AC_CONFIG_HEADERS([src/config.h])
@@ -81,20 +81,19 @@
 dnl ***
 dnl *** Enable or disable themetune support/installation
 dnl ***
-AC_ARG_ENABLE(themetune,
+AC_ARG_ENABLE([themetune],
 [
   --disable-themetune   Disable XMMS-SID theme song-related code and
                         installation of the SID-tune file. The tune is
                         not under GNU GPL, refer to README for license.
-],
-[
+],[
 if test "x$enableval" = "xyes"; then
-OPT_THEMETUNE=yes
+	OPT_THEMETUNE=yes
 else
-if test "x$enableval" = "xno"; then
-	OPT_THEMETUNE=no
+	if test "x$enableval" = "xno"; then
+		OPT_THEMETUNE=no
 	else
-	OPT_THEMETUNE=no
+		OPT_THEMETUNE=no
 	fi
 fi
 ],[
@@ -107,19 +106,19 @@
 
 	if test "x${datadir}" = 'x${prefix}/share'; then
 		if test "x${prefix}" = "xNONE"; then
-		AC_DEFINE_UNQUOTED([THEMETUNE_FILE], "${ac_default_prefix}/share/${PACKAGE}/${THEMETUNE_FILE}")
+			AC_DEFINE_UNQUOTED([THEMETUNE_FILE], "${ac_default_prefix}/share/${PACKAGE}/${THEMETUNE_FILE}")
 		else
-		AC_DEFINE_UNQUOTED([THEMETUNE_FILE], "${prefix}/share/${PACKAGE}/${THEMETUNE_FILE}")
+			AC_DEFINE_UNQUOTED([THEMETUNE_FILE], "${prefix}/share/${PACKAGE}/${THEMETUNE_FILE}")
 		fi
 	else
-	AC_DEFINE_UNQUOTED([THEMETUNE_FILE], "${datadir}/${PACKAGE}/${THEMETUNE_FILE}")
+		AC_DEFINE_UNQUOTED([THEMETUNE_FILE], "${datadir}/${PACKAGE}/${THEMETUNE_FILE}")
 	fi
 
 	AC_DEFINE([HAVE_THEMETUNE])
 else
 	THEMETUNE_FILE=""
 fi
-AC_SUBST([THEMETUNE_FILE])
+dnl AC_SUBST([THEMETUNE_FILE])
 
 
 dnl ***
@@ -134,18 +133,18 @@
 xs_sidplay1_library=""
 xs_sidplay1_includes=""
 else
-if test "x$withval" = "xno"; then
-	xs_sidplay1=no
+	if test "x$withval" = "xno"; then
+		xs_sidplay1=no
 	else
-	xs_sidplay1=yes
-	xs_sidplay1_includes="$withval/include"
-	xs_sidplay1_library="$withval/lib"
+		xs_sidplay1=yes
+		xs_sidplay1_includes="$withval/include"
+		xs_sidplay1_library="$withval/lib"
 	fi
 fi
 ],[
-xs_sidplay1=try
-xs_sidplay1_library=""
-xs_sidplay1_includes=""
+	xs_sidplay1=try
+	xs_sidplay1_library=""
+	xs_sidplay1_includes=""
 ])
 
 
@@ -166,22 +165,22 @@
   --with-sidplay2=PREFIX   Enable SIDPlay2 with install-PREFIX],
 [
 if test "x$withval" = "xyes"; then
-xs_sidplay2=yes
-xs_sidplay2_library=""
-xs_sidplay2_includes=""
+	xs_sidplay2=yes
+	xs_sidplay2_library=""
+	xs_sidplay2_includes=""
 else
-if test "x$withval" = "xno"; then
-	xs_sidplay2=no
+	if test "x$withval" = "xno"; then
+		xs_sidplay2=no
 	else
-	xs_sidplay2=yes
-	xs_sidplay2_includes="$withval/include"
-	xs_sidplay2_library="$withval/lib"
+		xs_sidplay2=yes
+		xs_sidplay2_includes="$withval/include"
+		xs_sidplay2_library="$withval/lib"
 	fi
 fi
 ],[
-xs_sidplay2=try
-xs_sidplay2_library=""
-xs_sidplay2_includes=""
+	xs_sidplay2=try
+	xs_sidplay2_library=""
+	xs_sidplay2_includes=""
 ])
 
 
@@ -201,11 +200,11 @@
 OPT_SIDPLAY1="no"
 if test "x$xs_sidplay1" = "xtry"; then
 	XS_PATH_LIBSIDPLAY1
-	else
+else
 	if test "x$xs_sidplay1" = "xyes"; then
 		XS_PATH_LIBSIDPLAY1
 		if test "x$xs_have_sidplay1" = "xno"; then
-		AC_MSG_ERROR([libSIDPlay1 library and/or headers were not found!])
+			AC_MSG_ERROR([libSIDPlay1 library and/or headers were not found!])
 		fi
 	fi
 fi
@@ -220,11 +219,11 @@
 LIBSIDPLAY2_REQUIRED_VERSION="2.1.0"
 if test "x$xs_sidplay2" = "xtry"; then
 	XS_PATH_LIBSIDPLAY2
-	else
+else
 	if test "x$xs_sidplay2" = "xyes"; then
 		XS_PATH_LIBSIDPLAY2
 		if test "x$xs_have_sidplay2" = "xno"; then
-		AC_MSG_ERROR([libSIDPlay2 library and/or headers were not found!])
+			AC_MSG_ERROR([libSIDPlay2 library and/or headers were not found!])
 		fi
 	fi
 fi
@@ -245,7 +244,7 @@
 dnl ***
 if test "x$OPT_SIDPLAY1" = "xno"; then
 if test "x$OPT_SIDPLAY2" = "xno"; then
-AC_MSG_ERROR([Either libSIDPlay1 or libSIDPlay2 is required! Please read INSTALL for more information!])
+	AC_MSG_ERROR([Either libSIDPlay1 or libSIDPlay2 is required! Please read INSTALL for more information!])
 fi
 fi
 
@@ -261,7 +260,7 @@
 
 AC_EGREP_HEADER([set_song_position],[xmms/plugin.h],[
 OPT_SONGPOS="yes"
-AC_DEFINE(HAVE_SONG_POSITION)
+AC_DEFINE([HAVE_SONG_POSITION])
 AC_MSG_RESULT([yes])
 ],[
 OPT_SONGPOS="no"
@@ -274,16 +273,16 @@
 dnl ***
 dnl *** Check XMMS version
 dnl ***
-AM_PATH_XMMS(1.2.0,, [
+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
 
-XMMS_TEST_VERSION($XMMS_VERSION, 1.2.5, [
-AC_DEFINE(HAVE_XMMSEXTRA)
-OPT_XMMSEXTRA="yes"
+XMMS_TEST_VERSION([$XMMS_VERSION], [1.2.5], [
+	AC_DEFINE([HAVE_XMMSEXTRA])
+	OPT_XMMSEXTRA="yes"
 ], [
-OPT_XMMSEXTRA="no"
+	OPT_XMMSEXTRA="no"
 ])