summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--gnome-settings-daemon/actions/Makefile.am2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index eab82d9ea..1a94d82fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-08 Christophe Fergeau <teuf@gnome.org>
+
+ * gnome-settings-daemon/actions/Makefile.am: switch ALSA_LIBS and
+ GST_LIBS order in libacme_la_LIBADD, fixes some libtool link
+ issues on Debian.
+
Tue Sep 14 17:50:56 2004 Jonathan Blandford <jrb@redhat.com>
* configure.in:
diff --git a/gnome-settings-daemon/actions/Makefile.am b/gnome-settings-daemon/actions/Makefile.am
index 97a3ba32b..6939798af 100644
--- a/gnome-settings-daemon/actions/Makefile.am
+++ b/gnome-settings-daemon/actions/Makefile.am
@@ -30,7 +30,7 @@ libacme_la_SOURCES = \
acme-volume-dummy.c acme-volume-dummy.h
libacme_la_LIBADD = \
- $(ALSA_LIBS) $(GST_LIBS)
+ $(GST_LIBS) $(ALSA_LIBS)
Datadir = $(datadir)/control-center-2.0/interfaces/
Data_DATA = acme.glade