diff --git a/configure b/configure
index adf11972bc50c4476f7b80d835c3f9f6dab7dd79..535103e30e93a21a54d74796941c0c9a8e7bf2bd 100755
--- a/configure
+++ b/configure
@@ -644,6 +644,8 @@ enable_option_checking
 enable_debugging
 enable_cgc
 enable_inferfn
+enable_buffrecv
+enable_datashadow
 enable_libc
 '
       ac_precious_vars='build_alias
@@ -1266,6 +1268,8 @@ Optional Features:
   --enable-debugging                enable -g when compiling
   --enable-cgc                enable -DCGC when compiling for CGC binaries
   --enable-inferfn                enable -DCGC when compiling for CGC binaries
+  --enable-buffrecv      enable -DCGC when compiling for CGC binaries
+  --enable-datashadow    enable data shadowing
   --enable-libc                enable $1 for building
 
 Some influential environment variables:
@@ -2553,6 +2557,16 @@ if test "${enable_inferfn+set}" = set; then :
   enableval=$enable_inferfn;
 fi
 
+# Check whether --enable-buffrecv was given.
+if test "${enable_buffrecv+set}" = set; then :
+  enableval=$enable_buffrecv;
+fi
+
+# Check whether --enable-datashadow was given.
+if test "${enable_datashadow+set}" = set; then :
+  enableval=$enable_datashadow;
+fi
+
 # Check whether --enable-libc was given.
 if test "${enable_libc+set}" = set; then :
   enableval=$enable_libc;
@@ -4891,7 +4905,7 @@ fi
 	fi
 }
 
-OPTIMIZE="-O3"
+OPTIMIZE="-O"
 if test "$enable_debugging" = yes; then
         OPTIMIZE="-g  -DDEBUG"
 fi
@@ -6089,6 +6103,12 @@ enable_dir watchsyscall
 enable_dir p1
 enable_dir inferfn
 enable_dir rss
+enable_dir hookdynamic
+enable_dir canaries
+enable_dir mixr
+enable_dir cookbook
+enable_dir buffrecv
+enable_dir datashadow
 
 ac_config_files="$ac_config_files Makefile"