From 1ae369981cb474dbaee6feed87526f1551cb94c9 Mon Sep 17 00:00:00 2001
From: Thomas Vander Stichele <thomas@apestaart.org>
Date: Sun, 23 Dec 2001 22:21:18 +0000
Subject: [PATCH] hm, lots seems to have changed

Original commit message from CVS:
hm, lots seems to have changed
---
 TODO            |  2 --
 ext/Makefile.am | 12 +++++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/TODO b/TODO
index 7afa50160a..209963c7c3 100644
--- a/TODO
+++ b/TODO
@@ -8,8 +8,6 @@
 
 * check GST_* in configure.ac, there is too much in it
 
-* decide where to put the control lib
-
 * work on spec file :
   add plugins with AC stuff (maybe from bits ?)
   write script that builds rpm's one from one
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 8273e68f6a..4a3c348165 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -22,10 +22,10 @@ else
 ARTS_DIR=
 endif
 
-if USE_ARTSD
-ARTSD_DIR=artsd
+if USE_ARTSC
+ARTSC_DIR=artsd
 else
-ARTSD_DIR=
+ARTSC_DIR=
 endif
 
 if USE_AUDIOFILE
@@ -160,13 +160,15 @@ else
 XMMS_DIR=
 endif
 
-SUBDIRS=$(A52_DIR) $(AALIB_DIR) $(ALSA_DIR) $(AUDIOFILE_DIR) \
+SUBDIRS=$(A52_DIR) $(AALIB_DIR) $(ALSA_DIR) \
+        $(ARTS_DIR) $(ARTSD_DIR) $(AUDIOFILE_DIR) \
 	$(AVIFILE_DIR) $(CDPARANOIA_DIR) $(DV_DIR) $(DVDREAD_DIR) $(ESD_DIR) \
         $(FESTIVAL_DIR) $(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) $(HERMES_DIR) \
 	$(JPEG_DIR) $(LAME_DIR) $(MAD_DIR) $(MIKMOD_DIR) $(MPEG2DEC_DIR) \
 	$(OPENQUICKTIME_DIR) $(RTP_DIR) $(SDL_DIR) $(SHOUT_DIR) $(VORBIS_DIR) \
 	$(XMMS_DIR)
 
-DIST_SUBDIRS=a52 aalib alsa avifile audiofile cdparanoia dv dvdread esd \
+DIST_SUBDIRS=a52 aalib alsa arts artsd avifile audiofile cdparanoia \
+             dv dvdread esd \
 	     festival flac gnomevfs gsm hermes jpeg lame mad mikmod mpeg2dec \
 	     openquicktime rtp sdl shout vorbis xmms