# HG changeset patch
# User nhjm449
# Date 1157511438 25200
# Node ID fae6e0cfcc77d50e145d504a59826df50dc12103
# Parent  84006edb52930c5051f39e229c7f2f7c7b115b38
[svn] - Reapply r2161

diff -r 84006edb5293 -r fae6e0cfcc77 ChangeLog
--- a/ChangeLog	Tue Sep 05 09:18:30 2006 -0700
+++ b/ChangeLog	Tue Sep 05 19:57:18 2006 -0700
@@ -1,3 +1,12 @@
+2006-09-05 16:18:30 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2171]
+  - don't be picky about what aclocal version we are using.
+  
+
+  Changes:        Modified:
+  +1 -1           trunk/autogen.sh  
+
+
 2006-09-05 16:14:08 +0000  William Pitcock <nenolod@nenolod.net>
   revision [2169]
   - why is this here? it really fucks with my SVN client on OS X, so I am deleting it as it's unreferenced
diff -r 84006edb5293 -r fae6e0cfcc77 libaudacious/Makefile.in
--- a/libaudacious/Makefile.in	Tue Sep 05 09:18:30 2006 -0700
+++ b/libaudacious/Makefile.in	Tue Sep 05 19:57:18 2006 -0700
@@ -1,5 +1,5 @@
 include ../mk/rules.mk
-include ../mk/objective.mk
+include ../mk/init.mk
 
 beepincludedir = $(includedir)/audacious
 
@@ -43,6 +43,8 @@
 	beepctrl.h dirbrowser.h util.h \
 	formatter.h titlestring.h xml_document.h
 
+include ../mk/objective.mk
+
 install-posthook:
 	@mv ${DESTDIR}/${LIBDIR}/libaudacious.so ${DESTDIR}/${LIBDIR}/libaudacious.so.3.0.0
 	@ln -sf ${LIBDIR}/libaudacious.so.3.0.0 \