make arts stuff work, i think

Original commit message from CVS:
make arts stuff work, i think

3 files changed, 37 insertions, 49 deletions

diff --git a/configure.ac b/configure.ac
index 581ff0fe..3da22a1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,15 +79,9 @@ GST_CHECK_FEATURE(EXPERIMENTAL, [enable building of experimental plugins],,
 [
   AC_MSG_WARN(building experimental plugins)
   USE_LIBMIKMOD="yes"
-  USE_ARTS="yes"
-  USE_ARTSC="yes"
-  USE_SINE="yes"
 ],[
   AC_MSG_NOTICE(not building experimental plugins)
   USE_LIBMIKMOD="no"
-  USE_ARTS="no"
-  USE_ARTSC="no"
-  USE_SINE="no"
 ])
 
 dnl broken plugins; stuff that doesn't seem to build at the moment
@@ -494,6 +488,25 @@ GST_CHECK_FEATURE(HERMES, [Hermes library], colorspace, [
   GST_CHECK_LIBHEADER(HERMES, Hermes, Hermes_ConverterInstance, , Hermes/Hermes.h, HERMES_LIBS="-lHermes")
 ], AC_SUBST(HERMES_LIBS))
 
+dnl *** http ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_HTTP, true)
+GST_CHECK_FEATURE(HTTP, [http plugins], gsthttpsrc, [
+  dnl FIXME: need to check for header
+  GHTTP_LIBS=
+  GST_HTTPSRC_GET_TYPE=
+  if test x$USE_GLIB2 = xyes; then
+    AC_MSG_WARN(ghttp disabled for glib2.0)
+  else
+    AC_CHECK_LIB(ghttp, ghttp_request_new,
+      [HTTP_LIBS="-lghttp"
+       GST_HTTPSRC_GET_TYPE="gst_httpsrc_get_type"
+       HAVE_HTTP=yes
+      ], :, $LIBS)
+  fi
+  AC_SUBST(HTTP_LIBS)
+  AC_SUBST(GST_HTTPSRC_GET_TYPE)
+])
+
 dnl *** lame ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_LAME, true)
 GST_CHECK_FEATURE(LAME, [lame mp3 encoder library], lame, [
@@ -601,25 +614,6 @@ GST_CHECK_FEATURE(XMMS, [xmms plugin], xmms, [
   AM_PATH_XMMS(0.1.0, HAVE_XMMS=yes, HAVE_XMMS=no)
 ])
 
-dnl Check for libghttp
-translit(dnm, m, l) AM_CONDITIONAL(USE_LIBGHTTP, true)
-GST_CHECK_FEATURE(LIBGHTTP, [libghttp plugins], gsthttpsrc, [
-  dnl FIXME: need to check for header
-  GHTTP_LIBS=
-  GST_HTTPSRC_GET_TYPE=
-  if test x$USE_GLIB2 = xyes; then
-    AC_MSG_WARN(ghttp disabled for glib2.0)
-  else
-    AC_CHECK_LIB(ghttp, ghttp_request_new,
-      [GHTTP_LIBS="-lghttp"
-       GST_HTTPSRC_GET_TYPE="gst_httpsrc_get_type"
-       HAVE_LIBGHTTP=yes
-      ], :, $LIBS)
-  fi
-  AC_SUBST(GHTTP_LIBS)
-  AC_SUBST(GST_HTTPSRC_GET_TYPE)
-])
-
 dnl Check for atomic.h
 dnl Note: use AC_CHECK_HEADER not AC_CHECK_HEADERS, because the latter
 dnl defines the wrong default symbol as well (HAVE_ASM_ATOMIC_H)
@@ -837,12 +831,6 @@ dnl # Set defines according to variables set above #
 dnl ################################################
 
 
-dnl These should be "USE_*" instead of "HAVE_*", but some packages expect
-dnl HAVE_ and it is likely to be easier to stick with the old name
-if test "x$USE_LIBGHTTP" = xyes; then
-  AC_DEFINE(HAVE_LIBGHTTP, 1, [Define if ghttp library is available])
-fi
-
 if test "x$USE_LIBMMX" = xyes; then
   AC_DEFINE(HAVE_LIBMMX, 1, [Define if libmmx is available])
 fi
@@ -1002,8 +990,6 @@ dnl wtay fix this: testsuite/threads/Makefile
 dnl testsuite/refcounting/Makefile
 dnl stamp.h
 dnl echo "$infomessages", infomessages="$infomessages"
-dnl ext/arts/Makefile
-dnl ext/artsd/Makefile
 AC_OUTPUT(
 Makefile
 gst/Makefile
@@ -1058,6 +1044,8 @@ ext/Makefile
 ext/a52/Makefile
 ext/aalib/Makefile
 ext/alsa/Makefile
+ext/arts/Makefile
+ext/artsd/Makefile
 ext/audiofile/Makefile
 ext/avifile/Makefile
 ext/cdparanoia/Makefile
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 171b2241..f64131a1 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -94,6 +94,12 @@ else
 HERMES_DIR=
 endif
 
+if USE_HTTP
+HTTP_DIR=gnomevfs
+else
+HTTP_DIR=
+endif
+
 if USE_LAME
 LAME_DIR=lame
 else
@@ -164,12 +170,11 @@ SUBDIRS=$(A52_DIR) $(AALIB_DIR) $(ALSA_DIR) \
         $(ARTS_DIR) $(ARTSC_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) \
+	$(HTTP_DIR) $(JPEG_DIR) $(LAME_DIR) $(MAD_DIR) $(MIKMOD_DIR) $(MPEG2DEC_DIR) \
 	$(OPENQUICKTIME_DIR) $(RTP_DIR) $(SDL_DIR) $(SHOUT_DIR) $(VORBIS_DIR) \
 	$(XMMS_DIR)
 
-# fixme : add arts and artsd
-DIST_SUBDIRS=a52 aalib alsa avifile audiofile cdparanoia \
+DIST_SUBDIRS=a52 aalib alsa arts artsd avifile audiofile cdparanoia \
              dv dvdread esd \
-	     festival flac gnomevfs gsm hermes jpeg lame mad mikmod mpeg2dec \
+	     festival flac gnomevfs gsm hermes http jpeg lame mad mikmod mpeg2dec \
 	     openquicktime rtp sdl shout vorbis xmms
diff --git a/ext/arts/Makefile.am b/ext/arts/Makefile.am
index 0be9ebb4..684cc1c9 100644
--- a/ext/arts/Makefile.am
+++ b/ext/arts/Makefile.am
@@ -1,17 +1,17 @@
-filterdir = $(libdir)/gst
+plugindir = $(libdir)/gst
 
-filter_LTLIBRARIES = libgst_arts.la
+plugin_LTLIBRARIES = libgstarts.la
 
 gst_artsio_impl.lo: gst_artsio.cc
 
 SUFFIXES = .idl
 .idl.cc:
-	mcopidl -t $< $(ARTS_MCOPFLAGS)
+	mcopidl -t $< $(ARTS_CXXFLAGS)
 
 # mcopidl Extension Expansion Technology clean up
 CLEANFILES = gst_artsio.h gst_artsio.cc gst_artsio.mcopclass gst_artsio.mcoptype
 
-libgst_arts_la_SOURCES = gst_arts.c gst_artsio.cc gst_artsio_impl.cc
+libgstarts_la_SOURCES = gst_arts.c gst_artsio.cc gst_artsio_impl.cc
 noinst_HEADERS = gst_arts.h gst_artsio_impl.h
 
 # FIXME automake 1.4 hack, 1.5 should let us put the .idl in
@@ -20,11 +20,6 @@ EXTRA_DIST = gst_artsio.idl
 dist-hook:
 	rm -f $(distdir)/gst_artsio.cc
 
-# gst_artsio.cc and gst_artsio.h are generated from the idl, and the tools
-# needed to do this should be present on any platform where the rest of arts
-# is present: therefore, these don't need to go in the dist.
-#EXTRA_DIST = gst_artsio.cc gst_artsio.h
-
-libgst_arts_la_CFLAGS = $(ARTS_CFLAGS)
-libgst_arts_la_CXXFLAGS = $(ARTS_CFLAGS) $(CFLAGS)
-libgst_arts_la_LDFLAGS = $(ARTS_LIBS)
+libgstarts_la_CFLAGS = $(GST_CFLAGS)
+libgstarts_la_CXXFLAGS = $(ARTS_CXXFLAGS) $(GST_CFLAGS)
+libgstarts_la_LIBADD = $(ARTS_LIBS)