Mercurial > jdk8-mips64-public / file comparison
comparison: common/autoconf/source-dirs.m4
common/autoconf/source-dirs.m4
- changeset 912
- a667caba1e84
- parent 839
- 174a54ce39c4
- child 1133
- 50aaf272884f
equal
deleted
inserted
replaced
| 906:40e892e2a4f2 | 912:a667caba1e84 |
|---|---|
| 78 cd "$with_add_source_root" | 78 cd "$with_add_source_root" |
| 79 ADD_SRC_ROOT="`pwd`" | 79 ADD_SRC_ROOT="`pwd`" |
| 80 cd "$CURDIR" | 80 cd "$CURDIR" |
| 81 # Verify that the addon source root does not have any root makefiles. | 81 # Verify that the addon source root does not have any root makefiles. |
| 82 # If it does, then it is usually an error, prevent this. | 82 # If it does, then it is usually an error, prevent this. |
| 83 if test -f $with_add_source_root/langtools/makefiles/Makefile || \ | 83 if test -f $with_add_source_root/langtools/make/Makefile; then |
| 84 test -f $with_add_source_root/langtools/make/Makefile; then | |
| 85 AC_MSG_ERROR([Your add source root seems to contain a full langtools repo! An add source root should only contain additional sources.]) | 84 AC_MSG_ERROR([Your add source root seems to contain a full langtools repo! An add source root should only contain additional sources.]) |
| 86 fi | 85 fi |
| 87 if test -f $with_add_source_root/corba/makefiles/Makefile || \ | 86 if test -f $with_add_source_root/corba/make/Makefile; then |
| 88 test -f $with_add_source_root/corba/make/Makefile; then | |
| 89 AC_MSG_ERROR([Your add source root seems to contain a full corba repo! An add source root should only contain additional sources.]) | 87 AC_MSG_ERROR([Your add source root seems to contain a full corba repo! An add source root should only contain additional sources.]) |
| 90 fi | 88 fi |
| 91 if test -f $with_add_source_root/jaxp/makefiles/Makefile || \ | 89 if test -f $with_add_source_root/jaxp/make/Makefile; then |
| 92 test -f $with_add_source_root/jaxp/make/Makefile; then | |
| 93 AC_MSG_ERROR([Your add source root seems to contain a full jaxp repo! An add source root should only contain additional sources.]) | 90 AC_MSG_ERROR([Your add source root seems to contain a full jaxp repo! An add source root should only contain additional sources.]) |
| 94 fi | 91 fi |
| 95 if test -f $with_add_source_root/jaxws/makefiles/Makefile || \ | 92 if test -f $with_add_source_root/jaxws/make/Makefile; then |
| 96 test -f $with_add_source_root/jaxws/make/Makefile; then | |
| 97 AC_MSG_ERROR([Your add source root seems to contain a full jaxws repo! An add source root should only contain additional sources.]) | 93 AC_MSG_ERROR([Your add source root seems to contain a full jaxws repo! An add source root should only contain additional sources.]) |
| 98 fi | 94 fi |
| 99 if test -f $with_add_source_root/hotspot/makefiles/Makefile || \ | 95 if test -f $with_add_source_root/hotspot/make/Makefile; then |
| 100 test -f $with_add_source_root/hotspot/make/Makefile; then | |
| 101 AC_MSG_ERROR([Your add source root seems to contain a full hotspot repo! An add source root should only contain additional sources.]) | 96 AC_MSG_ERROR([Your add source root seems to contain a full hotspot repo! An add source root should only contain additional sources.]) |
| 102 fi | 97 fi |
| 103 if test -f $with_add_source_root/nashorn/makefiles/Makefile || \ | 98 if test -f $with_add_source_root/nashorn/make/Makefile; then |
| 104 test -f $with_add_source_root/nashorn/make/Makefile; then | |
| 105 AC_MSG_ERROR([Your add source root seems to contain a full nashorn repo! An add source root should only contain additional sources.]) | 99 AC_MSG_ERROR([Your add source root seems to contain a full nashorn repo! An add source root should only contain additional sources.]) |
| 106 fi | 100 fi |
| 107 if test -f $with_add_source_root/jdk/makefiles/Makefile || \ | 101 if test -f $with_add_source_root/jdk/make/Makefile; then |
| 108 test -f $with_add_source_root/jdk/make/Makefile; then | |
| 109 AC_MSG_ERROR([Your add source root seems to contain a full JDK repo! An add source root should only contain additional sources.]) | 102 AC_MSG_ERROR([Your add source root seems to contain a full JDK repo! An add source root should only contain additional sources.]) |
| 110 fi | 103 fi |
| 111 fi | 104 fi |
| 112 AC_SUBST(ADD_SRC_ROOT) | 105 AC_SUBST(ADD_SRC_ROOT) |
| 113 | 106 |
| 117 fi | 110 fi |
| 118 CURDIR="$PWD" | 111 CURDIR="$PWD" |
| 119 cd "$with_override_source_root" | 112 cd "$with_override_source_root" |
| 120 OVERRIDE_SRC_ROOT="`pwd`" | 113 OVERRIDE_SRC_ROOT="`pwd`" |
| 121 cd "$CURDIR" | 114 cd "$CURDIR" |
| 122 if test -f $with_override_source_root/langtools/makefiles/Makefile || \ | 115 if test -f $with_override_source_root/langtools/make/Makefile; then |
| 123 test -f $with_override_source_root/langtools/make/Makefile; then | |
| 124 AC_MSG_ERROR([Your override source root seems to contain a full langtools repo! An override source root should only contain sources that override.]) | 116 AC_MSG_ERROR([Your override source root seems to contain a full langtools repo! An override source root should only contain sources that override.]) |
| 125 fi | 117 fi |
| 126 if test -f $with_override_source_root/corba/makefiles/Makefile || \ | 118 if test -f $with_override_source_root/corba/make/Makefile; then |
| 127 test -f $with_override_source_root/corba/make/Makefile; then | |
| 128 AC_MSG_ERROR([Your override source root seems to contain a full corba repo! An override source root should only contain sources that override.]) | 119 AC_MSG_ERROR([Your override source root seems to contain a full corba repo! An override source root should only contain sources that override.]) |
| 129 fi | 120 fi |
| 130 if test -f $with_override_source_root/jaxp/makefiles/Makefile || \ | 121 if test -f $with_override_source_root/jaxp/make/Makefile; then |
| 131 test -f $with_override_source_root/jaxp/make/Makefile; then | |
| 132 AC_MSG_ERROR([Your override source root seems to contain a full jaxp repo! An override source root should only contain sources that override.]) | 122 AC_MSG_ERROR([Your override source root seems to contain a full jaxp repo! An override source root should only contain sources that override.]) |
| 133 fi | 123 fi |
| 134 if test -f $with_override_source_root/jaxws/makefiles/Makefile || \ | 124 if test -f $with_override_source_root/jaxws/make/Makefile; then |
| 135 test -f $with_override_source_root/jaxws/make/Makefile; then | |
| 136 AC_MSG_ERROR([Your override source root seems to contain a full jaxws repo! An override source root should only contain sources that override.]) | 125 AC_MSG_ERROR([Your override source root seems to contain a full jaxws repo! An override source root should only contain sources that override.]) |
| 137 fi | 126 fi |
| 138 if test -f $with_override_source_root/hotspot/makefiles/Makefile || \ | 127 if test -f $with_override_source_root/hotspot/make/Makefile; then |
| 139 test -f $with_override_source_root/hotspot/make/Makefile; then | |
| 140 AC_MSG_ERROR([Your override source root seems to contain a full hotspot repo! An override source root should only contain sources that override.]) | 128 AC_MSG_ERROR([Your override source root seems to contain a full hotspot repo! An override source root should only contain sources that override.]) |
| 141 fi | 129 fi |
| 142 if test -f $with_override_source_root/nashorn/makefiles/Makefile || \ | 130 if test -f $with_override_source_root/nashorn/make/Makefile; then |
| 143 test -f $with_override_source_root/nashorn/make/Makefile; then | |
| 144 AC_MSG_ERROR([Your override source root seems to contain a full nashorn repo! An override source root should only contain sources that override.]) | 131 AC_MSG_ERROR([Your override source root seems to contain a full nashorn repo! An override source root should only contain sources that override.]) |
| 145 fi | 132 fi |
| 146 if test -f $with_override_source_root/jdk/makefiles/Makefile || \ | 133 if test -f $with_override_source_root/jdk/make/Makefile; then |
| 147 test -f $with_override_source_root/jdk/make/Makefile; then | |
| 148 AC_MSG_ERROR([Your override source root seems to contain a full JDK repo! An override source root should only contain sources that override.]) | 134 AC_MSG_ERROR([Your override source root seems to contain a full JDK repo! An override source root should only contain sources that override.]) |
| 149 fi | 135 fi |
| 150 fi | 136 fi |
| 151 AC_SUBST(OVERRIDE_SRC_ROOT) | 137 AC_SUBST(OVERRIDE_SRC_ROOT) |
| 152 | 138 |
| 193 if test "x$with_override_langtools" != x; then | 179 if test "x$with_override_langtools" != x; then |
| 194 CURDIR="$PWD" | 180 CURDIR="$PWD" |
| 195 cd "$with_override_langtools" | 181 cd "$with_override_langtools" |
| 196 LANGTOOLS_TOPDIR="`pwd`" | 182 LANGTOOLS_TOPDIR="`pwd`" |
| 197 cd "$CURDIR" | 183 cd "$CURDIR" |
| 198 if ! test -f $LANGTOOLS_TOPDIR/makefiles/Makefile; then | 184 if ! test -f $LANGTOOLS_TOPDIR/make/Makefile; then |
| 199 AC_MSG_ERROR([You have to override langtools with a full langtools repo!]) | 185 AC_MSG_ERROR([You have to override langtools with a full langtools repo!]) |
| 200 fi | 186 fi |
| 201 AC_MSG_CHECKING([if langtools should be overridden]) | 187 AC_MSG_CHECKING([if langtools should be overridden]) |
| 202 AC_MSG_RESULT([yes with $LANGTOOLS_TOPDIR]) | 188 AC_MSG_RESULT([yes with $LANGTOOLS_TOPDIR]) |
| 203 fi | 189 fi |
| 204 if test "x$with_override_corba" != x; then | 190 if test "x$with_override_corba" != x; then |
| 205 CURDIR="$PWD" | 191 CURDIR="$PWD" |
| 206 cd "$with_override_corba" | 192 cd "$with_override_corba" |
| 207 CORBA_TOPDIR="`pwd`" | 193 CORBA_TOPDIR="`pwd`" |
| 208 cd "$CURDIR" | 194 cd "$CURDIR" |
| 209 if ! test -f $CORBA_TOPDIR/makefiles/Makefile; then | 195 if ! test -f $CORBA_TOPDIR/make/Makefile; then |
| 210 AC_MSG_ERROR([You have to override corba with a full corba repo!]) | 196 AC_MSG_ERROR([You have to override corba with a full corba repo!]) |
| 211 fi | 197 fi |
| 212 AC_MSG_CHECKING([if corba should be overridden]) | 198 AC_MSG_CHECKING([if corba should be overridden]) |
| 213 AC_MSG_RESULT([yes with $CORBA_TOPDIR]) | 199 AC_MSG_RESULT([yes with $CORBA_TOPDIR]) |
| 214 fi | 200 fi |
| 215 if test "x$with_override_jaxp" != x; then | 201 if test "x$with_override_jaxp" != x; then |
| 216 CURDIR="$PWD" | 202 CURDIR="$PWD" |
| 217 cd "$with_override_jaxp" | 203 cd "$with_override_jaxp" |
| 218 JAXP_TOPDIR="`pwd`" | 204 JAXP_TOPDIR="`pwd`" |
| 219 cd "$CURDIR" | 205 cd "$CURDIR" |
| 220 if ! test -f $JAXP_TOPDIR/makefiles/Makefile; then | 206 if ! test -f $JAXP_TOPDIR/make/Makefile; then |
| 221 AC_MSG_ERROR([You have to override jaxp with a full jaxp repo!]) | 207 AC_MSG_ERROR([You have to override jaxp with a full jaxp repo!]) |
| 222 fi | 208 fi |
| 223 AC_MSG_CHECKING([if jaxp should be overridden]) | 209 AC_MSG_CHECKING([if jaxp should be overridden]) |
| 224 AC_MSG_RESULT([yes with $JAXP_TOPDIR]) | 210 AC_MSG_RESULT([yes with $JAXP_TOPDIR]) |
| 225 fi | 211 fi |
| 226 if test "x$with_override_jaxws" != x; then | 212 if test "x$with_override_jaxws" != x; then |
| 227 CURDIR="$PWD" | 213 CURDIR="$PWD" |
| 228 cd "$with_override_jaxws" | 214 cd "$with_override_jaxws" |
| 229 JAXWS_TOPDIR="`pwd`" | 215 JAXWS_TOPDIR="`pwd`" |
| 230 cd "$CURDIR" | 216 cd "$CURDIR" |
| 231 if ! test -f $JAXWS_TOPDIR/makefiles/Makefile; then | 217 if ! test -f $JAXWS_TOPDIR/make/Makefile; then |
| 232 AC_MSG_ERROR([You have to override jaxws with a full jaxws repo!]) | 218 AC_MSG_ERROR([You have to override jaxws with a full jaxws repo!]) |
| 233 fi | 219 fi |
| 234 AC_MSG_CHECKING([if jaxws should be overridden]) | 220 AC_MSG_CHECKING([if jaxws should be overridden]) |
| 235 AC_MSG_RESULT([yes with $JAXWS_TOPDIR]) | 221 AC_MSG_RESULT([yes with $JAXWS_TOPDIR]) |
| 236 fi | 222 fi |
| 237 if test "x$with_override_hotspot" != x; then | 223 if test "x$with_override_hotspot" != x; then |
| 238 CURDIR="$PWD" | 224 CURDIR="$PWD" |
| 239 cd "$with_override_hotspot" | 225 cd "$with_override_hotspot" |
| 240 HOTSPOT_TOPDIR="`pwd`" | 226 HOTSPOT_TOPDIR="`pwd`" |
| 241 cd "$CURDIR" | 227 cd "$CURDIR" |
| 242 if ! test -f $HOTSPOT_TOPDIR/make/Makefile && \ | 228 if ! test -f $HOTSPOT_TOPDIR/make/Makefile; then |
| 243 ! test -f $HOTSPOT_TOPDIR/makefiles/Makefile; then | |
| 244 AC_MSG_ERROR([You have to override hotspot with a full hotspot repo!]) | 229 AC_MSG_ERROR([You have to override hotspot with a full hotspot repo!]) |
| 245 fi | 230 fi |
| 246 AC_MSG_CHECKING([if hotspot should be overridden]) | 231 AC_MSG_CHECKING([if hotspot should be overridden]) |
| 247 AC_MSG_RESULT([yes with $HOTSPOT_TOPDIR]) | 232 AC_MSG_RESULT([yes with $HOTSPOT_TOPDIR]) |
| 248 fi | 233 fi |
| 249 if test "x$with_override_nashorn" != x; then | 234 if test "x$with_override_nashorn" != x; then |
| 250 CURDIR="$PWD" | 235 CURDIR="$PWD" |
| 251 cd "$with_override_nashorn" | 236 cd "$with_override_nashorn" |
| 252 NASHORN_TOPDIR="`pwd`" | 237 NASHORN_TOPDIR="`pwd`" |
| 253 cd "$CURDIR" | 238 cd "$CURDIR" |
| 254 if ! test -f $NASHORN_TOPDIR/makefiles/Makefile; then | 239 if ! test -f $NASHORN_TOPDIR/make/Makefile; then |
| 255 AC_MSG_ERROR([You have to override nashorn with a full nashorn repo!]) | 240 AC_MSG_ERROR([You have to override nashorn with a full nashorn repo!]) |
| 256 fi | 241 fi |
| 257 AC_MSG_CHECKING([if nashorn should be overridden]) | 242 AC_MSG_CHECKING([if nashorn should be overridden]) |
| 258 AC_MSG_RESULT([yes with $NASHORN_TOPDIR]) | 243 AC_MSG_RESULT([yes with $NASHORN_TOPDIR]) |
| 259 fi | 244 fi |
| 260 if test "x$with_override_jdk" != x; then | 245 if test "x$with_override_jdk" != x; then |
| 261 CURDIR="$PWD" | 246 CURDIR="$PWD" |
| 262 cd "$with_override_jdk" | 247 cd "$with_override_jdk" |
| 263 JDK_TOPDIR="`pwd`" | 248 JDK_TOPDIR="`pwd`" |
| 264 cd "$CURDIR" | 249 cd "$CURDIR" |
| 265 if ! test -f $JDK_TOPDIR/makefiles/Makefile; then | 250 if ! test -f $JDK_TOPDIR/make/Makefile; then |
| 266 AC_MSG_ERROR([You have to override JDK with a full JDK repo!]) | 251 AC_MSG_ERROR([You have to override JDK with a full JDK repo!]) |
| 267 fi | 252 fi |
| 268 AC_MSG_CHECKING([if JDK should be overridden]) | 253 AC_MSG_CHECKING([if JDK should be overridden]) |
| 269 AC_MSG_RESULT([yes with $JDK_TOPDIR]) | 254 AC_MSG_RESULT([yes with $JDK_TOPDIR]) |
| 270 fi | 255 fi |
