Add DISABLE-BY-DEFAULT argument to GST_CHECK_FEATURE, to allow a feature to be turned off by default. Turn of XMMS c...

Original commit message from CVS:
Add DISABLE-BY-DEFAULT argument to GST_CHECK_FEATURE, to allow a feature
to be turned off by default.  Turn of XMMS check using this, rather than
a hack.  Fix display of commandline parameters for GST_CHECK_FEATURE and
GST_SUBSYSTEM_DISABLE.
This commit is contained in:
Richard Boulton 2001-06-27 15:04:03 +00:00
parent 5e29f5bbc0
commit 57db14c036
2 changed files with 10 additions and 10 deletions

View file

@ -314,20 +314,21 @@ dnl DEPENDENT-PLUGINS lists any plugins which depend on this feature.
dnl TEST-FOR-FEATURE is a test which sets HAVE_<FEATURE-NAME> to "yes" dnl TEST-FOR-FEATURE is a test which sets HAVE_<FEATURE-NAME> to "yes"
dnl or "no" depending on whether the feature is dnl or "no" depending on whether the feature is
dnl available. dnl available.
dnl DISABLE-BY-DEFAULT if "yes", the feature is disabled by default, dnl DISABLE-BY-DEFAULT if "disabled", the feature is disabled by default,
dnl if any other value, the feature is enabled by default. dnl if any other value, the feature is enabled by default.
dnl dnl
AC_DEFUN(GST_CHECK_FEATURE, AC_DEFUN(GST_CHECK_FEATURE,
[ [dnl
lower=translit([$1], A-Z, a-z) builtin(undefine, [gst_endisable])dnl
builtin(define, [gst_endisable], ifelse($5, [disabled], [enable], [disable]))dnl
AC_ARG_ENABLE(translit([$1], A-Z, a-z), AC_ARG_ENABLE(translit([$1], A-Z, a-z),
[ ]--disable-translit([$1], A-Z, a-z) enable [$2]: [$3], [ ]builtin(format, --%-26s gst_endisable %s: %s, gst_endisable-translit([$1], A-Z, a-z), [$2], [$3]),
[ case "${enableval}" in [ case "${enableval}" in
yes) USE_[$1]=yes ;; yes) USE_[$1]=yes ;;
no) USE_[$1]=no ;; no) USE_[$1]=no ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-${lower}) ;; *) AC_MSG_ERROR(bad value ${enableval} for --enable-translit([$1], A-Z, a-z)) ;;
esac], esac],
[ USE_$1=yes ]) dnl DEFAULT [ USE_$1=]ifelse($5, [disabled], [no], [yes])) dnl DEFAULT
dnl *** If it's enabled dnl *** If it's enabled
if test x$USE_[$1] = xyes; then if test x$USE_[$1] = xyes; then
@ -357,6 +358,7 @@ if test x$USE_[$1] = xno; then
fi fi
dnl *** Define the conditional as appropriate dnl *** Define the conditional as appropriate
AM_CONDITIONAL(USE_[$1], test x$USE_[$1] = xyes) AM_CONDITIONAL(USE_[$1], test x$USE_[$1] = xyes)
builtin(undefine, [gst_endisable])dnl
]) ])
dnl Perform a check for existence of ARTSC dnl Perform a check for existence of ARTSC

View file

@ -319,11 +319,9 @@ dnl Check for artsc
GST_CHECK_FEATURE(ARTS, [arts plugins], arts, [GST_CHECK_ARTS()]) GST_CHECK_FEATURE(ARTS, [arts plugins], arts, [GST_CHECK_ARTS()])
dnl Check for xmms 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, [ GST_CHECK_FEATURE(LIBXMMS, [xmms plugin], xmms, [
AM_PATH_XMMS(0.1.0, HAVE_LIBXMMS=yes, HAVE_LIBXMMS=no) AM_PATH_XMMS(0.1.0, HAVE_LIBXMMS=yes, HAVE_LIBXMMS=no)
HAVE_LIBXMMS=no ], disabled)
])
dnl Check for alsa dnl Check for alsa
GST_CHECK_FEATURE(ALSA, [alsa plugins], gstalsa, [ GST_CHECK_FEATURE(ALSA, [alsa plugins], gstalsa, [
@ -863,7 +861,7 @@ AC_DEFUN(GST_SUBSYSTEM_DISABLE,
dnl Add a subsystem --disable flag and all the necessary symbols and substitions dnl Add a subsystem --disable flag and all the necessary symbols and substitions
dnl dnl
AC_ARG_ENABLE(translit([$1], A-Z, a-z), AC_ARG_ENABLE(translit([$1], A-Z, a-z),
[ --disable-translit([$1], A-Z, a-z) disable $2], [ ]builtin(format, --disable-%-17s disable %s, translit([$1], A-Z, a-z), $2),
[ case "${enableval}" in [ case "${enableval}" in
yes) GST_DISABLE_[$1]=no ;; yes) GST_DISABLE_[$1]=no ;;
no) GST_DISABLE_[$1]=yes ;; no) GST_DISABLE_[$1]=yes ;;