1.1 --- a/make/common/shared/Sanity.gmk	Mon May 18 10:36:38 2009 -0700
     1.2 +++ b/make/common/shared/Sanity.gmk	Thu May 21 16:29:58 2009 +0100
     1.3 @@ -1502,6 +1502,9 @@
     1.4  # JIBX_LIBS_PATH must be valid
     1.5  ######################################################
     1.6  sane-jibx:
     1.7 +ifdef DISABLE_NIMBUS	
     1.8 +	$(call SanityWarning,Disabling Nimbus will remove public API in javax.swing.plaf.nimbus.)
     1.9 +else
    1.10  	@if [ ! -r $(subst \,/,$(JIBX_LIBS_PATH))/jibx-run.jar ]; then \
    1.11  	  $(ECHO) "ERROR: You do not have access to valid JIBX library files. \n" \
    1.12  	    "      Please check your access to \n" \
    1.13 @@ -1509,6 +1512,7 @@
    1.14  	    "      and/or check your value of ALT_JDK_DEVTOOLS_DIR, ALT_JIBX_LIBS_PATH \n" \
    1.15  	    "" >> $(ERROR_FILE) ; \
    1.16  	fi
    1.17 +endif
    1.18  
    1.19  ######################################################
    1.20  # MOZILLA_HEADERS_PATH must be valid

     2.1 --- a/make/javax/swing/plaf/Makefile	Mon May 18 10:36:38 2009 -0700
     2.2 +++ b/make/javax/swing/plaf/Makefile	Thu May 21 16:29:58 2009 +0100
     2.3 @@ -34,7 +34,9 @@
     2.4  #
     2.5  include FILES.gmk
     2.6  AUTO_FILES_JAVA_DIRS = javax/swing/plaf sun/swing com/sun/java/swing/plaf
     2.7 -SUBDIRS = nimbus
     2.8 +ifndef DISABLE_NIMBUS
     2.9 +  SUBDIRS = nimbus
    2.10 +endif
    2.11  
    2.12  # Nimbus is handled in its own directory
    2.13  AUTO_JAVA_PRUNE = nimbus

     3.1 --- a/make/tools/Makefile	Mon May 18 10:36:38 2009 -0700
     3.2 +++ b/make/tools/Makefile	Thu May 21 16:29:58 2009 +0100
     3.3 @@ -51,9 +51,12 @@
     3.4    makeclasslist             \
     3.5    strip_properties          \
     3.6    spp                       \
     3.7 -  swing-nimbus              \
     3.8    CharsetMapping
     3.9  
    3.10 +ifndef DISABLE_NIMBUS
    3.11 +  SUBDIRS += swing-nimbus
    3.12 +endif
    3.13 +
    3.14  all build clean clobber::
    3.15  	$(SUBDIRS-loop)
    3.16