--- old/jdk/make/common/Sanity.gmk Thu May 10 11:22:07 2012 +++ new/jdk/make/common/Sanity.gmk Thu May 10 11:22:06 2012 @@ -76,8 +76,8 @@ # The rules sanity-* have a one-to-one correspondence with the major targets # Each sanity-* rule should have no body to ensure that the post-sanity-* is the -# last rule executed. The pre-sanity rule should be the first dependency. This design -# expects the execution of pre-sanity only once per gnumake command invocation, +# last rule executed. The pre-sanity rule should be the first dependency. This design +# expects the execution of pre-sanity only once per gnumake command invocation, # thus, info written to ERROR_FILE and/or WARNING_FILE will not be removed by subsequent # targets in the same 'gnumake' command line. @@ -97,7 +97,7 @@ sane-alsa-headers ifdef OPENJDK -sanity-all:: sane-freetype +sanity-all:: sane-freetype endif @@ -107,6 +107,13 @@ sane-cups endif +# Check Berkeley DB import library/headers +BDB_IMPORT_CHECK=true +ifeq ($(BDB_IMPORT_CHECK),true) +sanity-all:: \ + sane-libdb +endif + # Always check hotspot binary paths even if we are building them from scratch HOTSPOT_IMPORT_CHECK=true ifeq ($(HOTSPOT_IMPORT_CHECK),true)