# HG changeset patch
# User nenolod
# Date 1157577700 25200
# Node ID 842667773cc0bbe8124f25098caf048a1c9794bd
# Parent  1509ce5c00ba3f76a5fc0783400b7a426ff8de59
[svn] - audacious now builds on OS X

diff -r 1509ce5c00ba -r 842667773cc0 ChangeLog
--- a/ChangeLog	Wed Sep 06 14:01:53 2006 -0700
+++ b/ChangeLog	Wed Sep 06 14:21:40 2006 -0700
@@ -1,3 +1,12 @@
+2006-09-06 21:01:53 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2189]
+  - they fucking say I'm nuts
+  
+
+  Changes:        Modified:
+  +2 -2           trunk/configure.ac  
+
+
 2006-09-06 20:54:02 +0000  William Pitcock <nenolod@nenolod.net>
   revision [2187]
   -Wl,-export-dynamic isn't needed here.
diff -r 1509ce5c00ba -r 842667773cc0 audacious/Makefile
--- a/audacious/Makefile	Wed Sep 06 14:01:53 2006 -0700
+++ b/audacious/Makefile	Wed Sep 06 14:21:40 2006 -0700
@@ -8,7 +8,10 @@
 
 OBJECTIVE_BINS = audacious
 
-LDFLAGS += -Wl,-export-dynamic
+LTLIBINTL = -L../intl -lintl
+
+LDFLAGS += $(AUDLDFLAGS)
+
 LDADD = \
 	-L.. $(LTLIBINTL)     \
 	-L../libaudacious -laudacious \
@@ -89,5 +92,5 @@
 	fi;
 
 audacious: $(OBJECTS)
-	$(CC) $(LDFLAGS) $(OBJECTS) $(LDADD) -o $@ -Wl,-rpath,${libdir}
+	$(CC) $(LDFLAGS) $(OBJECTS) $(LDADD) -o $@ 
 	@printf "%10s     %-20s\n" LINK $@
diff -r 1509ce5c00ba -r 842667773cc0 configure.ac
--- a/configure.ac	Wed Sep 06 14:01:53 2006 -0700
+++ b/configure.ac	Wed Sep 06 14:21:40 2006 -0700
@@ -194,20 +194,26 @@
 AC_MSG_CHECKING([for what extension and flags to use for plugin compilation])
 case "$target" in
 	*-apple-*)
-		AC_MSG_RESULT([Mac OS X: -fPIC -bundle -flat_namespace -undefined suppress -dynamiclib, .dylib])
+		AC_MSG_RESULT([Mac OS X: -fPIC -bundle -flat_namespace -undefined suppress, .dylib])
 		PICFLAGS="-fPIC -DPIC"
-		PICLDFLAGS="-fPIC -DPIC -bundle -flat_namespace -undefined suppress -dynamiclib"
+		PICLDFLAGS="-fPIC -DPIC -bundle -flat_namespace -undefined suppress"
+		LIBLDFLAGS="-dynamiclib"
+		AUDLDFLAGS=""
 		SHARED_SUFFIX=".dylib"
 		;;
 	*)
 		AC_MSG_RESULT([libdl-compatible: -fPIC -DPIC -shared, .so])
 		PICFLAGS="-fPIC -DPIC"
 		PICLDFLAGS="-fPIC -DPIC -shared"
+		LIBLDFLAGS="-fPIC -DPIC -shared"
+		AUDLDFLAGS="-Wl,-export-dynamic -Wl,-rpath=\${libdir}"
 		SHARED_SUFFIX=".so"
 		;;
 esac
 AC_SUBST(PICFLAGS)
 AC_SUBST(PICLDFLAGS)
+AC_SUBST(LIBLDFLAGS)
+AC_SUBST(AUDLDFLAGS)
 AC_SUBST(SHARED_SUFFIX)
 
 AC_MSG_CHECKING([if you are running Apple-GCC])
diff -r 1509ce5c00ba -r 842667773cc0 libaudacious/Makefile.in
--- a/libaudacious/Makefile.in	Wed Sep 06 14:01:53 2006 -0700
+++ b/libaudacious/Makefile.in	Wed Sep 06 14:21:40 2006 -0700
@@ -1,6 +1,8 @@
 include ../mk/rules.mk
 include ../mk/init.mk
 
+PICLDFLAGS = $(LIBLDFLAGS)
+
 beepincludedir = $(includedir)/audacious
 
 OBJECTIVE_LIBS = libaudacious$(SHARED_SUFFIX)
diff -r 1509ce5c00ba -r 842667773cc0 mk/rules.mk.in
--- a/mk/rules.mk.in	Wed Sep 06 14:01:53 2006 -0700
+++ b/mk/rules.mk.in	Wed Sep 06 14:21:40 2006 -0700
@@ -326,3 +326,5 @@
 SHARED_SUFFIX ?= @SHARED_SUFFIX@
 PICFLAGS ?= @PICFLAGS@
 PICLDFLAGS ?= @PICLDFLAGS@
+LIBLDFLAGS ?= @LIBLDFLAGS@
+AUDLDFLAGS ?= @AUDLDFLAGS@