--- old/jdk/make/common/shared/Defs-solaris.gmk	Thu May 10 11:22:10 2012
+++ new/jdk/make/common/shared/Defs-solaris.gmk	Thu May 10 11:22:10 2012
@@ -140,10 +140,12 @@
 
 _CUPS_HEADERS_PATH=/opt/sfw/cups/include
 
+_BDB_HEADERS_PATH=/usr/include
+
 # Import JDK images allow for partial builds, components not built are
 #    imported (or copied from) these import areas when needed.
 
-# BUILD_JDK_IMPORT_PATH: location of JDK install trees to import for 
+# BUILD_JDK_IMPORT_PATH: location of JDK install trees to import for
 #   multiple platforms, e.g. windows-i586, solaris-sparc, linux-586, etc.
 ifdef ALT_BUILD_JDK_IMPORT_PATH
   BUILD_JDK_IMPORT_PATH  :=$(call FullPath,$(ALT_BUILD_JDK_IMPORT_PATH))
@@ -160,6 +162,16 @@
 endif
 JDK_IMPORT_PATH:=$(call AltCheckValue,JDK_IMPORT_PATH)
 
+# BDB_IMPORT_PATH: location of bdb pre-built/generated files
+ifndef USE_SYSTEM_BDB
+  ifdef ALT_BDB_IMPORT_PATH
+    BDB_IMPORT_PATH :=$(call FullPath,$(ALT_BDB_IMPORT_PATH))
+  else
+    BDB_IMPORT_PATH =  #$(JDK_IMPORT_PATH)   # Can't import from JDK
+  endif
+  #BDB_IMPORT_PATH:=$(call AltCheckValue,BDB_IMPORT_PATH) # TODO: disable for now
+endif
+
 # HOTSPOT_IMPORT_PATH: location of hotspot pre-built files
 ifdef ALT_HOTSPOT_IMPORT_PATH
   HOTSPOT_IMPORT_PATH :=$(call FullPath,$(ALT_HOTSPOT_IMPORT_PATH))
@@ -245,7 +257,7 @@
 )
 endef
 else
-define binary_file_verification 
+define binary_file_verification
 ( \
   $(ECHO) "Skipping binary file verification for cross-compile build" \
 )