# HG changeset patch
# User nenolod
# Date 1141102079 28800
# Node ID 6636d328fa38a73d750f412eb8ab770e3ede8aea
# Parent  5fe9bafc1895b9b14ce4230880d628acfd7067d0
[svn] more progress

diff -r 5fe9bafc1895 -r 6636d328fa38 Plugins/Effect/ladspa/ladspa.c
--- a/Plugins/Effect/ladspa/ladspa.c	Mon Feb 27 20:37:43 2006 -0800
+++ b/Plugins/Effect/ladspa/ladspa.c	Mon Feb 27 20:47:59 2006 -0800
@@ -37,7 +37,7 @@
 #define PATH_MAX 4096
 #endif
 
-#define PLUGIN_NAME "LADSPA host " VERSION
+#define PLUGIN_NAME "LADSPA host " PACKAGE_VERSION
 
 #define MAX_SAMPLES 8192
 #define MAX_KNOBS 64
diff -r 5fe9bafc1895 -r 6636d328fa38 Plugins/General/song_change/song_change.c
--- a/Plugins/General/song_change/song_change.c	Mon Feb 27 20:37:43 2006 -0800
+++ b/Plugins/General/song_change/song_change.c	Mon Feb 27 20:47:59 2006 -0800
@@ -50,7 +50,7 @@
 
 GeneralPlugin *get_gplugin_info(void)
 {
-	sc_gp.description = g_strdup_printf(_("Song Change %s"), VERSION);
+	sc_gp.description = g_strdup_printf(_("Song Change %s"), PACKAGE_VERSION);
 	return &sc_gp;
 }
 
diff -r 5fe9bafc1895 -r 6636d328fa38 Plugins/Input/timidity/src/xmms-timidity.c
--- a/Plugins/Input/timidity/src/xmms-timidity.c	Mon Feb 27 20:37:43 2006 -0800
+++ b/Plugins/Input/timidity/src/xmms-timidity.c	Mon Feb 27 20:47:59 2006 -0800
@@ -96,7 +96,7 @@
 
 InputPlugin *get_iplugin_info(void) {
 	xmmstimid_ip.description = g_strdup_printf(
-			_("TiMidity Player %s"), VERSION);
+			_("TiMidity Player %s"), PACKAGE_VERSION);
 	return &xmmstimid_ip;
 }
 
@@ -129,7 +129,7 @@
 		gchar *name_version;
 		xmmstimid_about_wnd = create_xmmstimid_about_wnd();
 		name_version = g_strdup_printf(
-				_("TiMidity Plugin %s"), VERSION);
+				_("TiMidity Plugin %s"), PACKAGE_VERSION);
 		gtk_label_set_text(
 				GTK_LABEL(gtk_object_get_data(
 				GTK_OBJECT(xmmstimid_about_wnd),
diff -r 5fe9bafc1895 -r 6636d328fa38 Plugins/Input/wma/wma.c
--- a/Plugins/Input/wma/wma.c	Mon Feb 27 20:37:43 2006 -0800
+++ b/Plugins/Input/wma/wma.c	Mon Feb 27 20:47:59 2006 -0800
@@ -116,7 +116,7 @@
 InputPlugin *get_iplugin_info(void)
 {
     memset(description, 0, 64);
-    wma_ip.description = g_strdup_printf(_("WMA Player %s"), VERSION);
+    wma_ip.description = g_strdup_printf(_("WMA Player %s"), PACKAGE_VERSION);
     return &wma_ip;
 }
 
diff -r 5fe9bafc1895 -r 6636d328fa38 Plugins/Output/esd/Makefile.in
--- a/Plugins/Output/esd/Makefile.in	Mon Feb 27 20:37:43 2006 -0800
+++ b/Plugins/Output/esd/Makefile.in	Mon Feb 27 20:47:59 2006 -0800
@@ -7,7 +7,7 @@
 
 LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
 
-LIBADD = $(GTK_LIBS) $(ESD_LIBS) -lpthread
+LIBADD = $(GTK_LIBS) $(ESD_LIBS)
 SOURCES = esd.c mixer.c about.c configure.c audio.c init.c
 
 OBJECTS = ${SOURCES:.c=.o}
diff -r 5fe9bafc1895 -r 6636d328fa38 configure.ac
--- a/configure.ac	Mon Feb 27 20:37:43 2006 -0800
+++ b/configure.ac	Mon Feb 27 20:47:59 2006 -0800
@@ -35,6 +35,21 @@
 AC_ISC_POSIX
 AC_C_BIGENDIAN
 
+dnl Automake emulation
+
+PACKAGE=$(PACKAGE_NAME)
+VERSION=$(PACKAGE_VERSION)
+
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE",
+    [Package name.]
+)
+
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION",
+    [Package version.]
+)
+
+AC_SUBST(PACKAGE)
+AC_SUBST(VERSION)
 
 dnl Check for assembler
 
diff -r 5fe9bafc1895 -r 6636d328fa38 libaudacious/titlestring.c
--- a/libaudacious/titlestring.c	Mon Feb 27 20:37:43 2006 -0800
+++ b/libaudacious/titlestring.c	Mon Feb 27 20:47:59 2006 -0800
@@ -23,7 +23,7 @@
 #  include "config.h"
 #endif
 
-#define GETTEXT_PACKAGE PACKAGE
+#define GETTEXT_PACKAGE PACKAGE_NAME
 
 #include <glib.h>
 #include <glib/gi18n-lib.h>