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

diff --git a/build/make/configure.sh b/build/make/configure.sh
index 51878864a3703d94ee80ad91c54b1b9c31461747..4ffef018764ae73db4a442df535abf073981c8a5 100755 (executable)
--- 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
         ;;

diff --git a/configure b/configure
index 2724c3008df4055029c2ee2774c41871a929cd63..3fbc67e4b7244dd1edda6f1a631347a3c01953f6 100755 (executable)
--- a/configure
+++ b/configure
@@ -180,6 +180,8 @@ else
 # customer environment
 [ -f ${source_path}/../include/vpx/vp8cx.h ] && CODECS="${CODECS} vp8_encoder"
 [ -f ${source_path}/../include/vpx/vp8dx.h ] && CODECS="${CODECS} vp8_decoder"
+[ -f ${source_path}/../include/vpx/vp8cx.h ] || disable vp8_encoder
+[ -f ${source_path}/../include/vpx/vp8dx.h ] || disable vp8_decoder
 
 [ -f ${source_path}/../lib/*/*mt.lib ] && soft_enable static_msvcrt
 fi

diff --git a/examples.mk b/examples.mk
index 518608d72e07cd813d0faf14cddd76cec34dd35d..b93a16b1fd951856374087c9f859ce3d2f4c19fe 100644 (file)
--- a/examples.mk
+++ b/examples.mk
@@ -32,6 +32,7 @@ vpxenc.SRCS                 += args.c args.h y4minput.c y4minput.h
 vpxenc.SRCS                 += tools_common.c tools_common.h
 vpxenc.SRCS                 += vpx_ports/mem_ops.h
 vpxenc.SRCS                 += vpx_ports/mem_ops_aligned.h
+vpxenc.SRCS                 += vpx_ports/vpx_timer.h
 vpxenc.SRCS                 += libmkv/EbmlIDs.h
 vpxenc.SRCS                 += libmkv/EbmlWriter.c
 vpxenc.SRCS                 += libmkv/EbmlWriter.h

diff --git a/vpx/vpx_codec.mk b/vpx/vpx_codec.mk
index 4f1d74bd42d55aded09895bda05ca0570a0d3036..f2500ba0094d6a52b5cec1cb2224fe3cdc19cb4b 100644 (file)
--- a/vpx/vpx_codec.mk
+++ b/vpx/vpx_codec.mk
@@ -11,12 +11,12 @@
 
 API_EXPORTS += exports
 
-API_SRCS-$(CONFIG_DECODERS) += src/vpx_decoder.c
-API_SRCS-$(CONFIG_DECODERS) += src/vpx_decoder_compat.c
-API_SRCS-$(CONFIG_DECODERS) += vpx_decoder.h
-API_SRCS-$(CONFIG_DECODERS) += vpx_decoder_compat.h
-API_SRCS-$(CONFIG_ENCODERS) += src/vpx_encoder.c
-API_SRCS-$(CONFIG_ENCODERS) += vpx_encoder.h
+API_SRCS-yes                += src/vpx_decoder.c
+API_SRCS-yes                += src/vpx_decoder_compat.c
+API_SRCS-yes                += vpx_decoder.h
+API_SRCS-yes                += vpx_decoder_compat.h
+API_SRCS-yes                += src/vpx_encoder.c
+API_SRCS-yes                += vpx_encoder.h
 API_SRCS-yes                += internal/vpx_codec_internal.h
 API_SRCS-yes                += src/vpx_codec.c
 API_SRCS-yes                += src/vpx_image.c