Add temporary build options --enable-new-cache for new cache (bug 68705) and --enable-libpr0n for new image library (bug 70938). r=cls@seawood.org

config/autoconf.mk.in

@@ -332,3 +332,5 @@ MOZ_OS2_TOOLS = @MOZ_OS2_TOOLS@
 MOZ_OS2_EMX_OBJECTFORMAT = @MOZ_OS2_EMX_OBJECTFORMAT@
 
 HAVE_MOVEMAIL=@HAVE_MOVEMAIL@
+MOZ_NEW_CACHE=@MOZ_NEW_CACHE@
+USE_IMG2=@USE_IMG2@

configure.in

@@ -3774,6 +3774,24 @@ AC_ARG_ENABLE(verbose-config-defs,
 	VERBOSE_CONFIG_DEFS=
     fi])
 
+dnl New cache is not yet enabled by default.  This is a temporary
+dnl option for testing
+MOZ_ARG_ENABLE_BOOL(new-cache,
+[  --enable-new-cache      Enable new cache],
+  MOZ_NEW_CACHE=1
+  AC_DEFINE(MOZ_NEW_CACHE))
+
+AC_SUBST(MOZ_NEW_CACHE)
+
+dnl New image library is not yet enabled by default.  This is a temporary
+dnl option for testing
+MOZ_ARG_ENABLE_BOOL(libpr0n,
+[  --enable-libpr0n        Enable new image library],
+  USE_IMG2=1
+  AC_DEFINE(USE_IMG2))
+
+AC_SUBST(USE_IMG2)
+
 dnl ========================================================
 dnl =
 dnl = --diable-dtd-debug