mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-22 17:51:16 +00:00
this patch fixes arts and artsd compilation problems. this is necessary for make dist to work. i know plugins are bei...
Original commit message from CVS: this patch fixes arts and artsd compilation problems. this is necessary for make dist to work. i know plugins are being moved, though, this needs to be ported to the -plugins module. * experimental and broken selection now use GST_CHECK_FEATURE, for what it's worth * crucial fixes to arts m4's that need backporting to autostars and -plugins * make gst-feature less frantic in reporting missing plugins * cleanups and misc arts fixes
This commit is contained in:
Andy Wingo
parent
775656d35f
commit
981cf4d212
4 changed files with 31 additions and 97 deletions
115
configure.ac
115
configure.ac
|
|
@ -69,42 +69,29 @@ dnl # Super Duper options for plugin building #
|
|||
dnl ###########################################
|
||||
|
||||
dnl experimental plugins; stuff that hasn't had the dust settle yet
|
||||
AC_ARG_ENABLE(experimental,
|
||||
[ --enable-experimental enable building of experimental plugins],
|
||||
[case "${enableval}" in
|
||||
yes) EXPERIMENTAL="yes" ;;
|
||||
no) EXPERIMENTAL="no" ;;
|
||||
esac],
|
||||
[EXPERIMENTAL=no]) dnl Default value
|
||||
|
||||
if test "x$EXPERIMENTAL" = "$xyes"; then
|
||||
GST_CHECK_FEATURE(EXPERIMENTAL, [enable building of experimental plugins],,
|
||||
[HAVE_EXPERIMENTAL=yes],disabled,
|
||||
[
|
||||
AC_MSG_WARN(building experimental plugins)
|
||||
USE_LIBMIKMOD="yes"
|
||||
else
|
||||
AC_MSG_NOTICE(not building experimental plugins)
|
||||
USE_LIBMIKMOD="no"
|
||||
fi
|
||||
|
||||
dnl broken plugins; stuff that doesn't seem to build at the moment
|
||||
AC_ARG_ENABLE(broken,
|
||||
[ --enable-broken enable building of broken plugins],
|
||||
[case "${enableval}" in
|
||||
yes) BROKEN="yes" ;;
|
||||
no) BROKEN="no" ;;
|
||||
esac],
|
||||
[BROKEN=no]) dnl Default value
|
||||
|
||||
if test "x$broken-plugins" = "$xyes"; then
|
||||
AC_MSG_WARN(building broken plugins)
|
||||
USE_ARTS="yes"
|
||||
USE_ARTSC="yes"
|
||||
else
|
||||
AC_MSG_NOTICE(not building broken plugins)
|
||||
],[
|
||||
AC_MSG_NOTICE(not building experimental plugins)
|
||||
USE_LIBMIKMOD="no"
|
||||
USE_ARTS="no"
|
||||
USE_ARTSC="no"
|
||||
fi
|
||||
|
||||
])
|
||||
|
||||
dnl broken plugins; stuff that doesn't seem to build at the moment
|
||||
GST_CHECK_FEATURE(BROKEN, [enable building of broken plugins],,
|
||||
HAVE_BROKEN=yes,disabled,
|
||||
[
|
||||
AC_MSG_WARN(building broken plugins)
|
||||
AC_MSG_NOTICE(actually there are no broken plugins at the moment)
|
||||
],[
|
||||
AC_MSG_NOTICE(not building broken plugins)
|
||||
])
|
||||
|
||||
dnl ##############################
|
||||
dnl # Do automated configuration #
|
||||
|
|
@ -345,63 +332,7 @@ AC_SUBST(LIBXML_PKG)
|
|||
AC_SUBST(XML_LIBS)
|
||||
AC_SUBST(XML_CFLAGS)
|
||||
|
||||
dnl ==========================================================================
|
||||
dnl ========================= Macro definitions ==============================
|
||||
dnl ==========================================================================
|
||||
|
||||
dnl These macros should be moved out to separate files (acinclude.m4?), but
|
||||
dnl can't currently be because of the SUBSTFOR magic.
|
||||
|
||||
dnl Perform a check for existence of ARTS
|
||||
dnl Richard Boulton <richard-alsa@tartarus.org>
|
||||
dnl Last modification: 26/06/2001
|
||||
dnl GST_CHECK_FEATURE(FEATURE-NAME, FEATURE-DESCRIPTION,
|
||||
dnl DEPENDENT-PLUGINS, TEST-FOR-FEATURE)
|
||||
dnl
|
||||
dnl This check was written for GStreamer: it should be renamed and checked
|
||||
dnl for portability if you decide to use it elsewhere.
|
||||
dnl
|
||||
AC_DEFUN(GST_CHECK_ARTS,
|
||||
[
|
||||
dnl Set the flags
|
||||
ARTS_LIBS="-L/usr/local/lib -L/usr/lib -lmcop -lartsflow -lartsflow_idl"
|
||||
ARTS_CFLAGS="-I/usr/local/include/arts -I/usr/include/kde/arts -I/usr/include/arts"
|
||||
ARTS_MCOPFLAGS=$ARTS_CFLAGS
|
||||
dnl There's no arts-config script, so we make a guess based on the artsc-config
|
||||
AC_PATH_PROG(ARTSC_CONFIG, artsc-config, no)
|
||||
if test x$ARTSC_CONFIG = xyes; then
|
||||
ARTS_ARTSC_CFLAGS=`artsc-config --cflags | sed 's/artsc/arts/g'`
|
||||
ARTS_CFLAGS="$ARTS_CFLAGS $ARTS_ARTSC_CFLAGS"
|
||||
ARTS_MCOPFLAGS="$ARTS_MCOPFLAGS $ARTS_ARTSC_CFLAGS"
|
||||
fi
|
||||
AC_SUBST(ARTS_LIBS)
|
||||
AC_SUBST(ARTS_CFLAGS)
|
||||
AC_SUBST(ARTS_MCOPFLAGS)
|
||||
|
||||
dnl Now check if it exists
|
||||
AC_LANG_PUSH(C++)
|
||||
HAVE_ARTS=yes
|
||||
dnl FIXME: Can't get this test to pass, so commented it out. Rely on header check.
|
||||
dnl AC_CHECK_LIB(artsflow, convert_stereo_2float_i16le, :, HAVE_ARTS=no, $LIBS)
|
||||
|
||||
dnl AC_CHECK_HEADER uses CPPFLAGS, but not CFLAGS.
|
||||
dnl FIXME: ensure only suitable flags result from artsc-config --cflags
|
||||
AC_CHECK_HEADER(artsflow.h, :, HAVE_ARTS=no)
|
||||
|
||||
AC_LANG_POP(C++)
|
||||
dnl Check for the idl generator
|
||||
AC_CHECK_PROG(HAVE_MCOPIDL, mcopidl, yes, no)
|
||||
if test x$HAVE_MCOPIDL = xno; then
|
||||
HAVE_ARTS=no
|
||||
fi
|
||||
])
|
||||
|
||||
dnl ==========================================================================
|
||||
dnl ========================= End macro definitions ==========================
|
||||
dnl ==========================================================================
|
||||
|
||||
|
||||
dnl Next, check for the optional libraries:
|
||||
dnl Check for optional libraries
|
||||
dnl These are all libraries used in building plugins
|
||||
dnl ================================================
|
||||
dnl let's try and sort them alphabetically, shall we ?
|
||||
|
|
@ -429,12 +360,16 @@ AM_PATH_ALSA(0.9.0, HAVE_ALSA=yes, HAVE_ALSA=no)
|
|||
])
|
||||
|
||||
dnl *** arts ***
|
||||
dnl translit(dnm, m, l) AM_CONDITIONAL(USE_ARTS, true)
|
||||
dnl GST_CHECK_FEATURE(ARTS, [arts plugins], arts, [GST_CHECK_ARTS()])
|
||||
translit(dnm, m, l) AM_CONDITIONAL(USE_ARTS, true)
|
||||
GST_CHECK_FEATURE(ARTS, [arts plugins], arts, [
|
||||
AM_PATH_ARTS(, HAVE_ARTS=yes, HAVE_ARTS=no)
|
||||
])
|
||||
|
||||
dnl *** artsc ***
|
||||
dnl translit(dnm, m, l) AM_CONDITIONAL(USE_ARTSC, true)
|
||||
dnl GST_CHECK_FEATURE(ARTSC, [artsd plugins], artsdsink, [GST_CHECK_ARTSC()])
|
||||
translit(dnm, m, l) AM_CONDITIONAL(USE_ARTSC, true)
|
||||
GST_CHECK_FEATURE(ARTSC, [artsd plugins], artsdsink, [
|
||||
GST_CHECK_ARTSC()
|
||||
])
|
||||
|
||||
dnl *** audiofile ***
|
||||
dnl this check uses the GST_CHECK_CONFIGPROG macro
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ int main ()
|
|||
:
|
||||
else
|
||||
echo "*** Could not run ARTS test program, checking why..."
|
||||
CFLAGS="$CFLAGS $ARTS_CFLAGS"
|
||||
CFLAGS="$CFLAGS $ARTS_CXXFLAGS"
|
||||
LIBS="$LIBS $ARTS_LIBS"
|
||||
AC_TRY_LINK([
|
||||
#include <stdio.h>
|
||||
|
|
@ -181,11 +181,11 @@ int main ()
|
|||
LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
fi
|
||||
ARTS_CFLAGS=""
|
||||
ARTS_CXXFLAGS=""
|
||||
ARTS_LIBS=""
|
||||
ifelse([$3], , :, [$3])
|
||||
fi
|
||||
AC_SUBST(ARTS_CFLAGS)
|
||||
AC_SUBST(ARTS_CXXFLAGS)
|
||||
AC_SUBST(ARTS_LIBS)
|
||||
rm -f conf.artstest
|
||||
])
|
||||
|
|
|
|||
|
|
@ -10,8 +10,7 @@ dnl
|
|||
AC_DEFUN(GST_CHECK_ARTSC,
|
||||
[
|
||||
AC_PATH_PROG(ARTSC_CONFIG, artsc-config, no)
|
||||
if test x$ARTSC_CONFIG = xno; then
|
||||
if test x$ARTSC_CONFIG = xno; then
|
||||
if test "x$ARTSC_CONFIG" = "xno"; then
|
||||
AC_MSG_WARN([Couldn't find artsc-config])
|
||||
HAVE_ARTSC=no
|
||||
ARTSC_LIBS=
|
||||
|
|
|
|||
|
|
@ -95,8 +95,8 @@ if test x$USE_[$1] = xyes; then
|
|||
ifelse([$6], , :, [$6])
|
||||
GST_PLUGINS_YES="$GST_PLUGINS_YES \n\t[$3]"
|
||||
else
|
||||
ifelse([$3], , :, [AC_MSG_WARN(
|
||||
***** NOTE: These plugins won't be built: [$3]
|
||||
ifelse([$3], , :, [AC_MSG_NOTICE(
|
||||
These plugins will not be built: [$3]
|
||||
)])
|
||||
GST_PLUGINS_NO="$GST_PLUGINS_NO \n\t[$3]"
|
||||
ifelse([$7], , :, [$7])
|
||||
|
|
|
|||
Loading…
Reference in a new issue