1.1 --- a/common/autoconf/generated-configure.sh Thu Nov 21 12:28:58 2013 -0800 1.2 +++ b/common/autoconf/generated-configure.sh Thu Dec 05 15:12:22 2013 -0800 1.3 @@ -3868,7 +3868,7 @@ 1.4 #CUSTOM_AUTOCONF_INCLUDE 1.5 1.6 # Do not change or remove the following line, it is needed for consistency checks: 1.7 -DATE_WHEN_GENERATED=1383701615 1.8 +DATE_WHEN_GENERATED=1386285126 1.9 1.10 ############################################################################### 1.11 # 1.12 @@ -8096,7 +8096,7 @@ 1.13 # Test from where we are running configure, in or outside of src root. 1.14 if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \ 1.15 || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \ 1.16 - || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then 1.17 + || test "x$CURDIR" = "x$SRC_ROOT/make" ; then 1.18 # We are running configure from the src root. 1.19 # Create a default ./build/target-variant-debuglevel output root. 1.20 if test "x${CONF_NAME}" = x; then 1.21 @@ -16253,32 +16253,25 @@ 1.22 cd "$CURDIR" 1.23 # Verify that the addon source root does not have any root makefiles. 1.24 # If it does, then it is usually an error, prevent this. 1.25 - if test -f $with_add_source_root/langtools/makefiles/Makefile || \ 1.26 - test -f $with_add_source_root/langtools/make/Makefile; then 1.27 + if test -f $with_add_source_root/langtools/make/Makefile; then 1.28 as_fn_error $? "Your add source root seems to contain a full langtools repo! An add source root should only contain additional sources." "$LINENO" 5 1.29 fi 1.30 - if test -f $with_add_source_root/corba/makefiles/Makefile || \ 1.31 - test -f $with_add_source_root/corba/make/Makefile; then 1.32 + if test -f $with_add_source_root/corba/make/Makefile; then 1.33 as_fn_error $? "Your add source root seems to contain a full corba repo! An add source root should only contain additional sources." "$LINENO" 5 1.34 fi 1.35 - if test -f $with_add_source_root/jaxp/makefiles/Makefile || \ 1.36 - test -f $with_add_source_root/jaxp/make/Makefile; then 1.37 + if test -f $with_add_source_root/jaxp/make/Makefile; then 1.38 as_fn_error $? "Your add source root seems to contain a full jaxp repo! An add source root should only contain additional sources." "$LINENO" 5 1.39 fi 1.40 - if test -f $with_add_source_root/jaxws/makefiles/Makefile || \ 1.41 - test -f $with_add_source_root/jaxws/make/Makefile; then 1.42 + if test -f $with_add_source_root/jaxws/make/Makefile; then 1.43 as_fn_error $? "Your add source root seems to contain a full jaxws repo! An add source root should only contain additional sources." "$LINENO" 5 1.44 fi 1.45 - if test -f $with_add_source_root/hotspot/makefiles/Makefile || \ 1.46 - test -f $with_add_source_root/hotspot/make/Makefile; then 1.47 + if test -f $with_add_source_root/hotspot/make/Makefile; then 1.48 as_fn_error $? "Your add source root seems to contain a full hotspot repo! An add source root should only contain additional sources." "$LINENO" 5 1.49 fi 1.50 - if test -f $with_add_source_root/nashorn/makefiles/Makefile || \ 1.51 - test -f $with_add_source_root/nashorn/make/Makefile; then 1.52 + if test -f $with_add_source_root/nashorn/make/Makefile; then 1.53 as_fn_error $? "Your add source root seems to contain a full nashorn repo! An add source root should only contain additional sources." "$LINENO" 5 1.54 fi 1.55 - if test -f $with_add_source_root/jdk/makefiles/Makefile || \ 1.56 - test -f $with_add_source_root/jdk/make/Makefile; then 1.57 + if test -f $with_add_source_root/jdk/make/Makefile; then 1.58 as_fn_error $? "Your add source root seems to contain a full JDK repo! An add source root should only contain additional sources." "$LINENO" 5 1.59 fi 1.60 fi 1.61 @@ -16292,32 +16285,25 @@ 1.62 cd "$with_override_source_root" 1.63 OVERRIDE_SRC_ROOT="`pwd`" 1.64 cd "$CURDIR" 1.65 - if test -f $with_override_source_root/langtools/makefiles/Makefile || \ 1.66 - test -f $with_override_source_root/langtools/make/Makefile; then 1.67 + if test -f $with_override_source_root/langtools/make/Makefile; then 1.68 as_fn_error $? "Your override source root seems to contain a full langtools repo! An override source root should only contain sources that override." "$LINENO" 5 1.69 fi 1.70 - if test -f $with_override_source_root/corba/makefiles/Makefile || \ 1.71 - test -f $with_override_source_root/corba/make/Makefile; then 1.72 + if test -f $with_override_source_root/corba/make/Makefile; then 1.73 as_fn_error $? "Your override source root seems to contain a full corba repo! An override source root should only contain sources that override." "$LINENO" 5 1.74 fi 1.75 - if test -f $with_override_source_root/jaxp/makefiles/Makefile || \ 1.76 - test -f $with_override_source_root/jaxp/make/Makefile; then 1.77 + if test -f $with_override_source_root/jaxp/make/Makefile; then 1.78 as_fn_error $? "Your override source root seems to contain a full jaxp repo! An override source root should only contain sources that override." "$LINENO" 5 1.79 fi 1.80 - if test -f $with_override_source_root/jaxws/makefiles/Makefile || \ 1.81 - test -f $with_override_source_root/jaxws/make/Makefile; then 1.82 + if test -f $with_override_source_root/jaxws/make/Makefile; then 1.83 as_fn_error $? "Your override source root seems to contain a full jaxws repo! An override source root should only contain sources that override." "$LINENO" 5 1.84 fi 1.85 - if test -f $with_override_source_root/hotspot/makefiles/Makefile || \ 1.86 - test -f $with_override_source_root/hotspot/make/Makefile; then 1.87 + if test -f $with_override_source_root/hotspot/make/Makefile; then 1.88 as_fn_error $? "Your override source root seems to contain a full hotspot repo! An override source root should only contain sources that override." "$LINENO" 5 1.89 fi 1.90 - if test -f $with_override_source_root/nashorn/makefiles/Makefile || \ 1.91 - test -f $with_override_source_root/nashorn/make/Makefile; then 1.92 + if test -f $with_override_source_root/nashorn/make/Makefile; then 1.93 as_fn_error $? "Your override source root seems to contain a full nashorn repo! An override source root should only contain sources that override." "$LINENO" 5 1.94 fi 1.95 - if test -f $with_override_source_root/jdk/makefiles/Makefile || \ 1.96 - test -f $with_override_source_root/jdk/make/Makefile; then 1.97 + if test -f $with_override_source_root/jdk/make/Makefile; then 1.98 as_fn_error $? "Your override source root seems to contain a full JDK repo! An override source root should only contain sources that override." "$LINENO" 5 1.99 fi 1.100 fi 1.101 @@ -16396,7 +16382,7 @@ 1.102 cd "$with_override_langtools" 1.103 LANGTOOLS_TOPDIR="`pwd`" 1.104 cd "$CURDIR" 1.105 - if ! test -f $LANGTOOLS_TOPDIR/makefiles/Makefile; then 1.106 + if ! test -f $LANGTOOLS_TOPDIR/make/Makefile; then 1.107 as_fn_error $? "You have to override langtools with a full langtools repo!" "$LINENO" 5 1.108 fi 1.109 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if langtools should be overridden" >&5 1.110 @@ -16409,7 +16395,7 @@ 1.111 cd "$with_override_corba" 1.112 CORBA_TOPDIR="`pwd`" 1.113 cd "$CURDIR" 1.114 - if ! test -f $CORBA_TOPDIR/makefiles/Makefile; then 1.115 + if ! test -f $CORBA_TOPDIR/make/Makefile; then 1.116 as_fn_error $? "You have to override corba with a full corba repo!" "$LINENO" 5 1.117 fi 1.118 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if corba should be overridden" >&5 1.119 @@ -16422,7 +16408,7 @@ 1.120 cd "$with_override_jaxp" 1.121 JAXP_TOPDIR="`pwd`" 1.122 cd "$CURDIR" 1.123 - if ! test -f $JAXP_TOPDIR/makefiles/Makefile; then 1.124 + if ! test -f $JAXP_TOPDIR/make/Makefile; then 1.125 as_fn_error $? "You have to override jaxp with a full jaxp repo!" "$LINENO" 5 1.126 fi 1.127 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if jaxp should be overridden" >&5 1.128 @@ -16435,7 +16421,7 @@ 1.129 cd "$with_override_jaxws" 1.130 JAXWS_TOPDIR="`pwd`" 1.131 cd "$CURDIR" 1.132 - if ! test -f $JAXWS_TOPDIR/makefiles/Makefile; then 1.133 + if ! test -f $JAXWS_TOPDIR/make/Makefile; then 1.134 as_fn_error $? "You have to override jaxws with a full jaxws repo!" "$LINENO" 5 1.135 fi 1.136 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if jaxws should be overridden" >&5 1.137 @@ -16448,8 +16434,7 @@ 1.138 cd "$with_override_hotspot" 1.139 HOTSPOT_TOPDIR="`pwd`" 1.140 cd "$CURDIR" 1.141 - if ! test -f $HOTSPOT_TOPDIR/make/Makefile && \ 1.142 - ! test -f $HOTSPOT_TOPDIR/makefiles/Makefile; then 1.143 + if ! test -f $HOTSPOT_TOPDIR/make/Makefile; then 1.144 as_fn_error $? "You have to override hotspot with a full hotspot repo!" "$LINENO" 5 1.145 fi 1.146 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if hotspot should be overridden" >&5 1.147 @@ -16462,7 +16447,7 @@ 1.148 cd "$with_override_nashorn" 1.149 NASHORN_TOPDIR="`pwd`" 1.150 cd "$CURDIR" 1.151 - if ! test -f $NASHORN_TOPDIR/makefiles/Makefile; then 1.152 + if ! test -f $NASHORN_TOPDIR/make/Makefile; then 1.153 as_fn_error $? "You have to override nashorn with a full nashorn repo!" "$LINENO" 5 1.154 fi 1.155 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if nashorn should be overridden" >&5 1.156 @@ -16475,7 +16460,7 @@ 1.157 cd "$with_override_jdk" 1.158 JDK_TOPDIR="`pwd`" 1.159 cd "$CURDIR" 1.160 - if ! test -f $JDK_TOPDIR/makefiles/Makefile; then 1.161 + if ! test -f $JDK_TOPDIR/make/Makefile; then 1.162 as_fn_error $? "You have to override JDK with a full JDK repo!" "$LINENO" 5 1.163 fi 1.164 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if JDK should be overridden" >&5