diff options
| author | Johann <johannkoenig@google.com> | 2012-04-02 15:08:18 -0700 |
|---|---|---|
| committer | Johann <johannkoenig@google.com> | 2012-04-02 15:57:28 -0700 |
| commit | c459d37c26ac65e95b33d71a6f61b4c851b0f3cc (patch) | |
| tree | 2bef1ce63e197f9e96c2b375090a17c4dfd9362b /build/make/configure.sh | |
| parent | 811d0ff20977968f1958314cb96f04181c2f3e61 (diff) | |
| download | libvpx-c459d37c26ac65e95b33d71a6f61b4c851b0f3cc.tar libvpx-c459d37c26ac65e95b33d71a6f61b4c851b0f3cc.tar.gz libvpx-c459d37c26ac65e95b33d71a6f61b4c851b0f3cc.tar.bz2 libvpx-c459d37c26ac65e95b33d71a6f61b4c851b0f3cc.zip | |
Allow disabling disabled codecs
When using 'make dist' after --disable-vp8[encoder|decoder] it would
fail to recognize the option. This would only occur when also specifying
--enable-install-docs and --enable-install-srcs but not
--enable-codec-srcs
Including vpx/ fixes builds with --enable-codec-srcs
vpx_timer.h is also required for vpxenc.c
Change-Id: Ie3e28b2f7ec7ee6d5961d3843f9eab869f79c35b
Diffstat (limited to 'build/make/configure.sh')
| -rwxr-xr-x | build/make/configure.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/build/make/configure.sh b/build/make/configure.sh index 51878864a..4ffef0187 100755 --- a/build/make/configure.sh +++ b/build/make/configure.sh @@ -458,9 +458,12 @@ process_common_cmdline() { eval `echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g'` if echo "${ARCH_EXT_LIST}" | grep "^ *$option\$" >/dev/null; then [ $action = "disable" ] && RTCD_OPTIONS="${RTCD_OPTIONS}${opt} " - else - echo "${CMDLINE_SELECT}" | grep "^ *$option\$" >/dev/null || - die_unknown $opt + elif [ $action = "disable" ] && ! disabled $option ; then + echo "${CMDLINE_SELECT}" | grep "^ *$option\$" >/dev/null || + die_unknown $opt + elif [ $action = "enable" ] && ! enabled $option ; then + echo "${CMDLINE_SELECT}" | grep "^ *$option\$" >/dev/null || + die_unknown $opt fi $action $option ;; |