--- a/bootstrap.sh	Wed May 21 02:52:57 2008 +0300
+++ b/bootstrap.sh	Thu May 22 07:26:26 2008 +0300
@@ -66,6 +66,12 @@
 	fi
 done
 
+for i in m4 unix; do
+	if test -d "$i"; then
+		aclocal_opts="$aclocal_opts -I $i"
+	fi
+done
+
 # Check if gettext is used
 for i in configure.ac configure.in; do
 	if test -f "$i"; then

--- a/src/config.h.in	Wed May 21 02:52:57 2008 +0300
+++ b/src/config.h.in	Thu May 22 07:26:26 2008 +0300
@@ -25,7 +25,7 @@
 /* Define if you have HardSID for libSIDPlay 2 */
 #undef HAVE_HARDSID_BUILDER
 
-/* Define if you have the iconv() function. */
+/* Define if you have the iconv() function and it works. */
 #undef HAVE_ICONV
 
 /* Define to 1 if you have the <inttypes.h> header file. */

--- a/src/xmms-sid.c	Wed May 21 02:52:57 2008 +0300
+++ b/src/xmms-sid.c	Thu May 22 07:26:26 2008 +0300
@@ -261,19 +261,19 @@
 /*
  * Check whether the given file is handled by this plugin
  */
-gint xs_is_our_file(gchar *pcFilename)
+gint xs_is_our_file(gchar *filename)
 {
-    gchar *pcExt;
+    gchar *ext;
     assert(xs_status.sidPlayer);
 
     /* Check the filename */
-    if (pcFilename == NULL)
+    if (filename == NULL)
         return FALSE;
 
     /* Try to detect via detection routine, if required */
     if (xs_cfg.detectMagic) {
         xs_file_t *f;
-        if ((f = xs_fopen(pcFilename, "rb")) != NULL) {
+        if ((f = xs_fopen(filename, "rb")) != NULL) {
             if (xs_status.sidPlayer->plrProbe(f))
                 return TRUE;
             xs_fclose(f);
@@ -281,21 +281,21 @@
     }
 
     /* Detect just by checking filename extension */
-    pcExt = xs_strrchr(pcFilename, '.');
-    if (pcExt) {
-        pcExt++;
+    ext = xs_strrchr(filename, '.');
+    if (ext) {
+        ext++;
         switch (xs_cfg.playerEngine) {
         case XS_ENG_SIDPLAY1:
         case XS_ENG_SIDPLAY2:
-            if (!g_strcasecmp(pcExt, "psid"))
+            if (!g_strcasecmp(ext, "psid"))
                 return TRUE;
-            if (!g_strcasecmp(pcExt, "sid"))
+            if (!g_strcasecmp(ext, "sid"))
                 return TRUE;
-            if (!g_strcasecmp(pcExt, "dat"))
+            if (!g_strcasecmp(ext, "dat"))
                 return TRUE;
-            if (!g_strcasecmp(pcExt, "inf"))
+            if (!g_strcasecmp(ext, "inf"))
                 return TRUE;
-            if (!g_strcasecmp(pcExt, "info"))
+            if (!g_strcasecmp(ext, "info"))
                 return TRUE;
             break;
         }
@@ -565,18 +565,18 @@
  * Usually you would also initialize the output-plugin, but
  * this is XMMS-SID and we do it on the player thread instead.
  */
-void xs_play_file(gchar * pcFilename)
+void xs_play_file(gchar *filename)
 {
     assert(xs_status.sidPlayer);
 
-    XSDEBUG("play '%s'\n", pcFilename);
+    XSDEBUG("play '%s'\n", filename);
 
     /* Get tune information */
-    if ((xs_status.tuneInfo = xs_status.sidPlayer->plrGetSIDInfo(pcFilename)) == NULL)
+    if ((xs_status.tuneInfo = xs_status.sidPlayer->plrGetSIDInfo(filename)) == NULL)
         return;
 
     /* Initialize the tune */
-    if (!xs_status.sidPlayer->plrLoadSID(&xs_status, pcFilename)) {
+    if (!xs_status.sidPlayer->plrLoadSID(&xs_status, filename)) {
         xs_tuneinfo_free(xs_status.tuneInfo);
         xs_status.tuneInfo = NULL;
         return;
@@ -653,7 +653,7 @@
 /*
  * Pause/unpause the playing
  */
-void xs_pause(short pauseState)
+void xs_pause(short pause)
 {
     XS_MUTEX_LOCK(xs_status);
     /* FIXME FIX ME todo: pause should disable sub-tune controls */
@@ -661,7 +661,7 @@
 
     xs_subctrl_close();
     xs_fileinfo_update();
-    xs_plugin_ip.output->pause(pauseState);
+    xs_plugin_ip.output->pause(pause);
 }