diff -r 7eb22e81bb28 -r 0aab8d3fa11a jdk/make/common/shared/Sanity.gmk
--- a/jdk/make/common/shared/Sanity.gmk	Tue Jul 15 16:04:08 2008 +0400
+++ b/jdk/make/common/shared/Sanity.gmk	Fri Jul 18 10:48:44 2008 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2005-2007 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2005-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -91,7 +91,7 @@
       else \
 	$(ECHO) "Unknown Windows Version"; \
       fi)
-  DXSDK_VER := $(shell $(EGREP) DIRECTDRAW_VERSION $(DXSDK_INCLUDE_PATH)/ddraw.h 2>&1 | \
+  DXSDK_VER := $(shell $(EGREP) DIRECT3D_VERSION $(DXSDK_INCLUDE_PATH)/d3d9.h 2>&1 | \
     $(EGREP) "\#define" | $(NAWK) '{print $$3}')
 endif
 
@@ -1257,7 +1257,7 @@
 ######################################################
 sane-dxsdk:
 ifeq ($(PLATFORM), windows)
-	@if [ ! -r $(DXSDK_INCLUDE_PATH)/ddraw.h  ]; then \
+	@if [ ! -r $(DXSDK_INCLUDE_PATH)/d3d9.h  ]; then \
 	$(ECHO) "ERROR: You do not have access to a valid DirectX SDK Include dir.\n" \
 	  "      The value of DXSDK_INCLUDE_PATH must point a valid DX SDK dir.\n" \
 	  "      Please check your access to \n" \
@@ -1286,7 +1286,7 @@
 		"      This may result in a build failure.\n" \
 		"      The DirectX SDK Include dir was obtained from the following location:\n" \
 		" 	  $(DXSDK_INCLUDE_PATH) \n" \
-		"      Please change your DirectX SDK to version 7 or 9 (Summer 2004 Update or newer).\n" \
+		"      Please change your DirectX SDK to version 9 (Summer 2004 Update or newer).\n" \
 	        "      Microsoft DirectX 9 SDK can be downloaded from the following location:\n" \
 	        "          http://msdn.microsoft.com/library/default.asp?url=/downloads/list/directx.asp\n" \
 		"      Or  http://www.microsoft.com/directx\n" \