# HG changeset patch
# User nenolod
# Date 1161628976 25200
# Node ID 9d53c0faac1b75a345365e60c463f6229e17448e
# Parent  46576f74b3a1cf67066ca68277747e2d05371934
[svn] - add --disable-rpath option to disable hardbinding an rpath to the audacious binaries

diff -r 46576f74b3a1 -r 9d53c0faac1b ChangeLog
--- a/ChangeLog	Sun Oct 22 12:12:43 2006 -0700
+++ b/ChangeLog	Mon Oct 23 11:42:56 2006 -0700
@@ -1,3 +1,11 @@
+2006-10-22 19:12:43 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2739]
+  - use rand() instead
+  
+  trunk/audacious/util.c |    2 +-
+  1 file changed, 1 insertion(+), 1 deletion(-)
+
+
 2006-10-22 18:54:51 +0000  William Pitcock <nenolod@nenolod.net>
   revision [2737]
   - remove mkdtemp().
diff -r 46576f74b3a1 -r 9d53c0faac1b configure.ac
--- a/configure.ac	Sun Oct 22 12:12:43 2006 -0700
+++ b/configure.ac	Mon Oct 23 11:42:56 2006 -0700
@@ -121,6 +121,16 @@
 AM_CONDITIONAL(USE_IPV6,test "x$enable_ipv6" = xyes)
 AC_SUBST(USE_IPV6)
 
+dnl rpath stuff
+dnl ========================
+AC_ARG_ENABLE(rpath,
+	[  --disable-rpath                disable hardcoded rpath (default=enabled)],
+			enable_rpath=$enableval, enable_rpath=yes)
+
+if test "x$enable_rpath" = xyes; then
+    RPATH_VAL="-Wl,-rpath=\${libdir}"
+fi
+
 dnl plugin stuff
 dnl ========================
 
@@ -140,7 +150,7 @@
 		PICFLAGS="-fPIC -DPIC"
 		PICLDFLAGS="-fPIC -DPIC -shared"
 		LIBLDFLAGS="-fPIC -DPIC -shared"
-		AUDLDFLAGS="-Wl,-export-dynamic -Wl,-rpath=\${libdir}"
+		AUDLDFLAGS="-Wl,-export-dynamic $RPATH_VAL"
 		SHARED_SUFFIX=".so"
 		;;
 esac