1.1 --- a/common/autoconf/generated-configure.sh Tue Oct 22 13:56:11 2013 -0700
1.2 +++ b/common/autoconf/generated-configure.sh Tue Oct 22 14:53:08 2013 -0700
1.3 @@ -1716,9 +1716,9 @@
1.4 --disable-debug-symbols disable generation of debug symbols [enabled]
1.5 --disable-zip-debug-info
1.6 disable zipping of debug-info files [enabled]
1.7 - --disable-macosx-runtime-support
1.8 - disable the use of MacOSX Java runtime support
1.9 - framework [enabled]
1.10 + --enable-macosx-runtime-support
1.11 + Deprecated. Option is kept for backwards
1.12 + compatibility and is ignored
1.13 --enable-sjavac use sjavac to do fast incremental compiles
1.14 [disabled]
1.15 --disable-precompiled-headers
1.16 @@ -3149,6 +3149,11 @@
1.17 # $1: The name of the with argument to deprecate, not including --with-
1.18
1.19
1.20 +# Register a --enable argument but mark it as deprecated
1.21 +# $1: The name of the with argument to deprecate, not including --enable-
1.22 +# $2: The name of the argument to deprecate, in shell variable style (i.e. with _ instead of -)
1.23 +
1.24 +
1.25
1.26
1.27 # Test that variable $1 denoting a program is not empty. If empty, exit with an error.
1.28 @@ -3444,16 +3449,42 @@
1.29 cygwin_help() {
1.30 case $1 in
1.31 unzip)
1.32 - PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P unzip" ;;
1.33 + PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P unzip )"
1.34 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.35 + ;;
1.36 zip)
1.37 - PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P zip" ;;
1.38 + PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P zip )"
1.39 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.40 + ;;
1.41 make)
1.42 - PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P make" ;;
1.43 + PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P make )"
1.44 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.45 + ;;
1.46 + freetype2)
1.47 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.48 + HELP_MSG="To install freetype, run:
1.49 +wget \"http://gnuwin32.sourceforge.net/downlinks/freetype.php\" -O /tmp/freetype-setup.exe
1.50 +chmod +x /tmp/freetype-setup.exe
1.51 +/tmp/freetype-setup.exe
1.52 +Follow GUI prompts, and install to default directory \"C:\Program Files (x86)\GnuWin32\".
1.53 +After installation, locate lib/libfreetype.dll.a and make a copy with the name freetype.dll."
1.54 + else
1.55 + HELP_MSG="You need to build a 64-bit version of freetype.
1.56 +This is not readily available.
1.57 +You can find source code and build instructions on
1.58 +http://www.freetype.org/
1.59 +If you put the resulting build in \"C:\Program Files\GnuWin32\", it will be found automatically."
1.60 + fi
1.61 + ;;
1.62 * )
1.63 break ;;
1.64 esac
1.65 }
1.66
1.67 +msys_help() {
1.68 + PKGHANDLER_COMMAND=""
1.69 +}
1.70 +
1.71 apt_help() {
1.72 case $1 in
1.73 devkit)
1.74 @@ -3813,13 +3844,17 @@
1.75
1.76
1.77
1.78 +
1.79 +
1.80 +
1.81 +
1.82 # This line needs to be here, verbatim, after all includes and the dummy hook
1.83 # definitions. It is replaced with custom functionality when building
1.84 # custom sources.
1.85 #CUSTOM_AUTOCONF_INCLUDE
1.86
1.87 # Do not change or remove the following line, it is needed for consistency checks:
1.88 -DATE_WHEN_GENERATED=1381407169
1.89 +DATE_WHEN_GENERATED=1382437436
1.90
1.91 ###############################################################################
1.92 #
1.93 @@ -8270,7 +8305,7 @@
1.94 { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5
1.95 $as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;}
1.96 else
1.97 - IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '3.8[12346789]'`
1.98 + IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '\(3\.8[12]\)\|\(4\.\)'`
1.99 if test "x$IS_MODERN_MAKE" = x; then
1.100 { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&5
1.101 $as_echo "$as_me: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&6;}
1.102 @@ -8627,7 +8662,7 @@
1.103 { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5
1.104 $as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;}
1.105 else
1.106 - IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '3.8[12346789]'`
1.107 + IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '\(3\.8[12]\)\|\(4\.\)'`
1.108 if test "x$IS_MODERN_MAKE" = x; then
1.109 { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&5
1.110 $as_echo "$as_me: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&6;}
1.111 @@ -8981,7 +9016,7 @@
1.112 { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5
1.113 $as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;}
1.114 else
1.115 - IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '3.8[12346789]'`
1.116 + IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '\(3\.8[12]\)\|\(4\.\)'`
1.117 if test "x$IS_MODERN_MAKE" = x; then
1.118 { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&5
1.119 $as_echo "$as_me: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&6;}
1.120 @@ -9340,7 +9375,7 @@
1.121 { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5
1.122 $as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;}
1.123 else
1.124 - IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '3.8[12346789]'`
1.125 + IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '\(3\.8[12]\)\|\(4\.\)'`
1.126 if test "x$IS_MODERN_MAKE" = x; then
1.127 { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&5
1.128 $as_echo "$as_me: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&6;}
1.129 @@ -9693,7 +9728,7 @@
1.130 { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5
1.131 $as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;}
1.132 else
1.133 - IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '3.8[12346789]'`
1.134 + IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '\(3\.8[12]\)\|\(4\.\)'`
1.135 if test "x$IS_MODERN_MAKE" = x; then
1.136 { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&5
1.137 $as_echo "$as_me: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&6;}
1.138 @@ -15778,25 +15813,32 @@
1.139 # Print a helpful message on how to acquire the necessary build dependency.
1.140 # openjdk is the help tag: freetyp2, cups, pulse, alsa etc
1.141 MISSING_DEPENDENCY=openjdk
1.142 - PKGHANDLER_COMMAND=
1.143 -
1.144 - case $PKGHANDLER in
1.145 - apt-get)
1.146 - apt_help $MISSING_DEPENDENCY ;;
1.147 - yum)
1.148 - yum_help $MISSING_DEPENDENCY ;;
1.149 - port)
1.150 - port_help $MISSING_DEPENDENCY ;;
1.151 - pkgutil)
1.152 - pkgutil_help $MISSING_DEPENDENCY ;;
1.153 - pkgadd)
1.154 - pkgadd_help $MISSING_DEPENDENCY ;;
1.155 - * )
1.156 - break ;;
1.157 - esac
1.158 -
1.159 - if test "x$PKGHANDLER_COMMAND" != x; then
1.160 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.161 +
1.162 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.163 + cygwin_help $MISSING_DEPENDENCY
1.164 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.165 + msys_help $MISSING_DEPENDENCY
1.166 + else
1.167 + PKGHANDLER_COMMAND=
1.168 +
1.169 + case $PKGHANDLER in
1.170 + apt-get)
1.171 + apt_help $MISSING_DEPENDENCY ;;
1.172 + yum)
1.173 + yum_help $MISSING_DEPENDENCY ;;
1.174 + port)
1.175 + port_help $MISSING_DEPENDENCY ;;
1.176 + pkgutil)
1.177 + pkgutil_help $MISSING_DEPENDENCY ;;
1.178 + pkgadd)
1.179 + pkgadd_help $MISSING_DEPENDENCY ;;
1.180 + * )
1.181 + break ;;
1.182 + esac
1.183 +
1.184 + if test "x$PKGHANDLER_COMMAND" != x; then
1.185 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.186 + fi
1.187 fi
1.188
1.189 { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find a valid Boot JDK. $HELP_MSG" >&5
1.190 @@ -17474,63 +17516,303 @@
1.191 as_fn_error $? "Cannot continue" "$LINENO" 5
1.192 fi
1.193
1.194 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
1.195 -$as_echo_n "checking for msvcr100.dll... " >&6; }
1.196 +
1.197
1.198 # Check whether --with-msvcr-dll was given.
1.199 if test "${with_msvcr_dll+set}" = set; then :
1.200 withval=$with_msvcr_dll;
1.201 fi
1.202
1.203 +
1.204 if test "x$with_msvcr_dll" != x; then
1.205 - MSVCR_DLL="$with_msvcr_dll"
1.206 - else
1.207 + # If given explicitely by user, do not probe. If not present, fail directly.
1.208 +
1.209 + POSSIBLE_MSVCR_DLL="$with_msvcr_dll"
1.210 + METHOD="--with-msvcr-dll"
1.211 + if test -e "$POSSIBLE_MSVCR_DLL"; then
1.212 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&5
1.213 +$as_echo "$as_me: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&6;}
1.214 +
1.215 + # Need to check if the found msvcr is correct architecture
1.216 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
1.217 +$as_echo_n "checking found msvcr100.dll architecture... " >&6; }
1.218 + MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
1.219 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.220 + CORRECT_MSVCR_ARCH=386
1.221 + else
1.222 + CORRECT_MSVCR_ARCH=x86-64
1.223 + fi
1.224 + if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
1.225 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.226 +$as_echo "ok" >&6; }
1.227 + MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.228 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
1.229 +$as_echo_n "checking for msvcr100.dll... " >&6; }
1.230 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5
1.231 +$as_echo "$MSVCR_DLL" >&6; }
1.232 + else
1.233 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
1.234 +$as_echo "incorrect, ignoring" >&6; }
1.235 + { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&5
1.236 +$as_echo "$as_me: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&6;}
1.237 + fi
1.238 + fi
1.239 +
1.240 + if test "x$MSVCR_DLL" = x; then
1.241 + as_fn_error $? "Could not find a proper msvcr100.dll as specified by --with-msvcr-dll" "$LINENO" 5
1.242 + fi
1.243 + fi
1.244 +
1.245 + if test "x$MSVCR_DLL" = x; then
1.246 + # Probe: Using well-known location from Visual Studio 10.0
1.247 if test "x$VCINSTALLDIR" != x; then
1.248 + CYGWIN_VC_INSTALL_DIR="$VCINSTALLDIR"
1.249 +
1.250 + windows_path="$CYGWIN_VC_INSTALL_DIR"
1.251 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.252 + unix_path=`$CYGPATH -u "$windows_path"`
1.253 + CYGWIN_VC_INSTALL_DIR="$unix_path"
1.254 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.255 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.256 + CYGWIN_VC_INSTALL_DIR="$unix_path"
1.257 + fi
1.258 +
1.259 if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
1.260 - MSVCR_DLL=`find "$VCINSTALLDIR" -name msvcr100.dll | grep x64 | head --lines 1`
1.261 - else
1.262 - MSVCR_DLL=`find "$VCINSTALLDIR" -name msvcr100.dll | grep x86 | grep -v ia64 | grep -v x64 | head --lines 1`
1.263 - if test "x$MSVCR_DLL" = x; then
1.264 - MSVCR_DLL=`find "$VCINSTALLDIR" -name msvcr100.dll | head --lines 1`
1.265 - fi
1.266 - fi
1.267 - if test "x$MSVCR_DLL" != x; then
1.268 - { $as_echo "$as_me:${as_lineno-$LINENO}: msvcr100.dll found in VCINSTALLDIR: $VCINSTALLDIR" >&5
1.269 -$as_echo "$as_me: msvcr100.dll found in VCINSTALLDIR: $VCINSTALLDIR" >&6;}
1.270 - else
1.271 - { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: msvcr100.dll not found in VCINSTALLDIR: $VCINSTALLDIR" >&5
1.272 -$as_echo "$as_me: Warning: msvcr100.dll not found in VCINSTALLDIR: $VCINSTALLDIR" >&6;}
1.273 - fi
1.274 - fi
1.275 - # Try some fallback alternatives
1.276 - if test "x$MSVCR_DLL" = x; then
1.277 - # If visual studio express is installed, there is usually one with the debugger
1.278 - if test "x$VS100COMNTOOLS" != x; then
1.279 - if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
1.280 - MSVCR_DLL=`find "$VS100COMNTOOLS/.." -name msvcr100.dll | grep -i x64 | head --lines 1`
1.281 - { $as_echo "$as_me:${as_lineno-$LINENO}: msvcr100.dll found in $VS100COMNTOOLS..: $VS100COMNTOOLS.." >&5
1.282 -$as_echo "$as_me: msvcr100.dll found in $VS100COMNTOOLS..: $VS100COMNTOOLS.." >&6;}
1.283 - fi
1.284 - fi
1.285 - fi
1.286 - if test "x$MSVCR_DLL" = x; then
1.287 - if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.288 - # Fallback for 32bit builds, look in the windows directory.
1.289 - if test -f "$SYSTEMROOT/system32/msvcr100.dll"; then
1.290 - { $as_echo "$as_me:${as_lineno-$LINENO}: msvcr100.dll found in $SYSTEMROOT/system32" >&5
1.291 -$as_echo "$as_me: msvcr100.dll found in $SYSTEMROOT/system32" >&6;}
1.292 - MSVCR_DLL="$SYSTEMROOT/system32/msvcr100.dll"
1.293 - fi
1.294 - fi
1.295 - fi
1.296 - fi
1.297 + POSSIBLE_MSVCR_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x64/Microsoft.VC100.CRT/msvcr100.dll"
1.298 + else
1.299 + POSSIBLE_MSVCR_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x86/Microsoft.VC100.CRT/msvcr100.dll"
1.300 + fi
1.301 +
1.302 + POSSIBLE_MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.303 + METHOD="well-known location in VCINSTALLDIR"
1.304 + if test -e "$POSSIBLE_MSVCR_DLL"; then
1.305 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&5
1.306 +$as_echo "$as_me: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&6;}
1.307 +
1.308 + # Need to check if the found msvcr is correct architecture
1.309 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
1.310 +$as_echo_n "checking found msvcr100.dll architecture... " >&6; }
1.311 + MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
1.312 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.313 + CORRECT_MSVCR_ARCH=386
1.314 + else
1.315 + CORRECT_MSVCR_ARCH=x86-64
1.316 + fi
1.317 + if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
1.318 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.319 +$as_echo "ok" >&6; }
1.320 + MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.321 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
1.322 +$as_echo_n "checking for msvcr100.dll... " >&6; }
1.323 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5
1.324 +$as_echo "$MSVCR_DLL" >&6; }
1.325 + else
1.326 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
1.327 +$as_echo "incorrect, ignoring" >&6; }
1.328 + { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&5
1.329 +$as_echo "$as_me: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&6;}
1.330 + fi
1.331 + fi
1.332 +
1.333 + fi
1.334 + fi
1.335 +
1.336 if test "x$MSVCR_DLL" = x; then
1.337 + # Probe: Check in the Boot JDK directory.
1.338 + POSSIBLE_MSVCR_DLL="$BOOT_JDK/bin/msvcr100.dll"
1.339 +
1.340 + POSSIBLE_MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.341 + METHOD="well-known location in Boot JDK"
1.342 + if test -e "$POSSIBLE_MSVCR_DLL"; then
1.343 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&5
1.344 +$as_echo "$as_me: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&6;}
1.345 +
1.346 + # Need to check if the found msvcr is correct architecture
1.347 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
1.348 +$as_echo_n "checking found msvcr100.dll architecture... " >&6; }
1.349 + MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
1.350 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.351 + CORRECT_MSVCR_ARCH=386
1.352 + else
1.353 + CORRECT_MSVCR_ARCH=x86-64
1.354 + fi
1.355 + if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
1.356 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.357 +$as_echo "ok" >&6; }
1.358 + MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.359 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
1.360 +$as_echo_n "checking for msvcr100.dll... " >&6; }
1.361 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5
1.362 +$as_echo "$MSVCR_DLL" >&6; }
1.363 + else
1.364 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
1.365 +$as_echo "incorrect, ignoring" >&6; }
1.366 + { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&5
1.367 +$as_echo "$as_me: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&6;}
1.368 + fi
1.369 + fi
1.370 +
1.371 + fi
1.372 +
1.373 + if test "x$MSVCR_DLL" = x; then
1.374 + # Probe: Look in the Windows system32 directory
1.375 + CYGWIN_SYSTEMROOT="$SYSTEMROOT"
1.376 +
1.377 + windows_path="$CYGWIN_SYSTEMROOT"
1.378 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.379 + unix_path=`$CYGPATH -u "$windows_path"`
1.380 + CYGWIN_SYSTEMROOT="$unix_path"
1.381 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.382 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.383 + CYGWIN_SYSTEMROOT="$unix_path"
1.384 + fi
1.385 +
1.386 + POSSIBLE_MSVCR_DLL="$CYGWIN_SYSTEMROOT/system32/msvcr100.dll"
1.387 +
1.388 + POSSIBLE_MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.389 + METHOD="well-known location in SYSTEMROOT"
1.390 + if test -e "$POSSIBLE_MSVCR_DLL"; then
1.391 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&5
1.392 +$as_echo "$as_me: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&6;}
1.393 +
1.394 + # Need to check if the found msvcr is correct architecture
1.395 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
1.396 +$as_echo_n "checking found msvcr100.dll architecture... " >&6; }
1.397 + MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
1.398 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.399 + CORRECT_MSVCR_ARCH=386
1.400 + else
1.401 + CORRECT_MSVCR_ARCH=x86-64
1.402 + fi
1.403 + if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
1.404 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.405 +$as_echo "ok" >&6; }
1.406 + MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.407 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
1.408 +$as_echo_n "checking for msvcr100.dll... " >&6; }
1.409 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5
1.410 +$as_echo "$MSVCR_DLL" >&6; }
1.411 + else
1.412 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
1.413 +$as_echo "incorrect, ignoring" >&6; }
1.414 + { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&5
1.415 +$as_echo "$as_me: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&6;}
1.416 + fi
1.417 + fi
1.418 +
1.419 + fi
1.420 +
1.421 + if test "x$MSVCR_DLL" = x; then
1.422 + # Probe: If Visual Studio Express is installed, there is usually one with the debugger
1.423 + if test "x$VS100COMNTOOLS" != x; then
1.424 + CYGWIN_VS_TOOLS_DIR="$VS100COMNTOOLS/.."
1.425 +
1.426 + windows_path="$CYGWIN_VS_TOOLS_DIR"
1.427 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.428 + unix_path=`$CYGPATH -u "$windows_path"`
1.429 + CYGWIN_VS_TOOLS_DIR="$unix_path"
1.430 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.431 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.432 + CYGWIN_VS_TOOLS_DIR="$unix_path"
1.433 + fi
1.434 +
1.435 + if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
1.436 + POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name msvcr100.dll | $GREP -i /x64/ | $HEAD --lines 1`
1.437 + else
1.438 + POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name msvcr100.dll | $GREP -i /x86/ | $HEAD --lines 1`
1.439 + fi
1.440 +
1.441 + POSSIBLE_MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.442 + METHOD="search of VS100COMNTOOLS"
1.443 + if test -e "$POSSIBLE_MSVCR_DLL"; then
1.444 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&5
1.445 +$as_echo "$as_me: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&6;}
1.446 +
1.447 + # Need to check if the found msvcr is correct architecture
1.448 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
1.449 +$as_echo_n "checking found msvcr100.dll architecture... " >&6; }
1.450 + MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
1.451 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.452 + CORRECT_MSVCR_ARCH=386
1.453 + else
1.454 + CORRECT_MSVCR_ARCH=x86-64
1.455 + fi
1.456 + if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
1.457 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.458 +$as_echo "ok" >&6; }
1.459 + MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.460 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
1.461 +$as_echo_n "checking for msvcr100.dll... " >&6; }
1.462 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5
1.463 +$as_echo "$MSVCR_DLL" >&6; }
1.464 + else
1.465 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
1.466 +$as_echo "incorrect, ignoring" >&6; }
1.467 + { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&5
1.468 +$as_echo "$as_me: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&6;}
1.469 + fi
1.470 + fi
1.471 +
1.472 + fi
1.473 + fi
1.474 +
1.475 + if test "x$MSVCR_DLL" = x; then
1.476 + # Probe: Search wildly in the VCINSTALLDIR. We've probably lost by now.
1.477 + # (This was the original behaviour; kept since it might turn up something)
1.478 + if test "x$CYGWIN_VC_INSTALL_DIR" != x; then
1.479 + if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
1.480 + POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcr100.dll | $GREP x64 | $HEAD --lines 1`
1.481 + else
1.482 + POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcr100.dll | $GREP x86 | $GREP -v ia64 | $GREP -v x64 | $HEAD --lines 1`
1.483 + if test "x$POSSIBLE_MSVCR_DLL" = x; then
1.484 + # We're grasping at straws now...
1.485 + POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcr100.dll | $HEAD --lines 1`
1.486 + fi
1.487 + fi
1.488 +
1.489 +
1.490 + POSSIBLE_MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.491 + METHOD="search of VCINSTALLDIR"
1.492 + if test -e "$POSSIBLE_MSVCR_DLL"; then
1.493 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&5
1.494 +$as_echo "$as_me: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&6;}
1.495 +
1.496 + # Need to check if the found msvcr is correct architecture
1.497 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
1.498 +$as_echo_n "checking found msvcr100.dll architecture... " >&6; }
1.499 + MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
1.500 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.501 + CORRECT_MSVCR_ARCH=386
1.502 + else
1.503 + CORRECT_MSVCR_ARCH=x86-64
1.504 + fi
1.505 + if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
1.506 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.507 +$as_echo "ok" >&6; }
1.508 + MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.509 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
1.510 +$as_echo_n "checking for msvcr100.dll... " >&6; }
1.511 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5
1.512 +$as_echo "$MSVCR_DLL" >&6; }
1.513 + else
1.514 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
1.515 +$as_echo "incorrect, ignoring" >&6; }
1.516 + { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&5
1.517 +$as_echo "$as_me: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&6;}
1.518 + fi
1.519 + fi
1.520 +
1.521 + fi
1.522 + fi
1.523 +
1.524 + if test "x$MSVCR_DLL" = x; then
1.525 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
1.526 +$as_echo_n "checking for msvcr100.dll... " >&6; }
1.527 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.528 $as_echo "no" >&6; }
1.529 - as_fn_error $? "Could not find msvcr100.dll !" "$LINENO" 5
1.530 - fi
1.531 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5
1.532 -$as_echo "$MSVCR_DLL" >&6; }
1.533 + as_fn_error $? "Could not find msvcr100.dll. Please specify using --with-msvcr-dll." "$LINENO" 5
1.534 + fi
1.535 +
1.536
1.537 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.538
1.539 @@ -18935,25 +19217,32 @@
1.540 # Print a helpful message on how to acquire the necessary build dependency.
1.541 # devkit is the help tag: freetyp2, cups, pulse, alsa etc
1.542 MISSING_DEPENDENCY=devkit
1.543 - PKGHANDLER_COMMAND=
1.544 -
1.545 - case $PKGHANDLER in
1.546 - apt-get)
1.547 - apt_help $MISSING_DEPENDENCY ;;
1.548 - yum)
1.549 - yum_help $MISSING_DEPENDENCY ;;
1.550 - port)
1.551 - port_help $MISSING_DEPENDENCY ;;
1.552 - pkgutil)
1.553 - pkgutil_help $MISSING_DEPENDENCY ;;
1.554 - pkgadd)
1.555 - pkgadd_help $MISSING_DEPENDENCY ;;
1.556 - * )
1.557 - break ;;
1.558 - esac
1.559 -
1.560 - if test "x$PKGHANDLER_COMMAND" != x; then
1.561 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.562 +
1.563 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.564 + cygwin_help $MISSING_DEPENDENCY
1.565 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.566 + msys_help $MISSING_DEPENDENCY
1.567 + else
1.568 + PKGHANDLER_COMMAND=
1.569 +
1.570 + case $PKGHANDLER in
1.571 + apt-get)
1.572 + apt_help $MISSING_DEPENDENCY ;;
1.573 + yum)
1.574 + yum_help $MISSING_DEPENDENCY ;;
1.575 + port)
1.576 + port_help $MISSING_DEPENDENCY ;;
1.577 + pkgutil)
1.578 + pkgutil_help $MISSING_DEPENDENCY ;;
1.579 + pkgadd)
1.580 + pkgadd_help $MISSING_DEPENDENCY ;;
1.581 + * )
1.582 + break ;;
1.583 + esac
1.584 +
1.585 + if test "x$PKGHANDLER_COMMAND" != x; then
1.586 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.587 + fi
1.588 fi
1.589
1.590 as_fn_error $? "Could not find a $COMPILER_NAME compiler. $HELP_MSG" "$LINENO" 5
1.591 @@ -20507,25 +20796,32 @@
1.592 # Print a helpful message on how to acquire the necessary build dependency.
1.593 # devkit is the help tag: freetyp2, cups, pulse, alsa etc
1.594 MISSING_DEPENDENCY=devkit
1.595 - PKGHANDLER_COMMAND=
1.596 -
1.597 - case $PKGHANDLER in
1.598 - apt-get)
1.599 - apt_help $MISSING_DEPENDENCY ;;
1.600 - yum)
1.601 - yum_help $MISSING_DEPENDENCY ;;
1.602 - port)
1.603 - port_help $MISSING_DEPENDENCY ;;
1.604 - pkgutil)
1.605 - pkgutil_help $MISSING_DEPENDENCY ;;
1.606 - pkgadd)
1.607 - pkgadd_help $MISSING_DEPENDENCY ;;
1.608 - * )
1.609 - break ;;
1.610 - esac
1.611 -
1.612 - if test "x$PKGHANDLER_COMMAND" != x; then
1.613 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.614 +
1.615 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.616 + cygwin_help $MISSING_DEPENDENCY
1.617 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.618 + msys_help $MISSING_DEPENDENCY
1.619 + else
1.620 + PKGHANDLER_COMMAND=
1.621 +
1.622 + case $PKGHANDLER in
1.623 + apt-get)
1.624 + apt_help $MISSING_DEPENDENCY ;;
1.625 + yum)
1.626 + yum_help $MISSING_DEPENDENCY ;;
1.627 + port)
1.628 + port_help $MISSING_DEPENDENCY ;;
1.629 + pkgutil)
1.630 + pkgutil_help $MISSING_DEPENDENCY ;;
1.631 + pkgadd)
1.632 + pkgadd_help $MISSING_DEPENDENCY ;;
1.633 + * )
1.634 + break ;;
1.635 + esac
1.636 +
1.637 + if test "x$PKGHANDLER_COMMAND" != x; then
1.638 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.639 + fi
1.640 fi
1.641
1.642 as_fn_error $? "Could not find a $COMPILER_NAME compiler. $HELP_MSG" "$LINENO" 5
1.643 @@ -29688,8 +29984,8 @@
1.644 FREETYPE2_NOT_NEEDED=yes
1.645 # If the java runtime framework is disabled, then we need X11.
1.646 # This will be adjusted below.
1.647 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse x11" >&5
1.648 -$as_echo "alsa pulse x11" >&6; }
1.649 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse x11 freetype" >&5
1.650 +$as_echo "alsa pulse x11 freetype" >&6; }
1.651 fi
1.652
1.653 if test "x$OPENJDK_TARGET_OS" = xbsd; then
1.654 @@ -29710,44 +30006,31 @@
1.655
1.656 ###############################################################################
1.657 #
1.658 - # Check for MacOSX support for OpenJDK. If this exists, try to build a JVM
1.659 - # that uses this API.
1.660 - #
1.661 + # Check for MacOSX support for OpenJDK.
1.662 + #
1.663 +
1.664 +
1.665 # Check whether --enable-macosx-runtime-support was given.
1.666 if test "${enable_macosx_runtime_support+set}" = set; then :
1.667 - enableval=$enable_macosx_runtime_support; MACOSX_RUNTIME_SUPPORT="${enableval}"
1.668 -else
1.669 - MACOSX_RUNTIME_SUPPORT="no"
1.670 -fi
1.671 -
1.672 -
1.673 - USE_MACOSX_RUNTIME_SUPPORT=no
1.674 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for explicit Java runtime support in the OS" >&5
1.675 -$as_echo_n "checking for explicit Java runtime support in the OS... " >&6; }
1.676 + enableval=$enable_macosx_runtime_support;
1.677 +fi
1.678 +
1.679 + if test "x$enable_macosx_runtime_support" != x; then
1.680 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --enable-macosx-runtime-support is deprecated and will be ignored." >&5
1.681 +$as_echo "$as_me: WARNING: Option --enable-macosx-runtime-support is deprecated and will be ignored." >&2;}
1.682 + fi
1.683 +
1.684 +
1.685 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mac OS X Java Framework" >&5
1.686 +$as_echo_n "checking for Mac OS X Java Framework... " >&6; }
1.687 if test -f /System/Library/Frameworks/JavaVM.framework/Frameworks/JavaRuntimeSupport.framework/Headers/JavaRuntimeSupport.h; then
1.688 - if test "x$MACOSX_RUNTIME_SUPPORT" != xno; then
1.689 - MACOSX_RUNTIME_SUPPORT=yes
1.690 - USE_MACOSX_RUNTIME_SUPPORT=yes
1.691 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, does not need alsa freetype2 pulse and X11" >&5
1.692 -$as_echo "yes, does not need alsa freetype2 pulse and X11" >&6; }
1.693 - else
1.694 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, but explicitly disabled." >&5
1.695 -$as_echo "yes, but explicitly disabled." >&6; }
1.696 - fi
1.697 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: /System/Library/Frameworks/JavaVM.framework" >&5
1.698 +$as_echo "/System/Library/Frameworks/JavaVM.framework" >&6; }
1.699 else
1.700 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.701 $as_echo "no" >&6; }
1.702 fi
1.703
1.704 - if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$USE_MACOSX_RUNTIME_SUPPORT" = xno; then
1.705 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on an X11 build on MacOSX?" >&5
1.706 -$as_echo_n "checking what is not needed on an X11 build on MacOSX?... " >&6; }
1.707 - X11_NOT_NEEDED=
1.708 - FREETYPE2_NOT_NEEDED=
1.709 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5
1.710 -$as_echo "alsa pulse" >&6; }
1.711 - fi
1.712 -
1.713
1.714
1.715 ###############################################################################
1.716 @@ -30473,25 +30756,32 @@
1.717 # Print a helpful message on how to acquire the necessary build dependency.
1.718 # x11 is the help tag: freetyp2, cups, pulse, alsa etc
1.719 MISSING_DEPENDENCY=x11
1.720 - PKGHANDLER_COMMAND=
1.721 -
1.722 - case $PKGHANDLER in
1.723 - apt-get)
1.724 - apt_help $MISSING_DEPENDENCY ;;
1.725 - yum)
1.726 - yum_help $MISSING_DEPENDENCY ;;
1.727 - port)
1.728 - port_help $MISSING_DEPENDENCY ;;
1.729 - pkgutil)
1.730 - pkgutil_help $MISSING_DEPENDENCY ;;
1.731 - pkgadd)
1.732 - pkgadd_help $MISSING_DEPENDENCY ;;
1.733 - * )
1.734 - break ;;
1.735 - esac
1.736 -
1.737 - if test "x$PKGHANDLER_COMMAND" != x; then
1.738 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.739 +
1.740 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.741 + cygwin_help $MISSING_DEPENDENCY
1.742 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.743 + msys_help $MISSING_DEPENDENCY
1.744 + else
1.745 + PKGHANDLER_COMMAND=
1.746 +
1.747 + case $PKGHANDLER in
1.748 + apt-get)
1.749 + apt_help $MISSING_DEPENDENCY ;;
1.750 + yum)
1.751 + yum_help $MISSING_DEPENDENCY ;;
1.752 + port)
1.753 + port_help $MISSING_DEPENDENCY ;;
1.754 + pkgutil)
1.755 + pkgutil_help $MISSING_DEPENDENCY ;;
1.756 + pkgadd)
1.757 + pkgadd_help $MISSING_DEPENDENCY ;;
1.758 + * )
1.759 + break ;;
1.760 + esac
1.761 +
1.762 + if test "x$PKGHANDLER_COMMAND" != x; then
1.763 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.764 + fi
1.765 fi
1.766
1.767 as_fn_error $? "Could not find X11 libraries. $HELP_MSG" "$LINENO" 5
1.768 @@ -30568,25 +30858,32 @@
1.769 # Print a helpful message on how to acquire the necessary build dependency.
1.770 # x11 is the help tag: freetyp2, cups, pulse, alsa etc
1.771 MISSING_DEPENDENCY=x11
1.772 - PKGHANDLER_COMMAND=
1.773 -
1.774 - case $PKGHANDLER in
1.775 - apt-get)
1.776 - apt_help $MISSING_DEPENDENCY ;;
1.777 - yum)
1.778 - yum_help $MISSING_DEPENDENCY ;;
1.779 - port)
1.780 - port_help $MISSING_DEPENDENCY ;;
1.781 - pkgutil)
1.782 - pkgutil_help $MISSING_DEPENDENCY ;;
1.783 - pkgadd)
1.784 - pkgadd_help $MISSING_DEPENDENCY ;;
1.785 - * )
1.786 - break ;;
1.787 - esac
1.788 -
1.789 - if test "x$PKGHANDLER_COMMAND" != x; then
1.790 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.791 +
1.792 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.793 + cygwin_help $MISSING_DEPENDENCY
1.794 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.795 + msys_help $MISSING_DEPENDENCY
1.796 + else
1.797 + PKGHANDLER_COMMAND=
1.798 +
1.799 + case $PKGHANDLER in
1.800 + apt-get)
1.801 + apt_help $MISSING_DEPENDENCY ;;
1.802 + yum)
1.803 + yum_help $MISSING_DEPENDENCY ;;
1.804 + port)
1.805 + port_help $MISSING_DEPENDENCY ;;
1.806 + pkgutil)
1.807 + pkgutil_help $MISSING_DEPENDENCY ;;
1.808 + pkgadd)
1.809 + pkgadd_help $MISSING_DEPENDENCY ;;
1.810 + * )
1.811 + break ;;
1.812 + esac
1.813 +
1.814 + if test "x$PKGHANDLER_COMMAND" != x; then
1.815 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.816 + fi
1.817 fi
1.818
1.819 as_fn_error $? "Could not find all X11 headers (shape.h Xrender.h XTest.h Intrinsic.h). $HELP_MSG" "$LINENO" 5
1.820 @@ -30823,25 +31120,32 @@
1.821 # Print a helpful message on how to acquire the necessary build dependency.
1.822 # cups is the help tag: freetyp2, cups, pulse, alsa etc
1.823 MISSING_DEPENDENCY=cups
1.824 - PKGHANDLER_COMMAND=
1.825 -
1.826 - case $PKGHANDLER in
1.827 - apt-get)
1.828 - apt_help $MISSING_DEPENDENCY ;;
1.829 - yum)
1.830 - yum_help $MISSING_DEPENDENCY ;;
1.831 - port)
1.832 - port_help $MISSING_DEPENDENCY ;;
1.833 - pkgutil)
1.834 - pkgutil_help $MISSING_DEPENDENCY ;;
1.835 - pkgadd)
1.836 - pkgadd_help $MISSING_DEPENDENCY ;;
1.837 - * )
1.838 - break ;;
1.839 - esac
1.840 -
1.841 - if test "x$PKGHANDLER_COMMAND" != x; then
1.842 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.843 +
1.844 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.845 + cygwin_help $MISSING_DEPENDENCY
1.846 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.847 + msys_help $MISSING_DEPENDENCY
1.848 + else
1.849 + PKGHANDLER_COMMAND=
1.850 +
1.851 + case $PKGHANDLER in
1.852 + apt-get)
1.853 + apt_help $MISSING_DEPENDENCY ;;
1.854 + yum)
1.855 + yum_help $MISSING_DEPENDENCY ;;
1.856 + port)
1.857 + port_help $MISSING_DEPENDENCY ;;
1.858 + pkgutil)
1.859 + pkgutil_help $MISSING_DEPENDENCY ;;
1.860 + pkgadd)
1.861 + pkgadd_help $MISSING_DEPENDENCY ;;
1.862 + * )
1.863 + break ;;
1.864 + esac
1.865 +
1.866 + if test "x$PKGHANDLER_COMMAND" != x; then
1.867 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.868 + fi
1.869 fi
1.870
1.871 as_fn_error $? "Could not find cups! $HELP_MSG " "$LINENO" 5
1.872 @@ -31448,25 +31752,32 @@
1.873 # Print a helpful message on how to acquire the necessary build dependency.
1.874 # freetype2 is the help tag: freetyp2, cups, pulse, alsa etc
1.875 MISSING_DEPENDENCY=freetype2
1.876 - PKGHANDLER_COMMAND=
1.877 -
1.878 - case $PKGHANDLER in
1.879 - apt-get)
1.880 - apt_help $MISSING_DEPENDENCY ;;
1.881 - yum)
1.882 - yum_help $MISSING_DEPENDENCY ;;
1.883 - port)
1.884 - port_help $MISSING_DEPENDENCY ;;
1.885 - pkgutil)
1.886 - pkgutil_help $MISSING_DEPENDENCY ;;
1.887 - pkgadd)
1.888 - pkgadd_help $MISSING_DEPENDENCY ;;
1.889 - * )
1.890 - break ;;
1.891 - esac
1.892 -
1.893 - if test "x$PKGHANDLER_COMMAND" != x; then
1.894 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.895 +
1.896 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.897 + cygwin_help $MISSING_DEPENDENCY
1.898 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.899 + msys_help $MISSING_DEPENDENCY
1.900 + else
1.901 + PKGHANDLER_COMMAND=
1.902 +
1.903 + case $PKGHANDLER in
1.904 + apt-get)
1.905 + apt_help $MISSING_DEPENDENCY ;;
1.906 + yum)
1.907 + yum_help $MISSING_DEPENDENCY ;;
1.908 + port)
1.909 + port_help $MISSING_DEPENDENCY ;;
1.910 + pkgutil)
1.911 + pkgutil_help $MISSING_DEPENDENCY ;;
1.912 + pkgadd)
1.913 + pkgadd_help $MISSING_DEPENDENCY ;;
1.914 + * )
1.915 + break ;;
1.916 + esac
1.917 +
1.918 + if test "x$PKGHANDLER_COMMAND" != x; then
1.919 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.920 + fi
1.921 fi
1.922
1.923 as_fn_error $? "Could not find freetype2! $HELP_MSG " "$LINENO" 5
1.924 @@ -31821,25 +32132,32 @@
1.925 # Print a helpful message on how to acquire the necessary build dependency.
1.926 # alsa is the help tag: freetyp2, cups, pulse, alsa etc
1.927 MISSING_DEPENDENCY=alsa
1.928 - PKGHANDLER_COMMAND=
1.929 -
1.930 - case $PKGHANDLER in
1.931 - apt-get)
1.932 - apt_help $MISSING_DEPENDENCY ;;
1.933 - yum)
1.934 - yum_help $MISSING_DEPENDENCY ;;
1.935 - port)
1.936 - port_help $MISSING_DEPENDENCY ;;
1.937 - pkgutil)
1.938 - pkgutil_help $MISSING_DEPENDENCY ;;
1.939 - pkgadd)
1.940 - pkgadd_help $MISSING_DEPENDENCY ;;
1.941 - * )
1.942 - break ;;
1.943 - esac
1.944 -
1.945 - if test "x$PKGHANDLER_COMMAND" != x; then
1.946 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.947 +
1.948 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.949 + cygwin_help $MISSING_DEPENDENCY
1.950 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.951 + msys_help $MISSING_DEPENDENCY
1.952 + else
1.953 + PKGHANDLER_COMMAND=
1.954 +
1.955 + case $PKGHANDLER in
1.956 + apt-get)
1.957 + apt_help $MISSING_DEPENDENCY ;;
1.958 + yum)
1.959 + yum_help $MISSING_DEPENDENCY ;;
1.960 + port)
1.961 + port_help $MISSING_DEPENDENCY ;;
1.962 + pkgutil)
1.963 + pkgutil_help $MISSING_DEPENDENCY ;;
1.964 + pkgadd)
1.965 + pkgadd_help $MISSING_DEPENDENCY ;;
1.966 + * )
1.967 + break ;;
1.968 + esac
1.969 +
1.970 + if test "x$PKGHANDLER_COMMAND" != x; then
1.971 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.972 + fi
1.973 fi
1.974
1.975 as_fn_error $? "Could not find alsa! $HELP_MSG " "$LINENO" 5
1.976 @@ -34633,25 +34951,32 @@
1.977 # Print a helpful message on how to acquire the necessary build dependency.
1.978 # ccache is the help tag: freetyp2, cups, pulse, alsa etc
1.979 MISSING_DEPENDENCY=ccache
1.980 - PKGHANDLER_COMMAND=
1.981 -
1.982 - case $PKGHANDLER in
1.983 - apt-get)
1.984 - apt_help $MISSING_DEPENDENCY ;;
1.985 - yum)
1.986 - yum_help $MISSING_DEPENDENCY ;;
1.987 - port)
1.988 - port_help $MISSING_DEPENDENCY ;;
1.989 - pkgutil)
1.990 - pkgutil_help $MISSING_DEPENDENCY ;;
1.991 - pkgadd)
1.992 - pkgadd_help $MISSING_DEPENDENCY ;;
1.993 - * )
1.994 - break ;;
1.995 - esac
1.996 -
1.997 - if test "x$PKGHANDLER_COMMAND" != x; then
1.998 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.999 +
1.1000 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.1001 + cygwin_help $MISSING_DEPENDENCY
1.1002 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1003 + msys_help $MISSING_DEPENDENCY
1.1004 + else
1.1005 + PKGHANDLER_COMMAND=
1.1006 +
1.1007 + case $PKGHANDLER in
1.1008 + apt-get)
1.1009 + apt_help $MISSING_DEPENDENCY ;;
1.1010 + yum)
1.1011 + yum_help $MISSING_DEPENDENCY ;;
1.1012 + port)
1.1013 + port_help $MISSING_DEPENDENCY ;;
1.1014 + pkgutil)
1.1015 + pkgutil_help $MISSING_DEPENDENCY ;;
1.1016 + pkgadd)
1.1017 + pkgadd_help $MISSING_DEPENDENCY ;;
1.1018 + * )
1.1019 + break ;;
1.1020 + esac
1.1021 +
1.1022 + if test "x$PKGHANDLER_COMMAND" != x; then
1.1023 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.1024 + fi
1.1025 fi
1.1026
1.1027 printf "$HELP_MSG\n"
