From 0c869beffc6c0542e2f06ef5731a632f05535e7d Mon Sep 17 00:00:00 2001
From: Thomas Vander Stichele <thomas@apestaart.org>
Date: Tue, 11 Dec 2001 14:43:09 +0000
Subject: [PATCH] Added XMMS check commented out previous XMMS and arts check
 added arts check but I need to test it tried fixing rtp c...

Original commit message from CVS:
Added XMMS check
commented out previous XMMS and arts check
added arts check but I need to test it
tried fixing rtp check but there's something *really*wrong with it,
the headers are on my system but don't get found
---
 configure.ac | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1d3d1f8f35..196ef8dea2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -335,15 +335,16 @@ dnl Check for artsc
 translit(dnm, m, l) AM_CONDITIONAL(USE_ARTSC, true)
 GST_CHECK_FEATURE(ARTSC, [artsd plugins], artsdsink, [GST_CHECK_ARTSC()])
 
-dnl Check for artsc
-translit(dnm, m, l) AM_CONDITIONAL(USE_ARTS, true)
-GST_CHECK_FEATURE(ARTS, [arts plugins], arts, [GST_CHECK_ARTS()])
+dnl Check for arts
+dnl FIXME: thomasvs: I don't understand this, have replaced the check
+dnl translit(dnm, m, l) AM_CONDITIONAL(USE_ARTS, true)
+dnl GST_CHECK_FEATURE(ARTS, [arts plugins], arts, [GST_CHECK_ARTS()])
 
 dnl Check for xmms
-translit(dnm, m, l) AM_CONDITIONAL(USE_LIBXMMS, true)
-GST_CHECK_FEATURE(LIBXMMS, [xmms plugin], xmms, [
-  AM_PATH_XMMS(0.1.0, HAVE_LIBXMMS=yes, HAVE_LIBXMMS=no)
-], disabled)
+dnl translit(dnm, m, l) AM_CONDITIONAL(USE_LIBXMMS, true)
+dnl GST_CHECK_FEATURE(LIBXMMS, [xmms plugin], xmms, [
+dnl  AM_PATH_XMMS(0.1.0, HAVE_LIBXMMS=yes, HAVE_LIBXMMS=no)
+dnl ], disabled)
 
 dnl Check for alsa
 translit(dnm, m, l) AM_CONDITIONAL(USE_ALSA, true)
@@ -405,6 +406,12 @@ GST_CHECK_FEATURE(LIBGHTTP, [libghttp plugins], gsthttpsrc, [
   AC_SUBST(GST_HTTPSRC_GET_TYPE)
 ])
 
+dnl thomas : adding an arts check taken from xine with it's own .m4
+AM_PATH_ARTS(, HAVE_ARTS=yes, HAVE_ARTS=no)
+
+dnl Check for xmms
+AM_PATH_XMMS(0.9.4, HAVE_XXMS=yes, HAVE_XMMS=no)
+
 dnl Check for libglade
 HAVE_LIBGLADE_GNOME="no"
 if test x$USE_GLIB2 = xyes; then
@@ -633,6 +640,14 @@ AC_CHECK_HEADER(a52dec/a52.h, :, HAVE_A52DEC=no)
 dnl Check for sidplay
 AC_PATH_LIBSIDPLAY
 
+dnl Check for librtp
+AC_MSG_CHECKING(rtp library)
+AC_CHECK_LIB(rtp, rtp_packet_new_take_data, HAVE_LIBRTP=yes, HAVE_LIBRTP=no, $GLIB_LIBS $GLIB_CFLAGS)
+AC_CHECK_HEADERS(rtp/rtp.h, HAVE_LIBRTP=yes, HAVE_LIBRTP=no)
+AC_CHECK_HEADERS(rtp/rtp-packet.h, :, HAVE_LIBRTP=no)
+AC_CHECK_HEADERS(rtp/rtcp-packet.h, :, HAVE_LIBRTP=no)
+AC_CHECK_HEADERS(rtp/rtp-audio.h, :, HAVE_LIBRTP=no)
+
 dnl Check for FLAC
 dnl thomas : checking for compile with main instead of actual function,
 dnl since that made autoconf break (for version 2.13)
@@ -640,13 +655,6 @@ AC_MSG_CHECKING(FLAC library)
 AC_CHECK_LIB(FLAC, main, HAVE_FLACLIB=yes, HAVE_FLACLIB=no, -lm)
 AC_CHECK_HEADER(FLAC/all.h, :, HAVE_FLACLIB=no)
 
-dnl Check for librtp
-AC_MSG_CHECKING(rtp library)
-AC_CHECK_LIB(rtp, rtp_packet_new_take_data, HAVE_LIBRTP=yes, HAVE_LIBRTP=no, $GLIB_LIBS $GLIB_CFLAGS)
-AC_CHECK_HEADER(rtp/rtp-packet.h, :, HAVE_LIBRTP=no)
-AC_CHECK_HEADER(rtp/rtcp-packet.h, :, HAVE_LIBRTP=no)
-AC_CHECK_HEADER(rtp/rtp-audio.h, :, HAVE_LIBRTP=no)
-
 dnl Check for libraw1394
 AC_MSG_CHECKING(raw1394 library)
 AC_CHECK_LIB(raw1394, raw1394_get_handle, HAVE_RAW1394=yes, HAVE_RAW1394=no, )