# HG changeset patch
# User nenolod
# Date 1157579169 25200
# Node ID 20ff61083530bb9abcedba59e19639e0be116315
# Parent  842667773cc0bbe8124f25098caf048a1c9794bd
[svn] - make audtool build
- make plugins work

diff -r 842667773cc0 -r 20ff61083530 ChangeLog
--- a/ChangeLog	Wed Sep 06 14:21:40 2006 -0700
+++ b/ChangeLog	Wed Sep 06 14:46:09 2006 -0700
@@ -1,3 +1,15 @@
+2006-09-06 21:21:40 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2191]
+  - audacious now builds on OS X
+  
+
+  Changes:        Modified:
+  +5 -2           trunk/audacious/Makefile  
+  +8 -2           trunk/configure.ac  
+  +2 -0           trunk/libaudacious/Makefile.in  
+  +2 -0           trunk/mk/rules.mk.in  
+
+
 2006-09-06 21:01:53 +0000  William Pitcock <nenolod@nenolod.net>
   revision [2189]
   - they fucking say I'm nuts
diff -r 842667773cc0 -r 20ff61083530 audacious/pluginenum.c
--- a/audacious/pluginenum.c	Wed Sep 06 14:21:40 2006 -0700
+++ b/audacious/pluginenum.c	Wed Sep 06 14:46:09 2006 -0700
@@ -23,6 +23,10 @@
 #  include "config.h"
 #endif
 
+#ifndef SHARED_SUFFIX
+# define SHARED_SUFFIX G_MODULE_SUFFIX
+#endif
+
 #include "pluginenum.h"
 
 #include <glib.h>
@@ -238,7 +242,7 @@
 static gboolean
 scan_plugin_func(const gchar * path, const gchar * basename, gpointer data)
 {
-    if (!str_has_suffix_nocase(basename, G_MODULE_SUFFIX))
+    if (!str_has_suffix_nocase(basename, SHARED_SUFFIX))
         return FALSE;
 
     if (!g_file_test(path, G_FILE_TEST_IS_REGULAR))
diff -r 842667773cc0 -r 20ff61083530 audtool/Makefile
--- a/audtool/Makefile	Wed Sep 06 14:21:40 2006 -0700
+++ b/audtool/Makefile	Wed Sep 06 14:46:09 2006 -0700
@@ -6,9 +6,8 @@
 
 OBJECTIVE_BINS = audtool
 
-LDFLAGS += -Wl,-export-dynamic
+LDFLAGS += $(AUDLDFLAGS)
 LDADD = \
-	-L.. $(LTLIBINTL)     \
 	-L../libaudacious -laudacious \
 	$(GTK_LIBS)      \
 	$(LIBGLADE_LIBS)
@@ -26,5 +25,5 @@
 OBJECTS = ${SOURCES:.c=.o}
 
 audtool: $(OBJECTS)
-	$(CC) $(LDFLAGS) $(OBJECTS) $(LDADD) -o $@ -Wl,-rpath,${libdir}
+	$(CC) $(LDFLAGS) $(OBJECTS) $(LDADD) -o $@
 	@printf "%10s     %-20s\n" LINK $@
diff -r 842667773cc0 -r 20ff61083530 configure.ac
--- a/configure.ac	Wed Sep 06 14:21:40 2006 -0700
+++ b/configure.ac	Wed Sep 06 14:46:09 2006 -0700
@@ -215,6 +215,8 @@
 AC_SUBST(LIBLDFLAGS)
 AC_SUBST(AUDLDFLAGS)
 AC_SUBST(SHARED_SUFFIX)
+AC_DEFINE(SHARED_SUFFIX, "\"$SHARED_SUFFIX\"",
+	[Define the shared module suffix extension on your platform.])
 
 AC_MSG_CHECKING([if you are running Apple-GCC])
 case "$target" in