diff --git a/build/cmake/aom_configure.cmake b/build/cmake/aom_configure.cmake
index 04c112b36963fddd4c08f8e3a9d50c458e4b1cc8..69602a52a159d648d4a2bf308a7c7f0b0f7c206d 100644
--- a/build/cmake/aom_configure.cmake
+++ b/build/cmake/aom_configure.cmake
@@ -164,10 +164,9 @@ if (CONFIG_VAR_TX_NO_TX_MODE AND NOT CONFIG_VAR_TX)
    change_config_and_warn(CONFIG_VAR_TX 1 CONFIG_VAR_TX_NO_TX_MODE)
 endif()
 
-if (CONFIG_DAALA_DCT64)
-  if (NOT CONFIG_TX64X64)
-    change_config_and_warn(CONFIG_TX64X64 1 CONFIG_DAALA_DCT64)
-   endif()
+if (CONFIG_DAALA_DCT64 AND NOT CONFIG_TX64X64)
+   message(WARNING "--- CONFIG_DAALA_DCT64 requires CONFIG_TX64X64, disabling.")
+   set(CONFIG_DAALA_DCT64 0)
 endif()
 
 if (CONFIG_DAALA_DCT4 OR CONFIG_DAALA_DCT8 OR CONFIG_DAALA_DCT16 OR
diff --git a/configure b/configure
index b75cbd7c8ec1fc95b85ac6593a16fa8c6934b6c0..abe31b8165d398b6bd4ed858180a7faebaa20256 100755
--- a/configure
+++ b/configure
@@ -568,8 +568,9 @@ post_process_cmdline() {
       log_echo "rawbits requires not ans, so disabling rawbits"
       disable_feature rawbits
     fi
-    if enabled daala_dct64; then
-      enable_feature tx64x64
+    if enabled daala_dct64 && ! enabled tx64x64; then
+      log_echo "daala_dct64 requires tx64x64, so disabling daala_dct64"
+      disable_feature daala_dct64
     fi
     if enabled daala_dct4 ||
 	    enabled daala_dct8 ||