# HG changeset patch
# User nenolod
# Date 1158572711 25200
# Node ID 844761e5dac3123f496530c8747526de35cb94b4
# Parent  6303e3a8a6b8c7e5c6487581824c0cc90976c68d
[svn] - fully working package

diff -r 6303e3a8a6b8 -r 844761e5dac3 ChangeLog
--- a/ChangeLog	Mon Sep 18 02:42:15 2006 -0700
+++ b/ChangeLog	Mon Sep 18 02:45:11 2006 -0700
@@ -1,3 +1,25 @@
+2006-09-18 09:42:15 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [18]
+  - remove last references to libaudacious.
+  
+
+  Changes:        Modified:
+  +1 -1           trunk/src/General/scrobbler/queue.h  
+  +1 -1           trunk/src/General/scrobbler/scrobbler.h  
+  +1 -1           trunk/src/Input/cdaudio/cddb.c  
+  +1 -1           trunk/src/Input/cdaudio/cdinfo.c  
+  +1 -1           trunk/src/Input/flac/http.c  
+  +1 -1           trunk/src/Input/flac/tag.c  
+  +1 -1           trunk/src/Input/sid/xmms-sid.c  
+  +1 -1           trunk/src/Output/OSS/about.c  
+  +1 -1           trunk/src/Output/OSS/audio.c  
+  +1 -1           trunk/src/Output/OSS/init.c  
+  +1 -1           trunk/src/Output/alsa/about.c  
+  +1 -1           trunk/src/Output/alsa/audio.c  
+  +1 -0           trunk/src/Output/jack/jack.c  
+  +1 -1           trunk/src/Visualization/paranormal/client.c  
+
+
 2006-09-18 09:30:20 +0000  William Pitcock <nenolod@nenolod.net>
   revision [16]
   - make effect plugins build
diff -r 6303e3a8a6b8 -r 844761e5dac3 configure.ac
--- a/configure.ac	Mon Sep 18 02:42:15 2006 -0700
+++ b/configure.ac	Mon Sep 18 02:45:11 2006 -0700
@@ -1001,26 +1001,17 @@
 AM_CONDITIONAL(HAVE_SOLARIS, test "x$have_solaris" = xyes)
 AM_CONDITIONAL(HAVE_SUN, test "x$have_sun" = xyes)
 
-plugindir="$libdir/audacious"
+plugindir=`pkg-config audacious --variable=plugin_dir`
 AC_SUBST(plugindir)
 
-if test "x$enable_one_plugin_dir" = "xyes"; then
-    pluginsubs="\\\"Plugins\\\""
-    INPUT_PLUGIN_DIR=Plugins
-    OUTPUT_PLUGIN_DIR=Plugins
-    EFFECT_PLUGIN_DIR=Plugins
-    GENERAL_PLUGIN_DIR=Plugins
-    VISUALIZATION_PLUGIN_DIR=Plugins
-    CONTAINER_PLUGIN_DIR=Plugins
-else
-    pluginsubs="\\\"Output\\\",\\\"Input\\\",\\\"Effect\\\",\\\"General\\\",\\\"Visualization\\\",\\\"Container\\\""
-    INPUT_PLUGIN_DIR=Input
-    OUTPUT_PLUGIN_DIR=Output
-    EFFECT_PLUGIN_DIR=Effect
-    GENERAL_PLUGIN_DIR=General
-    VISUALIZATION_PLUGIN_DIR=Visualization
-    CONTAINER_PLUGIN_DIR=Container
-fi
+dnl XXX
+
+INPUT_PLUGIN_DIR=Input
+OUTPUT_PLUGIN_DIR=Output
+EFFECT_PLUGIN_DIR=Effect
+GENERAL_PLUGIN_DIR=General
+VISUALIZATION_PLUGIN_DIR=Visualization
+CONTAINER_PLUGIN_DIR=Container
 
 AC_SUBST(INPUT_PLUGIN_DIR)
 AC_SUBST(OUTPUT_PLUGIN_DIR)