diff -ruN gkrellmms.orig/gkrellmms.c gkrellmms/gkrellmms.c

--- gkrellmms.orig/gkrellmms.c	2005-01-21 20:02:17 +0300

+++ gkrellmms/gkrellmms.c	2005-04-04 23:49:49 +0400

@@ -1033,14 +1033,20 @@

   playlist_dir = g_strdup(gkrellm_homedir());

   files_directory = g_strdup("/");

+#ifdef USE_BMP

+  gkrellmms_label = g_strdup("beep");

+#endif

+#ifdef USE_XMMS

   gkrellmms_label = g_strdup("xmms");

+#endif

   xmms_session = 0;

   scroll_enable = TRUE;

   scroll_separator = g_strdup(SCROLL_SEPARATOR);

   draw_time = 1;

 #ifdef USE_BMP

   xmms_exec_command = g_strdup("beep-media-player");

-#else

+#endif

+#ifdef USE_XMMS

   xmms_exec_command = g_strdup("xmms");

 #endif

   xmms_autostart = 0;

diff -ruN gkrellmms.orig/gkrellmms.h gkrellmms/gkrellmms.h

--- gkrellmms.orig/gkrellmms.h	2005-01-21 20:02:17 +0300

+++ gkrellmms/gkrellmms.h	2005-04-04 23:51:06 +0400

@@ -27,7 +27,8 @@

 #ifdef USE_BMP

 #include <bmp/beepctrl.h>

-#else

+#endif

+#ifdef USE_XMMS

 #include <xmms/xmmsctrl.h>

 #endif

diff -ruN gkrellmms.orig/Makefile gkrellmms/Makefile

--- gkrellmms.orig/Makefile	2005-01-21 20:02:17 +0300

+++ gkrellmms/Makefile	2005-04-04 23:49:36 +0400

@@ -8,24 +8,22 @@

 IMLIB_INCLUDE ?= 

 IMLIB_LIB ?= 

-ifdef USE_BMP

-   XMMS_INCLUDE ?= `pkg-config bmp --cflags`

-   XMMS_LIB ?= `pkg-config bmp --libs`

+ifeq ($(use_beep),yes)

+    XMMS_INCLUDE ?= `pkg-config --cflags bmp` -DUSE_BMP

+    XMMS_LIB ?= `pkg-config --libs bmp`

 else

-   XMMS_INCLUDE ?= `xmms-config --cflags`

-   XMMS_LIB ?= `xmms-config --libs`

+    XMMS_INCLUDE ?= `xmms-config --cflags` -DUSE_XMMS

+    XMMS_LIB ?= `xmms-config --libs`

 endif

+XMMS_INCLUDE ?= `xmms-config --cflags`

+XMMS_LIB ?= `xmms-config --libs`

 PLUGIN_DIR ?= /usr/local/lib/gkrellm2/plugins

 FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(XMMS_INCLUDE)

 LIBS = $(GTK_LIB) $(IMLIB_LIB) $(XMMS_LIB)

 LFLAGS = -shared -lpthread

-ifdef USE_BMP

-   FLAGS += -DUSE_BMP

-endif

-

 LOCALEDIR ?= /usr/share/locale

 ifeq ($(enable_nls),1)

    FLAGS += -DENABLE_NLS -DLOCALEDIR=\"$(LOCALEDIR)\"

diff -ruN gkrellmms.orig/playlist.c gkrellmms/playlist.c

--- gkrellmms.orig/playlist.c	2005-01-21 20:02:17 +0300

+++ gkrellmms/playlist.c	2005-04-04 23:43:45 +0400

@@ -121,7 +121,9 @@

     current_file = string_to_utf8(current_file, TRUE);

+#ifdef USE_XMMS

     current_title = string_to_utf8(current_title, FALSE);

+#endif

 		if (current_title == NULL && current_file != NULL) { 

 			current_title = g_strdup(current_file);

 		}

diff -ruN gkrellmms.orig/playlist.h gkrellmms/playlist.h

--- gkrellmms.orig/playlist.h	2005-01-21 20:02:17 +0300

+++ gkrellmms/playlist.h	2005-04-04 23:51:10 +0400

@@ -26,7 +26,8 @@

 #ifdef USE_BMP

 #include <bmp/beepctrl.h>

-#else

+#endif

+#ifdef USE_XMMS

 #include <xmms/xmmsctrl.h>

 #endif