Convert XMMS and LIBGHTTP checks to use GST_CHECK_FEATURE()

Original commit message from CVS:
Convert XMMS and LIBGHTTP checks to use GST_CHECK_FEATURE()
XMMS check is turned off by default (though not in a very neat way)

diff --git a/configure.base b/configure.base
index 0529604..1ae950d 100644 (file)
--- a/configure.base
+++ b/configure.base
@@ -318,8 +318,12 @@ GST_CHECK_FEATURE(ARTSC, [artsd plugins], artsdsink, [GST_CHECK_ARTSC()])
 dnl Check for artsc
 GST_CHECK_FEATURE(ARTS, [arts plugins], arts, [GST_CHECK_ARTS()])
 
-dnl AM_PATH_XMMS(0.1.0, HAVE_LIBXMMS=yes, HAVE_LIBXMMS=no)
-
+dnl Check for xmms
+dnl FIXME: change this check so that it is disabled by default, in a neater way
+GST_CHECK_FEATURE(LIBXMMS, [xmms plugin], xmms, [
+  AM_PATH_XMMS(0.1.0, HAVE_LIBXMMS=yes, HAVE_LIBXMMS=no)
+  HAVE_LIBXMMS=no
+])
 
 dnl Check for alsa
 GST_CHECK_FEATURE(ALSA, [alsa plugins], gstalsa, [
@@ -373,36 +377,29 @@ else
   else
     GNOME_LIBS=`gnome-config --libs gnome gnomeui`
     GNOME_CFLAGS=`gnome-config --cflags gnome gnomeui`
-    GHTTP_LIBS=`gnome-config --libs gnome gnomeui`
-    GHTTP_CFLAGS=`gnome-config --cflags gnome gnomeui`
     HAVE_GNOME=yes
   fi
 fi
 AC_SUBST(GNOME_LIBS)
 AC_SUBST(GNOME_CFLAGS)
-AC_SUBST(GHTTP_LIBS)
 
 dnl Check for libghttp
-dnl FIXME: need to check for header
-if test x$USE_GLIB2 = xyes; then
+GST_CHECK_FEATURE(LIBGHTTP, [libghttp plugins], gsthttpsrc, [
+  dnl FIXME: need to check for header
   GHTTP_LIBS=
   GST_HTTPSRC_GET_TYPE=
-  HAVE_LIBGHTTP=no
-  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
-    ],
-    [AC_MSG_WARN(Cannot find libghttp: can't build gsthttpsrc)
-     GHTTP_LIBS=
-     GST_HTTPSRC_GET_TYPE=
-     HAVE_LIBGHTTP=no
-    ],
-    $LIBS)
-fi
-AC_SUBST(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 libglade
 HAVE_LIBGLADE_GNOME="no"
@@ -716,15 +713,6 @@ AC_ARG_ENABLE(gdk-pixbuf,
 esac], 
 [USE_GDK_PIXBUF=$HAVE_GDK_PIXBUF]) dnl Default value
 
-AC_ARG_ENABLE(libghttp,
-[  --enable-libghttp            use the ghttp library, if available],
-[case "${enableval}" in
-  yes) USE_LIBGHTTP=$HAVE_LIBGHTTP ;;
-  no)  USE_LIBGHTTP=no ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-libghttp) ;;
-esac], 
-[USE_LIBGHTTP=$HAVE_LIBGHTTP]) dnl Default value
-
 AC_ARG_ENABLE(libmmx,
 [  --enable-libmmx              use libmmx, if available],
 [case "${enableval}" in
@@ -866,8 +854,8 @@ AC_ARG_ENABLE(examples,
 esac], 
 [BUILD_EXAMPLES=yes]) dnl Default value
 
-dnl Next, check for the optional cwcomponents:
-dnl ==========================================
+dnl Next, check for the optional components:
+dnl ========================================
 
 
 AC_DEFUN(GST_SUBSYSTEM_DISABLE,
@@ -892,7 +880,6 @@ AC_SUBST(GST_DISABLE_[$1]_DEFINE)
 GST_SUBSYSTEM_DISABLE_DEFINES="$GST_SUBSYTEM_DISABLE_DEFINES $GST_DISABLE_[$1]_DEFINE"
 ])
 
-
 GST_SUBSYSTEM_DISABLE(LOADSAVE,[pipeline XML load/save])
 GST_SUBSYSTEM_DISABLE(TYPEFIND,[typefind plugin],)
 GST_SUBSYSTEM_DISABLE(AUTOPLUG,[autoplugger subsystem])
@@ -1007,7 +994,6 @@ AM_CONDITIONAL(HAVE_CPU_ALPHA,      test "x$HAVE_CPU_ALPHA" = "xyes")
 AM_CONDITIONAL(HAVE_CPU_ARM,        test "x$HAVE_CPU_ARM" = "xyes")
 AM_CONDITIONAL(HAVE_CPU_SPARC,      test "x$HAVE_CPU_SPARC" = "xyes")
 AM_CONDITIONAL(HAVE_GDK_PIXBUF,     test "x$USE_GDK_PIXBUF" = "xyes")
-AM_CONDITIONAL(HAVE_LIBGHTTP,       test "x$USE_LIBGHTTP" = "xyes")
 AM_CONDITIONAL(HAVE_LIBAUDIOFILE,   test "x$HAVE_LIBAUDIOFILE" = "xyes")
 AM_CONDITIONAL(HAVE_LIBMMX,         test "x$USE_LIBMMX" = "xyes")
 AM_CONDITIONAL(HAVE_ATOMIC_H,       test "x$USE_ATOMIC_H" = "xyes")
@@ -1039,7 +1025,6 @@ AM_CONDITIONAL(HAVE_CDPARANOIA,     test "x$HAVE_CDPARANOIA" = "xyes")
 AM_CONDITIONAL(HAVE_LIBLAME,        test "x$HAVE_LIBLAME" = "xyes")
 AM_CONDITIONAL(HAVE_LIBSHOUT,       test "x$HAVE_LIBSHOUT" = "xyes")
 AM_CONDITIONAL(HAVE_MPEG2DEC,       test "x$HAVE_MPEG2DEC" = "xyes")
-AM_CONDITIONAL(HAVE_LIBXMMS,        test "x$HAVE_LIBXMMS" = "xyes")
 AM_CONDITIONAL(HAVE_LIBRTP,         test "x$HAVE_LIBRTP" = "xyes")
 AM_CONDITIONAL(HAVE_ARTS,           test "x$HAVE_ARTS" = "xyes")
 AM_CONDITIONAL(HAVE_RAW1394,        test "x$HAVE_RAW1394" = "xyes")

diff --git a/gst/elements/Makefile.am b/gst/elements/Makefile.am
index 156116a..39b4156 100644 (file)
--- a/gst/elements/Makefile.am
+++ b/gst/elements/Makefile.am
@@ -2,7 +2,7 @@ filterdir = $(libdir)/gst
 
 filter_LTLIBRARIES = libgstelements.la
 
-if HAVE_LIBGHTTP
+if USE_LIBGHTTP
 GSTHTTPSRC=gsthttpsrc.c
 else
 GSTHTTPSRC=

diff --git a/plugins/elements/Makefile.am b/plugins/elements/Makefile.am
index 156116a..39b4156 100644 (file)
--- a/plugins/elements/Makefile.am
+++ b/plugins/elements/Makefile.am
@@ -2,7 +2,7 @@ filterdir = $(libdir)/gst
 
 filter_LTLIBRARIES = libgstelements.la
 
-if HAVE_LIBGHTTP
+if USE_LIBGHTTP
 GSTHTTPSRC=gsthttpsrc.c
 else
 GSTHTTPSRC=