diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2001-12-16 16:28:30 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2001-12-16 16:28:30 +0000 |
| commit | 9f86a214996965c77d6082f05e4587d4fab42620 (patch) | |
| tree | ee7d73542ffba91bebd0b7a5cf98d64ce419f863 /m4 | |
| parent | 426e20fb83e3f987186136f9517839cedd86d62b (diff) | |
| download | gstreamer-9f86a214996965c77d6082f05e4587d4fab42620.tar.gz | |
more fixes
Original commit message from CVS:
more fixes
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/gst-feature.m4 | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/m4/gst-feature.m4 b/m4/gst-feature.m4 index 647e15b31d..cc37f0188f 100644 --- a/m4/gst-feature.m4 +++ b/m4/gst-feature.m4 @@ -15,6 +15,8 @@ dnl on whether the feature is available. dnl dnl The macro will set USE_<FEATURE-NAME> to "yes" or "no" depending on dnl whether the feature is to be used. +dnl Thomas changed this, so that when USE_<FEATURE-NAME> was already set +dnl to no, then it stays that way. dnl dnl The macro will call AM_CONDITIONAL(USE_<<FEATURE-NAME>, ...) to allow dnl the feature to control what is built in Makefile.ams. If you want @@ -46,16 +48,29 @@ dnl GST_PLUGINS_NO will contain those that won't be built AC_DEFUN(GST_CHECK_FEATURE, [dnl builtin(define, [gst_endisable], ifelse($5, [disabled], [enable], [disable]))dnl +dnl if it is set to NO, then don't even consider it for building +NOUSE= +if test "x$USE_[$1]" = "xno"; then + NOUSE="yes" +fi AC_ARG_ENABLE(translit([$1], A-Z, a-z), [ ]builtin(format, --%-26s gst_endisable %s, gst_endisable-translit([$1], A-Z, a-z), [$2]ifelse([$3],,,: [$3])), [ case "${enableval}" in - yes) USE_[$1]=yes ;; - no) USE_[$1]=no ;; + yes) USE_[$1]=yes;; + no) USE_[$1]=no;; *) AC_MSG_ERROR(bad value ${enableval} for --enable-translit([$1], A-Z, a-z)) ;; esac], [ USE_$1=]ifelse($5, [disabled], [no], [yes])) dnl DEFAULT +dnl *** set it back to no if it was preset to no +if test "x$NOUSE" = "xyes"; then + USE_[$1]="no" + AC_MSG_WARN(*** $3 pre-configured not to be built) +fi +NOUSE= + dnl *** If it's enabled + if test x$USE_[$1] = xyes; then gst_check_save_LIBS=$LIBS gst_check_save_LDFLAGS=$LDFLAGS |