--- a/configure.in	Thu Jan 25 03:51:01 2007 +0000
+++ b/configure.in	Thu Jan 25 05:58:05 2007 +0000
@@ -2,8 +2,8 @@
 dnl *** Process this file with autoconf to produce a configure script.
 dnl ***
 
-dnl Require autoconf 2.56 or later
-AC_PREREQ([2.56])
+dnl Require autoconf 2.60 or later
+AC_PREREQ([2.60])
 
 dnl Initialize
 AC_INIT([XMMS-SID], [0.8.0beta16], [ccr@tnsp.org])
@@ -25,7 +25,6 @@
 AH_TEMPLATE([HAVE_RESID_BUILDER],[Define if you have reSID with libSIDPlay 2])
 AH_TEMPLATE([HAVE_HARDSID_BUILDER],[Define if you have HardSID with libSIDPlay 2])
 AH_TEMPLATE([HAVE_THEMETUNE],[Define if you want to build code to play XMMS-SID theme SID-tune. The tune needs to be installed too, though.])
-AH_TEMPLATE([THEMETUNE_FILE],[Path and filename of the XMMS-SID theme song])
 
 
 dnl ***
@@ -96,29 +95,8 @@
 		OPT_THEMETUNE=no
 	fi
 fi
-],[
-OPT_THEMETUNE=yes
-])
-
-dnl *** Bits and pieces stolen from Glade generated configure.in
-if test "x$OPT_THEMETUNE" = "xyes"; then
-	THEMETUNE_FILE="Kummatti_City.sid"
-
-	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}")
-		else
-			AC_DEFINE_UNQUOTED([THEMETUNE_FILE], "${prefix}/share/${PACKAGE}/${THEMETUNE_FILE}")
-		fi
-	else
-		AC_DEFINE_UNQUOTED([THEMETUNE_FILE], "${datadir}/${PACKAGE}/${THEMETUNE_FILE}")
-	fi
-
-	AC_DEFINE([HAVE_THEMETUNE])
-else
-	THEMETUNE_FILE=""
-fi
-dnl AC_SUBST([THEMETUNE_FILE])
+],[OPT_THEMETUNE=yes])
+AC_DEFINE([HAVE_THEMETUNE],[test "x$OPT_THEMETUNE" = "xyes"])
 
 
 dnl ***
@@ -310,4 +288,5 @@
 	libSIDPlay 2 support          : $OPT_SIDPLAY2
 		Included builders     : $xs_builders
 	XMMS-SID theme SID-tune       : $OPT_THEMETUNE
+	Translations (i18n/nls)       : $USE_NLS
 ])