1.1 --- a/common/autoconf/help.m4 Wed Oct 09 18:51:32 2013 -0700
1.2 +++ b/common/autoconf/help.m4 Thu Oct 10 14:58:19 2013 +0200
1.3 @@ -25,194 +25,194 @@
1.4
1.5 AC_DEFUN_ONCE([HELP_SETUP_DEPENDENCY_HELP],
1.6 [
1.7 - AC_CHECK_PROGS(PKGHANDLER, apt-get yum port pkgutil pkgadd)
1.8 + AC_CHECK_PROGS(PKGHANDLER, apt-get yum port pkgutil pkgadd)
1.9 ])
1.10
1.11 AC_DEFUN([HELP_MSG_MISSING_DEPENDENCY],
1.12 [
1.13 - # Print a helpful message on how to acquire the necessary build dependency.
1.14 - # $1 is the help tag: freetyp2, cups, pulse, alsa etc
1.15 - MISSING_DEPENDENCY=$1
1.16 - PKGHANDLER_COMMAND=
1.17 + # Print a helpful message on how to acquire the necessary build dependency.
1.18 + # $1 is the help tag: freetyp2, cups, pulse, alsa etc
1.19 + MISSING_DEPENDENCY=$1
1.20 + PKGHANDLER_COMMAND=
1.21
1.22 - case $PKGHANDLER in
1.23 - apt-get)
1.24 - apt_help $MISSING_DEPENDENCY ;;
1.25 + case $PKGHANDLER in
1.26 + apt-get)
1.27 + apt_help $MISSING_DEPENDENCY ;;
1.28 yum)
1.29 - yum_help $MISSING_DEPENDENCY ;;
1.30 - port)
1.31 - port_help $MISSING_DEPENDENCY ;;
1.32 - pkgutil)
1.33 - pkgutil_help $MISSING_DEPENDENCY ;;
1.34 - pkgadd)
1.35 - pkgadd_help $MISSING_DEPENDENCY ;;
1.36 + yum_help $MISSING_DEPENDENCY ;;
1.37 + port)
1.38 + port_help $MISSING_DEPENDENCY ;;
1.39 + pkgutil)
1.40 + pkgutil_help $MISSING_DEPENDENCY ;;
1.41 + pkgadd)
1.42 + pkgadd_help $MISSING_DEPENDENCY ;;
1.43 * )
1.44 break ;;
1.45 - esac
1.46 + esac
1.47
1.48 - if test "x$PKGHANDLER_COMMAND" != x; then
1.49 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.50 - fi
1.51 + if test "x$PKGHANDLER_COMMAND" != x; then
1.52 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.53 + fi
1.54 ])
1.55
1.56 cygwin_help() {
1.57 - case $1 in
1.58 + case $1 in
1.59 unzip)
1.60 - PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P unzip" ;;
1.61 + PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P unzip" ;;
1.62 zip)
1.63 - PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P zip" ;;
1.64 + PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P zip" ;;
1.65 make)
1.66 - PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P make" ;;
1.67 + PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P make" ;;
1.68 * )
1.69 - break ;;
1.70 - esac
1.71 + break ;;
1.72 + esac
1.73 }
1.74
1.75 apt_help() {
1.76 - case $1 in
1.77 + case $1 in
1.78 devkit)
1.79 - PKGHANDLER_COMMAND="sudo apt-get install build-essential" ;;
1.80 + PKGHANDLER_COMMAND="sudo apt-get install build-essential" ;;
1.81 openjdk)
1.82 - PKGHANDLER_COMMAND="sudo apt-get install openjdk-7-jdk" ;;
1.83 + PKGHANDLER_COMMAND="sudo apt-get install openjdk-7-jdk" ;;
1.84 alsa)
1.85 - PKGHANDLER_COMMAND="sudo apt-get install libasound2-dev" ;;
1.86 + PKGHANDLER_COMMAND="sudo apt-get install libasound2-dev" ;;
1.87 cups)
1.88 - PKGHANDLER_COMMAND="sudo apt-get install libcups2-dev" ;;
1.89 + PKGHANDLER_COMMAND="sudo apt-get install libcups2-dev" ;;
1.90 freetype2)
1.91 - PKGHANDLER_COMMAND="sudo apt-get install libfreetype6-dev" ;;
1.92 + PKGHANDLER_COMMAND="sudo apt-get install libfreetype6-dev" ;;
1.93 pulse)
1.94 - PKGHANDLER_COMMAND="sudo apt-get install libpulse-dev" ;;
1.95 + PKGHANDLER_COMMAND="sudo apt-get install libpulse-dev" ;;
1.96 x11)
1.97 - PKGHANDLER_COMMAND="sudo apt-get install libX11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev" ;;
1.98 + PKGHANDLER_COMMAND="sudo apt-get install libX11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev" ;;
1.99 ccache)
1.100 - PKGHANDLER_COMMAND="sudo apt-get install ccache" ;;
1.101 + PKGHANDLER_COMMAND="sudo apt-get install ccache" ;;
1.102 * )
1.103 - break ;;
1.104 - esac
1.105 + break ;;
1.106 + esac
1.107 }
1.108
1.109 yum_help() {
1.110 - case $1 in
1.111 + case $1 in
1.112 devkit)
1.113 - PKGHANDLER_COMMAND="sudo yum groupinstall \"Development Tools\"" ;;
1.114 + PKGHANDLER_COMMAND="sudo yum groupinstall \"Development Tools\"" ;;
1.115 openjdk)
1.116 - PKGHANDLER_COMMAND="sudo yum install java-1.7.0-openjdk" ;;
1.117 + PKGHANDLER_COMMAND="sudo yum install java-1.7.0-openjdk" ;;
1.118 alsa)
1.119 - PKGHANDLER_COMMAND="sudo yum install alsa-lib-devel" ;;
1.120 + PKGHANDLER_COMMAND="sudo yum install alsa-lib-devel" ;;
1.121 cups)
1.122 - PKGHANDLER_COMMAND="sudo yum install cups-devel" ;;
1.123 + PKGHANDLER_COMMAND="sudo yum install cups-devel" ;;
1.124 freetype2)
1.125 - PKGHANDLER_COMMAND="sudo yum install freetype-devel" ;;
1.126 + PKGHANDLER_COMMAND="sudo yum install freetype-devel" ;;
1.127 pulse)
1.128 - PKGHANDLER_COMMAND="sudo yum install pulseaudio-libs-devel" ;;
1.129 + PKGHANDLER_COMMAND="sudo yum install pulseaudio-libs-devel" ;;
1.130 x11)
1.131 - PKGHANDLER_COMMAND="sudo yum install libXtst-devel libXt-devel libXrender-devel" ;;
1.132 + PKGHANDLER_COMMAND="sudo yum install libXtst-devel libXt-devel libXrender-devel" ;;
1.133 ccache)
1.134 - PKGHANDLER_COMMAND="sudo yum install ccache" ;;
1.135 + PKGHANDLER_COMMAND="sudo yum install ccache" ;;
1.136 * )
1.137 - break ;;
1.138 - esac
1.139 + break ;;
1.140 + esac
1.141 }
1.142
1.143 port_help() {
1.144 - PKGHANDLER_COMMAND=""
1.145 + PKGHANDLER_COMMAND=""
1.146 }
1.147
1.148 pkgutil_help() {
1.149 - PKGHANDLER_COMMAND=""
1.150 + PKGHANDLER_COMMAND=""
1.151 }
1.152
1.153 pkgadd_help() {
1.154 - PKGHANDLER_COMMAND=""
1.155 + PKGHANDLER_COMMAND=""
1.156 }
1.157
1.158 AC_DEFUN_ONCE([HELP_PRINT_SUMMARY_AND_WARNINGS],
1.159 [
1.160 -# Finally output some useful information to the user
1.161 + # Finally output some useful information to the user
1.162
1.163 -if test "x$CCACHE_FOUND" != x; then
1.164 - if test "x$HAS_GOOD_CCACHE" = x; then
1.165 - CCACHE_STATUS="installed, but disabled (version older than 3.1.4)"
1.166 - CCACHE_HELP_MSG="You have ccache installed, but it is a version prior to 3.1.4. Try upgrading."
1.167 - else
1.168 - CCACHE_STATUS="installed and in use"
1.169 - fi
1.170 -else
1.171 - if test "x$GCC" = xyes; then
1.172 - CCACHE_STATUS="not installed (consider installing)"
1.173 - CCACHE_HELP_MSG="You do not have ccache installed. Try installing it."
1.174 - else
1.175 - CCACHE_STATUS="not available for your system"
1.176 - fi
1.177 -fi
1.178 + if test "x$CCACHE_FOUND" != x; then
1.179 + if test "x$HAS_GOOD_CCACHE" = x; then
1.180 + CCACHE_STATUS="installed, but disabled (version older than 3.1.4)"
1.181 + CCACHE_HELP_MSG="You have ccache installed, but it is a version prior to 3.1.4. Try upgrading."
1.182 + else
1.183 + CCACHE_STATUS="installed and in use"
1.184 + fi
1.185 + else
1.186 + if test "x$GCC" = xyes; then
1.187 + CCACHE_STATUS="not installed (consider installing)"
1.188 + CCACHE_HELP_MSG="You do not have ccache installed. Try installing it."
1.189 + else
1.190 + CCACHE_STATUS="not available for your system"
1.191 + fi
1.192 + fi
1.193
1.194 -printf "\n"
1.195 -printf "====================================================\n"
1.196 -printf "A new configuration has been successfully created in\n"
1.197 -printf "$OUTPUT_ROOT\n"
1.198 -if test "x$CONFIGURE_COMMAND_LINE" != x; then
1.199 - printf "using configure arguments '$CONFIGURE_COMMAND_LINE'.\n"
1.200 -else
1.201 - printf "using default settings.\n"
1.202 -fi
1.203 + printf "\n"
1.204 + printf "====================================================\n"
1.205 + printf "A new configuration has been successfully created in\n"
1.206 + printf "$OUTPUT_ROOT\n"
1.207 + if test "x$CONFIGURE_COMMAND_LINE" != x; then
1.208 + printf "using configure arguments '$CONFIGURE_COMMAND_LINE'.\n"
1.209 + else
1.210 + printf "using default settings.\n"
1.211 + fi
1.212
1.213 -printf "\n"
1.214 -printf "Configuration summary:\n"
1.215 -printf "* Debug level: $DEBUG_LEVEL\n"
1.216 -printf "* JDK variant: $JDK_VARIANT\n"
1.217 -printf "* JVM variants: $with_jvm_variants\n"
1.218 -printf "* OpenJDK target: OS: $OPENJDK_TARGET_OS, CPU architecture: $OPENJDK_TARGET_CPU_ARCH, address length: $OPENJDK_TARGET_CPU_BITS\n"
1.219 + printf "\n"
1.220 + printf "Configuration summary:\n"
1.221 + printf "* Debug level: $DEBUG_LEVEL\n"
1.222 + printf "* JDK variant: $JDK_VARIANT\n"
1.223 + printf "* JVM variants: $with_jvm_variants\n"
1.224 + printf "* OpenJDK target: OS: $OPENJDK_TARGET_OS, CPU architecture: $OPENJDK_TARGET_CPU_ARCH, address length: $OPENJDK_TARGET_CPU_BITS\n"
1.225
1.226 -printf "\n"
1.227 -printf "Tools summary:\n"
1.228 -if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
1.229 - printf "* Environment: $WINDOWS_ENV_VENDOR version $WINDOWS_ENV_VERSION (root at $WINDOWS_ENV_ROOT_PATH)\n"
1.230 -fi
1.231 -printf "* Boot JDK: $BOOT_JDK_VERSION (at $BOOT_JDK)\n"
1.232 -printf "* C Compiler: $CC_VENDOR version $CC_VERSION (at $CC)\n"
1.233 -printf "* C++ Compiler: $CXX_VENDOR version $CXX_VERSION (at $CXX)\n"
1.234 + printf "\n"
1.235 + printf "Tools summary:\n"
1.236 + if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
1.237 + printf "* Environment: $WINDOWS_ENV_VENDOR version $WINDOWS_ENV_VERSION (root at $WINDOWS_ENV_ROOT_PATH)\n"
1.238 + fi
1.239 + printf "* Boot JDK: $BOOT_JDK_VERSION (at $BOOT_JDK)\n"
1.240 + printf "* C Compiler: $CC_VENDOR version $CC_VERSION (at $CC)\n"
1.241 + printf "* C++ Compiler: $CXX_VENDOR version $CXX_VERSION (at $CXX)\n"
1.242
1.243 -printf "\n"
1.244 -printf "Build performance summary:\n"
1.245 -printf "* Cores to use: $JOBS\n"
1.246 -printf "* Memory limit: $MEMORY_SIZE MB\n"
1.247 -printf "* ccache status: $CCACHE_STATUS\n"
1.248 -printf "\n"
1.249 + printf "\n"
1.250 + printf "Build performance summary:\n"
1.251 + printf "* Cores to use: $JOBS\n"
1.252 + printf "* Memory limit: $MEMORY_SIZE MB\n"
1.253 + printf "* ccache status: $CCACHE_STATUS\n"
1.254 + printf "\n"
1.255
1.256 -if test "x$CCACHE_HELP_MSG" != x && test "x$HIDE_PERFORMANCE_HINTS" = "xno"; then
1.257 - printf "Build performance tip: ccache gives a tremendous speedup for C++ recompilations.\n"
1.258 - printf "$CCACHE_HELP_MSG\n"
1.259 - HELP_MSG_MISSING_DEPENDENCY([ccache])
1.260 - printf "$HELP_MSG\n"
1.261 - printf "\n"
1.262 -fi
1.263 + if test "x$CCACHE_HELP_MSG" != x && test "x$HIDE_PERFORMANCE_HINTS" = "xno"; then
1.264 + printf "Build performance tip: ccache gives a tremendous speedup for C++ recompilations.\n"
1.265 + printf "$CCACHE_HELP_MSG\n"
1.266 + HELP_MSG_MISSING_DEPENDENCY([ccache])
1.267 + printf "$HELP_MSG\n"
1.268 + printf "\n"
1.269 + fi
1.270
1.271 -if test "x$BUILDING_MULTIPLE_JVM_VARIANTS" = "xyes"; then
1.272 - printf "NOTE: You have requested to build more than one version of the JVM, which\n"
1.273 - printf "will result in longer build times.\n"
1.274 - printf "\n"
1.275 -fi
1.276 + if test "x$BUILDING_MULTIPLE_JVM_VARIANTS" = "xyes"; then
1.277 + printf "NOTE: You have requested to build more than one version of the JVM, which\n"
1.278 + printf "will result in longer build times.\n"
1.279 + printf "\n"
1.280 + fi
1.281
1.282 -if test "x$FOUND_ALT_VARIABLES" != "x"; then
1.283 - printf "WARNING: You have old-style ALT_ environment variables set.\n"
1.284 - printf "These are not respected, and will be ignored. It is recommended\n"
1.285 - printf "that you clean your environment. The following variables are set:\n"
1.286 - printf "$FOUND_ALT_VARIABLES\n"
1.287 - printf "\n"
1.288 -fi
1.289 + if test "x$FOUND_ALT_VARIABLES" != "x"; then
1.290 + printf "WARNING: You have old-style ALT_ environment variables set.\n"
1.291 + printf "These are not respected, and will be ignored. It is recommended\n"
1.292 + printf "that you clean your environment. The following variables are set:\n"
1.293 + printf "$FOUND_ALT_VARIABLES\n"
1.294 + printf "\n"
1.295 + fi
1.296
1.297 -if test "x$OUTPUT_DIR_IS_LOCAL" != "xyes"; then
1.298 - printf "WARNING: Your build output directory is not on a local disk.\n"
1.299 - printf "This will severely degrade build performance!\n"
1.300 - printf "It is recommended that you create an output directory on a local disk,\n"
1.301 - printf "and run the configure script again from that directory.\n"
1.302 - printf "\n"
1.303 -fi
1.304 + if test "x$OUTPUT_DIR_IS_LOCAL" != "xyes"; then
1.305 + printf "WARNING: Your build output directory is not on a local disk.\n"
1.306 + printf "This will severely degrade build performance!\n"
1.307 + printf "It is recommended that you create an output directory on a local disk,\n"
1.308 + printf "and run the configure script again from that directory.\n"
1.309 + printf "\n"
1.310 + fi
1.311
1.312 -if test "x$IS_RECONFIGURE" = "xyes"; then
1.313 - printf "WARNING: The result of this configuration has overridden an older\n"
1.314 - printf "configuration. You *should* run 'make clean' to make sure you get a\n"
1.315 - printf "proper build. Failure to do so might result in strange build problems.\n"
1.316 - printf "\n"
1.317 -fi
1.318 + if test "x$IS_RECONFIGURE" = "xyes"; then
1.319 + printf "WARNING: The result of this configuration has overridden an older\n"
1.320 + printf "configuration. You *should* run 'make clean' to make sure you get a\n"
1.321 + printf "proper build. Failure to do so might result in strange build problems.\n"
1.322 + printf "\n"
1.323 + fi
1.324 ])
