1.1 --- a/common/autoconf/jdk-options.m4 Thu Sep 12 12:29:17 2013 -0700
1.2 +++ b/common/autoconf/jdk-options.m4 Tue Nov 05 17:33:48 2013 -0800
1.3 @@ -25,30 +25,30 @@
1.4
1.5 AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_VARIANT],
1.6 [
1.7 -###############################################################################
1.8 -#
1.9 -# Check which variant of the JDK that we want to build.
1.10 -# Currently we have:
1.11 -# normal: standard edition
1.12 -# but the custom make system may add other variants
1.13 -#
1.14 -# Effectively the JDK variant gives a name to a specific set of
1.15 -# modules to compile into the JDK. In the future, these modules
1.16 -# might even be Jigsaw modules.
1.17 -#
1.18 -AC_MSG_CHECKING([which variant of the JDK to build])
1.19 -AC_ARG_WITH([jdk-variant], [AS_HELP_STRING([--with-jdk-variant],
1.20 - [JDK variant to build (normal) @<:@normal@:>@])])
1.21 + ###############################################################################
1.22 + #
1.23 + # Check which variant of the JDK that we want to build.
1.24 + # Currently we have:
1.25 + # normal: standard edition
1.26 + # but the custom make system may add other variants
1.27 + #
1.28 + # Effectively the JDK variant gives a name to a specific set of
1.29 + # modules to compile into the JDK. In the future, these modules
1.30 + # might even be Jigsaw modules.
1.31 + #
1.32 + AC_MSG_CHECKING([which variant of the JDK to build])
1.33 + AC_ARG_WITH([jdk-variant], [AS_HELP_STRING([--with-jdk-variant],
1.34 + [JDK variant to build (normal) @<:@normal@:>@])])
1.35
1.36 -if test "x$with_jdk_variant" = xnormal || test "x$with_jdk_variant" = x; then
1.37 + if test "x$with_jdk_variant" = xnormal || test "x$with_jdk_variant" = x; then
1.38 JDK_VARIANT="normal"
1.39 -else
1.40 + else
1.41 AC_MSG_ERROR([The available JDK variants are: normal])
1.42 -fi
1.43 + fi
1.44
1.45 -AC_SUBST(JDK_VARIANT)
1.46 + AC_SUBST(JDK_VARIANT)
1.47
1.48 -AC_MSG_RESULT([$JDK_VARIANT])
1.49 + AC_MSG_RESULT([$JDK_VARIANT])
1.50 ])
1.51
1.52 AC_DEFUN_ONCE([JDKOPT_SETUP_JVM_INTERPRETER],
1.53 @@ -81,216 +81,215 @@
1.54 AC_DEFUN_ONCE([JDKOPT_SETUP_JVM_VARIANTS],
1.55 [
1.56
1.57 -###############################################################################
1.58 -#
1.59 -# Check which variants of the JVM that we want to build.
1.60 -# Currently we have:
1.61 -# server: normal interpreter and a tiered C1/C2 compiler
1.62 -# client: normal interpreter and C1 (no C2 compiler) (only 32-bit platforms)
1.63 -# minimal1: reduced form of client with optional VM services and features stripped out
1.64 -# kernel: kernel footprint JVM that passes the TCK without major performance problems,
1.65 -# ie normal interpreter and C1, only the serial GC, kernel jvmti etc
1.66 -# zero: no machine code interpreter, no compiler
1.67 -# zeroshark: zero interpreter and shark/llvm compiler backend
1.68 + ###############################################################################
1.69 + #
1.70 + # Check which variants of the JVM that we want to build.
1.71 + # Currently we have:
1.72 + # server: normal interpreter and a tiered C1/C2 compiler
1.73 + # client: normal interpreter and C1 (no C2 compiler) (only 32-bit platforms)
1.74 + # minimal1: reduced form of client with optional VM services and features stripped out
1.75 + # kernel: kernel footprint JVM that passes the TCK without major performance problems,
1.76 + # ie normal interpreter and C1, only the serial GC, kernel jvmti etc
1.77 + # zero: no machine code interpreter, no compiler
1.78 + # zeroshark: zero interpreter and shark/llvm compiler backend
1.79 # core: interpreter only, no compiler (only works on some platforms)
1.80 -AC_MSG_CHECKING([which variants of the JVM to build])
1.81 -AC_ARG_WITH([jvm-variants], [AS_HELP_STRING([--with-jvm-variants],
1.82 + AC_MSG_CHECKING([which variants of the JVM to build])
1.83 + AC_ARG_WITH([jvm-variants], [AS_HELP_STRING([--with-jvm-variants],
1.84 [JVM variants (separated by commas) to build (server, client, minimal1, kernel, zero, zeroshark, core) @<:@server@:>@])])
1.85
1.86 -if test "x$with_jvm_variants" = x; then
1.87 - with_jvm_variants="server"
1.88 -fi
1.89 + if test "x$with_jvm_variants" = x; then
1.90 + with_jvm_variants="server"
1.91 + fi
1.92
1.93 -JVM_VARIANTS=",$with_jvm_variants,"
1.94 -TEST_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,//' -e 's/client,//' -e 's/minimal1,//' -e 's/kernel,//' -e 's/zero,//' -e 's/zeroshark,//' -e 's/core,//'`
1.95 + JVM_VARIANTS=",$with_jvm_variants,"
1.96 + TEST_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,//' -e 's/client,//' -e 's/minimal1,//' -e 's/kernel,//' -e 's/zero,//' -e 's/zeroshark,//' -e 's/core,//'`
1.97
1.98 -if test "x$TEST_VARIANTS" != "x,"; then
1.99 - AC_MSG_ERROR([The available JVM variants are: server, client, minimal1, kernel, zero, zeroshark, core])
1.100 -fi
1.101 -AC_MSG_RESULT([$with_jvm_variants])
1.102 + if test "x$TEST_VARIANTS" != "x,"; then
1.103 + AC_MSG_ERROR([The available JVM variants are: server, client, minimal1, kernel, zero, zeroshark, core])
1.104 + fi
1.105 + AC_MSG_RESULT([$with_jvm_variants])
1.106
1.107 -JVM_VARIANT_SERVER=`$ECHO "$JVM_VARIANTS" | $SED -e '/,server,/!s/.*/false/g' -e '/,server,/s/.*/true/g'`
1.108 -JVM_VARIANT_CLIENT=`$ECHO "$JVM_VARIANTS" | $SED -e '/,client,/!s/.*/false/g' -e '/,client,/s/.*/true/g'`
1.109 -JVM_VARIANT_MINIMAL1=`$ECHO "$JVM_VARIANTS" | $SED -e '/,minimal1,/!s/.*/false/g' -e '/,minimal1,/s/.*/true/g'`
1.110 -JVM_VARIANT_KERNEL=`$ECHO "$JVM_VARIANTS" | $SED -e '/,kernel,/!s/.*/false/g' -e '/,kernel,/s/.*/true/g'`
1.111 -JVM_VARIANT_ZERO=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zero,/!s/.*/false/g' -e '/,zero,/s/.*/true/g'`
1.112 -JVM_VARIANT_ZEROSHARK=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zeroshark,/!s/.*/false/g' -e '/,zeroshark,/s/.*/true/g'`
1.113 -JVM_VARIANT_CORE=`$ECHO "$JVM_VARIANTS" | $SED -e '/,core,/!s/.*/false/g' -e '/,core,/s/.*/true/g'`
1.114 + JVM_VARIANT_SERVER=`$ECHO "$JVM_VARIANTS" | $SED -e '/,server,/!s/.*/false/g' -e '/,server,/s/.*/true/g'`
1.115 + JVM_VARIANT_CLIENT=`$ECHO "$JVM_VARIANTS" | $SED -e '/,client,/!s/.*/false/g' -e '/,client,/s/.*/true/g'`
1.116 + JVM_VARIANT_MINIMAL1=`$ECHO "$JVM_VARIANTS" | $SED -e '/,minimal1,/!s/.*/false/g' -e '/,minimal1,/s/.*/true/g'`
1.117 + JVM_VARIANT_KERNEL=`$ECHO "$JVM_VARIANTS" | $SED -e '/,kernel,/!s/.*/false/g' -e '/,kernel,/s/.*/true/g'`
1.118 + JVM_VARIANT_ZERO=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zero,/!s/.*/false/g' -e '/,zero,/s/.*/true/g'`
1.119 + JVM_VARIANT_ZEROSHARK=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zeroshark,/!s/.*/false/g' -e '/,zeroshark,/s/.*/true/g'`
1.120 + JVM_VARIANT_CORE=`$ECHO "$JVM_VARIANTS" | $SED -e '/,core,/!s/.*/false/g' -e '/,core,/s/.*/true/g'`
1.121
1.122 -if test "x$JVM_VARIANT_CLIENT" = xtrue; then
1.123 + if test "x$JVM_VARIANT_CLIENT" = xtrue; then
1.124 if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
1.125 - AC_MSG_ERROR([You cannot build a client JVM for a 64-bit machine.])
1.126 + AC_MSG_ERROR([You cannot build a client JVM for a 64-bit machine.])
1.127 fi
1.128 -fi
1.129 -if test "x$JVM_VARIANT_KERNEL" = xtrue; then
1.130 + fi
1.131 + if test "x$JVM_VARIANT_KERNEL" = xtrue; then
1.132 if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
1.133 - AC_MSG_ERROR([You cannot build a kernel JVM for a 64-bit machine.])
1.134 + AC_MSG_ERROR([You cannot build a kernel JVM for a 64-bit machine.])
1.135 fi
1.136 -fi
1.137 -if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
1.138 + fi
1.139 + if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
1.140 if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
1.141 - AC_MSG_ERROR([You cannot build a minimal JVM for a 64-bit machine.])
1.142 + AC_MSG_ERROR([You cannot build a minimal JVM for a 64-bit machine.])
1.143 fi
1.144 -fi
1.145 + fi
1.146
1.147 -# Replace the commas with AND for use in the build directory name.
1.148 -ANDED_JVM_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/^,//' -e 's/,$//' -e 's/,/AND/'`
1.149 -COUNT_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,/1/' -e 's/client,/1/' -e 's/minimal1,/1/' -e 's/kernel,/1/' -e 's/zero,/1/' -e 's/zeroshark,/1/' -e 's/core,/1/'`
1.150 -if test "x$COUNT_VARIANTS" != "x,1"; then
1.151 + # Replace the commas with AND for use in the build directory name.
1.152 + ANDED_JVM_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/^,//' -e 's/,$//' -e 's/,/AND/'`
1.153 + COUNT_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,/1/' -e 's/client,/1/' -e 's/minimal1,/1/' -e 's/kernel,/1/' -e 's/zero,/1/' -e 's/zeroshark,/1/' -e 's/core,/1/'`
1.154 + if test "x$COUNT_VARIANTS" != "x,1"; then
1.155 BUILDING_MULTIPLE_JVM_VARIANTS=yes
1.156 -else
1.157 + else
1.158 BUILDING_MULTIPLE_JVM_VARIANTS=no
1.159 -fi
1.160 + fi
1.161
1.162 -AC_SUBST(JVM_VARIANTS)
1.163 -AC_SUBST(JVM_VARIANT_SERVER)
1.164 -AC_SUBST(JVM_VARIANT_CLIENT)
1.165 -AC_SUBST(JVM_VARIANT_MINIMAL1)
1.166 -AC_SUBST(JVM_VARIANT_KERNEL)
1.167 -AC_SUBST(JVM_VARIANT_ZERO)
1.168 -AC_SUBST(JVM_VARIANT_ZEROSHARK)
1.169 -AC_SUBST(JVM_VARIANT_CORE)
1.170 + AC_SUBST(JVM_VARIANTS)
1.171 + AC_SUBST(JVM_VARIANT_SERVER)
1.172 + AC_SUBST(JVM_VARIANT_CLIENT)
1.173 + AC_SUBST(JVM_VARIANT_MINIMAL1)
1.174 + AC_SUBST(JVM_VARIANT_KERNEL)
1.175 + AC_SUBST(JVM_VARIANT_ZERO)
1.176 + AC_SUBST(JVM_VARIANT_ZEROSHARK)
1.177 + AC_SUBST(JVM_VARIANT_CORE)
1.178
1.179 -INCLUDE_SA=true
1.180 -if test "x$JVM_VARIANT_ZERO" = xtrue ; then
1.181 + INCLUDE_SA=true
1.182 + if test "x$JVM_VARIANT_ZERO" = xtrue ; then
1.183 INCLUDE_SA=false
1.184 -fi
1.185 -if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then
1.186 + fi
1.187 + if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then
1.188 INCLUDE_SA=false
1.189 -fi
1.190 -if test "x$VAR_CPU" = xppc64 ; then
1.191 + fi
1.192 + if test "x$VAR_CPU" = xppc64 ; then
1.193 INCLUDE_SA=false
1.194 -fi
1.195 -AC_SUBST(INCLUDE_SA)
1.196 + fi
1.197 + AC_SUBST(INCLUDE_SA)
1.198
1.199 -if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
1.200 - MACOSX_UNIVERSAL="true"
1.201 -fi
1.202 + if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
1.203 + MACOSX_UNIVERSAL="true"
1.204 + fi
1.205
1.206 -AC_SUBST(MACOSX_UNIVERSAL)
1.207 -
1.208 + AC_SUBST(MACOSX_UNIVERSAL)
1.209 ])
1.210
1.211 AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_LEVEL],
1.212 [
1.213 -###############################################################################
1.214 -#
1.215 -# Set the debug level
1.216 -# release: no debug information, all optimizations, no asserts.
1.217 -# fastdebug: debug information (-g), all optimizations, all asserts
1.218 -# slowdebug: debug information (-g), no optimizations, all asserts
1.219 -#
1.220 -DEBUG_LEVEL="release"
1.221 -AC_MSG_CHECKING([which debug level to use])
1.222 -AC_ARG_ENABLE([debug], [AS_HELP_STRING([--enable-debug],
1.223 - [set the debug level to fastdebug (shorthand for --with-debug-level=fastdebug) @<:@disabled@:>@])],
1.224 - [
1.225 + ###############################################################################
1.226 + #
1.227 + # Set the debug level
1.228 + # release: no debug information, all optimizations, no asserts.
1.229 + # fastdebug: debug information (-g), all optimizations, all asserts
1.230 + # slowdebug: debug information (-g), no optimizations, all asserts
1.231 + #
1.232 + DEBUG_LEVEL="release"
1.233 + AC_MSG_CHECKING([which debug level to use])
1.234 + AC_ARG_ENABLE([debug], [AS_HELP_STRING([--enable-debug],
1.235 + [set the debug level to fastdebug (shorthand for --with-debug-level=fastdebug) @<:@disabled@:>@])],
1.236 + [
1.237 ENABLE_DEBUG="${enableval}"
1.238 DEBUG_LEVEL="fastdebug"
1.239 - ], [ENABLE_DEBUG="no"])
1.240 + ], [ENABLE_DEBUG="no"])
1.241
1.242 -AC_ARG_WITH([debug-level], [AS_HELP_STRING([--with-debug-level],
1.243 - [set the debug level (release, fastdebug, slowdebug) @<:@release@:>@])],
1.244 - [
1.245 + AC_ARG_WITH([debug-level], [AS_HELP_STRING([--with-debug-level],
1.246 + [set the debug level (release, fastdebug, slowdebug) @<:@release@:>@])],
1.247 + [
1.248 DEBUG_LEVEL="${withval}"
1.249 if test "x$ENABLE_DEBUG" = xyes; then
1.250 - AC_MSG_ERROR([You cannot use both --enable-debug and --with-debug-level at the same time.])
1.251 + AC_MSG_ERROR([You cannot use both --enable-debug and --with-debug-level at the same time.])
1.252 fi
1.253 - ])
1.254 -AC_MSG_RESULT([$DEBUG_LEVEL])
1.255 + ])
1.256 + AC_MSG_RESULT([$DEBUG_LEVEL])
1.257
1.258 -if test "x$DEBUG_LEVEL" != xrelease && \
1.259 - test "x$DEBUG_LEVEL" != xfastdebug && \
1.260 - test "x$DEBUG_LEVEL" != xslowdebug; then
1.261 - AC_MSG_ERROR([Allowed debug levels are: release, fastdebug and slowdebug])
1.262 -fi
1.263 + if test "x$DEBUG_LEVEL" != xrelease && \
1.264 + test "x$DEBUG_LEVEL" != xfastdebug && \
1.265 + test "x$DEBUG_LEVEL" != xslowdebug; then
1.266 + AC_MSG_ERROR([Allowed debug levels are: release, fastdebug and slowdebug])
1.267 + fi
1.268
1.269
1.270 -###############################################################################
1.271 -#
1.272 -# Setup legacy vars/targets and new vars to deal with different debug levels.
1.273 -#
1.274 + ###############################################################################
1.275 + #
1.276 + # Setup legacy vars/targets and new vars to deal with different debug levels.
1.277 + #
1.278
1.279 -case $DEBUG_LEVEL in
1.280 - release )
1.281 - VARIANT="OPT"
1.282 - FASTDEBUG="false"
1.283 - DEBUG_CLASSFILES="false"
1.284 - BUILD_VARIANT_RELEASE=""
1.285 - HOTSPOT_DEBUG_LEVEL="product"
1.286 - HOTSPOT_EXPORT="product"
1.287 - ;;
1.288 - fastdebug )
1.289 - VARIANT="DBG"
1.290 - FASTDEBUG="true"
1.291 - DEBUG_CLASSFILES="true"
1.292 - BUILD_VARIANT_RELEASE="-fastdebug"
1.293 - HOTSPOT_DEBUG_LEVEL="fastdebug"
1.294 - HOTSPOT_EXPORT="fastdebug"
1.295 - ;;
1.296 - slowdebug )
1.297 - VARIANT="DBG"
1.298 - FASTDEBUG="false"
1.299 - DEBUG_CLASSFILES="true"
1.300 - BUILD_VARIANT_RELEASE="-debug"
1.301 - HOTSPOT_DEBUG_LEVEL="jvmg"
1.302 - HOTSPOT_EXPORT="debug"
1.303 - ;;
1.304 -esac
1.305 + case $DEBUG_LEVEL in
1.306 + release )
1.307 + VARIANT="OPT"
1.308 + FASTDEBUG="false"
1.309 + DEBUG_CLASSFILES="false"
1.310 + BUILD_VARIANT_RELEASE=""
1.311 + HOTSPOT_DEBUG_LEVEL="product"
1.312 + HOTSPOT_EXPORT="product"
1.313 + ;;
1.314 + fastdebug )
1.315 + VARIANT="DBG"
1.316 + FASTDEBUG="true"
1.317 + DEBUG_CLASSFILES="true"
1.318 + BUILD_VARIANT_RELEASE="-fastdebug"
1.319 + HOTSPOT_DEBUG_LEVEL="fastdebug"
1.320 + HOTSPOT_EXPORT="fastdebug"
1.321 + ;;
1.322 + slowdebug )
1.323 + VARIANT="DBG"
1.324 + FASTDEBUG="false"
1.325 + DEBUG_CLASSFILES="true"
1.326 + BUILD_VARIANT_RELEASE="-debug"
1.327 + HOTSPOT_DEBUG_LEVEL="jvmg"
1.328 + HOTSPOT_EXPORT="debug"
1.329 + ;;
1.330 + esac
1.331
1.332 -#####
1.333 -# Generate the legacy makefile targets for hotspot.
1.334 -# The hotspot api for selecting the build artifacts, really, needs to be improved.
1.335 -# JDK-7195896 will fix this on the hotspot side by using the JVM_VARIANT_* variables to
1.336 -# determine what needs to be built. All we will need to set here is all_product, all_fastdebug etc
1.337 -# But until then ...
1.338 -HOTSPOT_TARGET=""
1.339 + #####
1.340 + # Generate the legacy makefile targets for hotspot.
1.341 + # The hotspot api for selecting the build artifacts, really, needs to be improved.
1.342 + # JDK-7195896 will fix this on the hotspot side by using the JVM_VARIANT_* variables to
1.343 + # determine what needs to be built. All we will need to set here is all_product, all_fastdebug etc
1.344 + # But until then ...
1.345 + HOTSPOT_TARGET=""
1.346
1.347 -if test "x$JVM_VARIANT_SERVER" = xtrue; then
1.348 + if test "x$JVM_VARIANT_SERVER" = xtrue; then
1.349 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL} "
1.350 -fi
1.351 + fi
1.352
1.353 -if test "x$JVM_VARIANT_CLIENT" = xtrue; then
1.354 + if test "x$JVM_VARIANT_CLIENT" = xtrue; then
1.355 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}1 "
1.356 -fi
1.357 + fi
1.358
1.359 -if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
1.360 + if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
1.361 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}minimal1 "
1.362 -fi
1.363 + fi
1.364
1.365 -if test "x$JVM_VARIANT_KERNEL" = xtrue; then
1.366 + if test "x$JVM_VARIANT_KERNEL" = xtrue; then
1.367 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}kernel "
1.368 -fi
1.369 + fi
1.370
1.371 -if test "x$JVM_VARIANT_ZERO" = xtrue; then
1.372 + if test "x$JVM_VARIANT_ZERO" = xtrue; then
1.373 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}zero "
1.374 -fi
1.375 + fi
1.376
1.377 -if test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
1.378 + if test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
1.379 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}shark "
1.380 -fi
1.381 + fi
1.382
1.383 -if test "x$JVM_VARIANT_CORE" = xtrue; then
1.384 + if test "x$JVM_VARIANT_CORE" = xtrue; then
1.385 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}core "
1.386 -fi
1.387 + fi
1.388
1.389 -HOTSPOT_TARGET="$HOTSPOT_TARGET docs export_$HOTSPOT_EXPORT"
1.390 + HOTSPOT_TARGET="$HOTSPOT_TARGET docs export_$HOTSPOT_EXPORT"
1.391
1.392 -# On Macosx universal binaries are produced, but they only contain
1.393 -# 64 bit intel. This invalidates control of which jvms are built
1.394 -# from configure, but only server is valid anyway. Fix this
1.395 -# when hotspot makefiles are rewritten.
1.396 -if test "x$MACOSX_UNIVERSAL" = xtrue; then
1.397 + # On Macosx universal binaries are produced, but they only contain
1.398 + # 64 bit intel. This invalidates control of which jvms are built
1.399 + # from configure, but only server is valid anyway. Fix this
1.400 + # when hotspot makefiles are rewritten.
1.401 + if test "x$MACOSX_UNIVERSAL" = xtrue; then
1.402 HOTSPOT_TARGET=universal_${HOTSPOT_EXPORT}
1.403 -fi
1.404 + fi
1.405
1.406 -#####
1.407 + #####
1.408
1.409 -AC_SUBST(DEBUG_LEVEL)
1.410 -AC_SUBST(VARIANT)
1.411 -AC_SUBST(FASTDEBUG)
1.412 -AC_SUBST(DEBUG_CLASSFILES)
1.413 -AC_SUBST(BUILD_VARIANT_RELEASE)
1.414 + AC_SUBST(DEBUG_LEVEL)
1.415 + AC_SUBST(VARIANT)
1.416 + AC_SUBST(FASTDEBUG)
1.417 + AC_SUBST(DEBUG_CLASSFILES)
1.418 + AC_SUBST(BUILD_VARIANT_RELEASE)
1.419 ])
1.420
1.421
1.422 @@ -301,7 +300,7 @@
1.423 AC_DEFUN_ONCE([JDKOPT_SETUP_OPEN_OR_CUSTOM],
1.424 [
1.425 AC_ARG_ENABLE([openjdk-only], [AS_HELP_STRING([--enable-openjdk-only],
1.426 - [suppress building custom source even if present @<:@disabled@:>@])],,[enable_openjdk_only="no"])
1.427 + [suppress building custom source even if present @<:@disabled@:>@])],,[enable_openjdk_only="no"])
1.428
1.429 AC_MSG_CHECKING([for presence of closed sources])
1.430 if test -d "$SRC_ROOT/jdk/src/closed"; then
1.431 @@ -338,100 +337,100 @@
1.432 AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
1.433 [
1.434
1.435 -###############################################################################
1.436 -#
1.437 -# Should we build a JDK/JVM with headful support (ie a graphical ui)?
1.438 -# We always build headless support.
1.439 -#
1.440 -AC_MSG_CHECKING([headful support])
1.441 -AC_ARG_ENABLE([headful], [AS_HELP_STRING([--disable-headful],
1.442 - [disable building headful support (graphical UI support) @<:@enabled@:>@])],
1.443 - [SUPPORT_HEADFUL=${enable_headful}], [SUPPORT_HEADFUL=yes])
1.444 + ###############################################################################
1.445 + #
1.446 + # Should we build a JDK/JVM with headful support (ie a graphical ui)?
1.447 + # We always build headless support.
1.448 + #
1.449 + AC_MSG_CHECKING([headful support])
1.450 + AC_ARG_ENABLE([headful], [AS_HELP_STRING([--disable-headful],
1.451 + [disable building headful support (graphical UI support) @<:@enabled@:>@])],
1.452 + [SUPPORT_HEADFUL=${enable_headful}], [SUPPORT_HEADFUL=yes])
1.453
1.454 -SUPPORT_HEADLESS=yes
1.455 -BUILD_HEADLESS="BUILD_HEADLESS:=true"
1.456 + SUPPORT_HEADLESS=yes
1.457 + BUILD_HEADLESS="BUILD_HEADLESS:=true"
1.458
1.459 -if test "x$SUPPORT_HEADFUL" = xyes; then
1.460 + if test "x$SUPPORT_HEADFUL" = xyes; then
1.461 # We are building both headful and headless.
1.462 - headful_msg="inlude support for both headful and headless"
1.463 -fi
1.464 + headful_msg="include support for both headful and headless"
1.465 + fi
1.466
1.467 -if test "x$SUPPORT_HEADFUL" = xno; then
1.468 + if test "x$SUPPORT_HEADFUL" = xno; then
1.469 # Thus we are building headless only.
1.470 BUILD_HEADLESS="BUILD_HEADLESS:=true"
1.471 headful_msg="headless only"
1.472 -fi
1.473 + fi
1.474
1.475 -AC_MSG_RESULT([$headful_msg])
1.476 + AC_MSG_RESULT([$headful_msg])
1.477
1.478 -AC_SUBST(SUPPORT_HEADLESS)
1.479 -AC_SUBST(SUPPORT_HEADFUL)
1.480 -AC_SUBST(BUILD_HEADLESS)
1.481 + AC_SUBST(SUPPORT_HEADLESS)
1.482 + AC_SUBST(SUPPORT_HEADFUL)
1.483 + AC_SUBST(BUILD_HEADLESS)
1.484
1.485 -# Control wether Hotspot runs Queens test after build.
1.486 -AC_ARG_ENABLE([hotspot-test-in-build], [AS_HELP_STRING([--enable-hotspot-test-in-build],
1.487 - [run the Queens test after Hotspot build @<:@disabled@:>@])],,
1.488 - [enable_hotspot_test_in_build=no])
1.489 -if test "x$enable_hotspot_test_in_build" = "xyes"; then
1.490 + # Control wether Hotspot runs Queens test after build.
1.491 + AC_ARG_ENABLE([hotspot-test-in-build], [AS_HELP_STRING([--enable-hotspot-test-in-build],
1.492 + [run the Queens test after Hotspot build @<:@disabled@:>@])],,
1.493 + [enable_hotspot_test_in_build=no])
1.494 + if test "x$enable_hotspot_test_in_build" = "xyes"; then
1.495 TEST_IN_BUILD=true
1.496 -else
1.497 + else
1.498 TEST_IN_BUILD=false
1.499 -fi
1.500 -AC_SUBST(TEST_IN_BUILD)
1.501 + fi
1.502 + AC_SUBST(TEST_IN_BUILD)
1.503
1.504 -###############################################################################
1.505 -#
1.506 -# Choose cacerts source file
1.507 -#
1.508 -AC_ARG_WITH(cacerts-file, [AS_HELP_STRING([--with-cacerts-file],
1.509 - [specify alternative cacerts file])])
1.510 -if test "x$with_cacerts_file" != x; then
1.511 + ###############################################################################
1.512 + #
1.513 + # Choose cacerts source file
1.514 + #
1.515 + AC_ARG_WITH(cacerts-file, [AS_HELP_STRING([--with-cacerts-file],
1.516 + [specify alternative cacerts file])])
1.517 + if test "x$with_cacerts_file" != x; then
1.518 CACERTS_FILE=$with_cacerts_file
1.519 -else
1.520 + else
1.521 CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts
1.522 -fi
1.523 -AC_SUBST(CACERTS_FILE)
1.524 + fi
1.525 + AC_SUBST(CACERTS_FILE)
1.526
1.527 -###############################################################################
1.528 -#
1.529 -# Enable or disable unlimited crypto
1.530 -#
1.531 -AC_ARG_ENABLE(unlimited-crypto, [AS_HELP_STRING([--enable-unlimited-crypto],
1.532 - [Enable unlimited crypto policy @<:@disabled@:>@])],,
1.533 - [enable_unlimited_crypto=no])
1.534 -if test "x$enable_unlimited_crypto" = "xyes"; then
1.535 + ###############################################################################
1.536 + #
1.537 + # Enable or disable unlimited crypto
1.538 + #
1.539 + AC_ARG_ENABLE(unlimited-crypto, [AS_HELP_STRING([--enable-unlimited-crypto],
1.540 + [Enable unlimited crypto policy @<:@disabled@:>@])],,
1.541 + [enable_unlimited_crypto=no])
1.542 + if test "x$enable_unlimited_crypto" = "xyes"; then
1.543 UNLIMITED_CRYPTO=true
1.544 -else
1.545 + else
1.546 UNLIMITED_CRYPTO=false
1.547 -fi
1.548 -AC_SUBST(UNLIMITED_CRYPTO)
1.549 + fi
1.550 + AC_SUBST(UNLIMITED_CRYPTO)
1.551
1.552 -###############################################################################
1.553 -#
1.554 -# Enable or disable the elliptic curve crypto implementation
1.555 -#
1.556 -AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC],
1.557 -[
1.558 -AC_MSG_CHECKING([if elliptic curve crypto implementation is present])
1.559 + ###############################################################################
1.560 + #
1.561 + # Enable or disable the elliptic curve crypto implementation
1.562 + #
1.563 + AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC],
1.564 + [
1.565 + AC_MSG_CHECKING([if elliptic curve crypto implementation is present])
1.566
1.567 -if test -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then
1.568 - ENABLE_INTREE_EC=yes
1.569 - AC_MSG_RESULT([yes])
1.570 -else
1.571 - ENABLE_INTREE_EC=no
1.572 - AC_MSG_RESULT([no])
1.573 -fi
1.574 + if test -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then
1.575 + ENABLE_INTREE_EC=yes
1.576 + AC_MSG_RESULT([yes])
1.577 + else
1.578 + ENABLE_INTREE_EC=no
1.579 + AC_MSG_RESULT([no])
1.580 + fi
1.581
1.582 -AC_SUBST(ENABLE_INTREE_EC)
1.583 -])
1.584 + AC_SUBST(ENABLE_INTREE_EC)
1.585 + ])
1.586
1.587 -###############################################################################
1.588 -#
1.589 -# Compress jars
1.590 -#
1.591 -COMPRESS_JARS=false
1.592 + ###############################################################################
1.593 + #
1.594 + # Compress jars
1.595 + #
1.596 + COMPRESS_JARS=false
1.597
1.598 -AC_SUBST(COMPRESS_JARS)
1.599 + AC_SUBST(COMPRESS_JARS)
1.600 ])
1.601
1.602 ###############################################################################
1.603 @@ -440,151 +439,152 @@
1.604 #
1.605 AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_VERSION_NUMBERS],
1.606 [
1.607 -# Source the version numbers
1.608 -. $AUTOCONF_DIR/version-numbers
1.609 + # Source the version numbers
1.610 + . $AUTOCONF_DIR/version-numbers
1.611
1.612 -# Get the settings from parameters
1.613 -AC_ARG_WITH(milestone, [AS_HELP_STRING([--with-milestone],
1.614 - [Set milestone value for build @<:@internal@:>@])])
1.615 -if test "x$with_milestone" = xyes; then
1.616 - AC_MSG_ERROR([Milestone must have a value])
1.617 -elif test "x$with_milestone" != x; then
1.618 + # Get the settings from parameters
1.619 + AC_ARG_WITH(milestone, [AS_HELP_STRING([--with-milestone],
1.620 + [Set milestone value for build @<:@internal@:>@])])
1.621 + if test "x$with_milestone" = xyes; then
1.622 + AC_MSG_ERROR([Milestone must have a value])
1.623 + elif test "x$with_milestone" != x; then
1.624 MILESTONE="$with_milestone"
1.625 -fi
1.626 -if test "x$MILESTONE" = x; then
1.627 - MILESTONE=internal
1.628 -fi
1.629 + fi
1.630 + if test "x$MILESTONE" = x; then
1.631 + MILESTONE=internal
1.632 + fi
1.633
1.634 -AC_ARG_WITH(update-version, [AS_HELP_STRING([--with-update-version],
1.635 - [Set update version value for build @<:@b00@:>@])])
1.636 -if test "x$with_update_version" = xyes; then
1.637 - AC_MSG_ERROR([Update version must have a value])
1.638 -elif test "x$with_update_version" != x; then
1.639 - JDK_UPDATE_VERSION="$with_update_version"
1.640 -fi
1.641 + AC_ARG_WITH(update-version, [AS_HELP_STRING([--with-update-version],
1.642 + [Set update version value for build @<:@b00@:>@])])
1.643 + if test "x$with_update_version" = xyes; then
1.644 + AC_MSG_ERROR([Update version must have a value])
1.645 + elif test "x$with_update_version" != x; then
1.646 + JDK_UPDATE_VERSION="$with_update_version"
1.647 + fi
1.648
1.649 -AC_ARG_WITH(build-number, [AS_HELP_STRING([--with-build-number],
1.650 - [Set build number value for build @<:@b00@:>@])])
1.651 -if test "x$with_build_number" = xyes; then
1.652 - AC_MSG_ERROR([Build number must have a value])
1.653 -elif test "x$with_build_number" != x; then
1.654 - JDK_BUILD_NUMBER="$with_build_number"
1.655 -fi
1.656 -if test "x$JDK_BUILD_NUMBER" = x; then
1.657 - JDK_BUILD_NUMBER=b00
1.658 -fi
1.659 + AC_ARG_WITH(user-release-suffix, [AS_HELP_STRING([--with-user-release-suffix],
1.660 + [Add a custom string to the version string if build number isn't set.@<:@username_builddateb00@:>@])])
1.661 + if test "x$with_user_release_suffix" = xyes; then
1.662 + AC_MSG_ERROR([Release suffix must have a value])
1.663 + elif test "x$with_user_release_suffix" != x; then
1.664 + USER_RELEASE_SUFFIX="$with_user_release_suffix"
1.665 + fi
1.666
1.667 -AC_ARG_WITH(user-release-suffix, [AS_HELP_STRING([--with-user-release-suffix],
1.668 - [Add a custom string to the version string if build number isn't set.@<:@username_builddateb00@:>@])])
1.669 -if test "x$with_user_release_suffix" = xyes; then
1.670 - AC_MSG_ERROR([Release suffix must have a value])
1.671 -elif test "x$with_user_release_suffix" != x; then
1.672 - USER_RELEASE_SUFFIX="$with_user_release_suffix"
1.673 -else
1.674 - BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
1.675 - # Avoid [:alnum:] since it depends on the locale.
1.676 - CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyz0123456789'`
1.677 - USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.678 -fi
1.679 -AC_SUBST(USER_RELEASE_SUFFIX)
1.680 + AC_ARG_WITH(build-number, [AS_HELP_STRING([--with-build-number],
1.681 + [Set build number value for build @<:@b00@:>@])])
1.682 + if test "x$with_build_number" = xyes; then
1.683 + AC_MSG_ERROR([Build number must have a value])
1.684 + elif test "x$with_build_number" != x; then
1.685 + JDK_BUILD_NUMBER="$with_build_number"
1.686 + fi
1.687 + # Define default USER_RELEASE_SUFFIX if BUILD_NUMBER and USER_RELEASE_SUFFIX are not set
1.688 + if test "x$JDK_BUILD_NUMBER" = x; then
1.689 + JDK_BUILD_NUMBER=b00
1.690 + if test "x$USER_RELEASE_SUFFIX" = x; then
1.691 + BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
1.692 + # Avoid [:alnum:] since it depends on the locale.
1.693 + CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'`
1.694 + USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.695 + fi
1.696 + fi
1.697
1.698 -# Now set the JDK version, milestone, build number etc.
1.699 -AC_SUBST(JDK_MAJOR_VERSION)
1.700 -AC_SUBST(JDK_MINOR_VERSION)
1.701 -AC_SUBST(JDK_MICRO_VERSION)
1.702 -AC_SUBST(JDK_UPDATE_VERSION)
1.703 -AC_SUBST(JDK_BUILD_NUMBER)
1.704 -AC_SUBST(MILESTONE)
1.705 -AC_SUBST(LAUNCHER_NAME)
1.706 -AC_SUBST(PRODUCT_NAME)
1.707 -AC_SUBST(PRODUCT_SUFFIX)
1.708 -AC_SUBST(JDK_RC_PLATFORM_NAME)
1.709 -AC_SUBST(COMPANY_NAME)
1.710 -AC_SUBST(MACOSX_BUNDLE_NAME_BASE)
1.711 -AC_SUBST(MACOSX_BUNDLE_ID_BASE)
1.712 + # Now set the JDK version, milestone, build number etc.
1.713 + AC_SUBST(USER_RELEASE_SUFFIX)
1.714 + AC_SUBST(JDK_MAJOR_VERSION)
1.715 + AC_SUBST(JDK_MINOR_VERSION)
1.716 + AC_SUBST(JDK_MICRO_VERSION)
1.717 + AC_SUBST(JDK_UPDATE_VERSION)
1.718 + AC_SUBST(JDK_BUILD_NUMBER)
1.719 + AC_SUBST(MILESTONE)
1.720 + AC_SUBST(LAUNCHER_NAME)
1.721 + AC_SUBST(PRODUCT_NAME)
1.722 + AC_SUBST(PRODUCT_SUFFIX)
1.723 + AC_SUBST(JDK_RC_PLATFORM_NAME)
1.724 + AC_SUBST(COMPANY_NAME)
1.725 + AC_SUBST(MACOSX_BUNDLE_NAME_BASE)
1.726 + AC_SUBST(MACOSX_BUNDLE_ID_BASE)
1.727
1.728 -COPYRIGHT_YEAR=`date +'%Y'`
1.729 -AC_SUBST(COPYRIGHT_YEAR)
1.730 + COPYRIGHT_YEAR=`date +'%Y'`
1.731 + AC_SUBST(COPYRIGHT_YEAR)
1.732
1.733 -if test "x$JDK_UPDATE_VERSION" != x; then
1.734 - JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}"
1.735 -else
1.736 - JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}"
1.737 -fi
1.738 -AC_SUBST(JDK_VERSION)
1.739 + if test "x$JDK_UPDATE_VERSION" != x; then
1.740 + JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}"
1.741 + else
1.742 + JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}"
1.743 + fi
1.744 + AC_SUBST(JDK_VERSION)
1.745
1.746 -COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'`
1.747 -AC_SUBST(COOKED_BUILD_NUMBER)
1.748 + COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'`
1.749 + AC_SUBST(COOKED_BUILD_NUMBER)
1.750 ])
1.751
1.752 AC_DEFUN_ONCE([JDKOPT_SETUP_BUILD_TWEAKS],
1.753 [
1.754 -HOTSPOT_MAKE_ARGS="$HOTSPOT_TARGET"
1.755 -AC_SUBST(HOTSPOT_MAKE_ARGS)
1.756 + HOTSPOT_MAKE_ARGS="$HOTSPOT_TARGET"
1.757 + AC_SUBST(HOTSPOT_MAKE_ARGS)
1.758
1.759 -# The name of the Service Agent jar.
1.760 -SALIB_NAME="${LIBRARY_PREFIX}saproc${SHARED_LIBRARY_SUFFIX}"
1.761 -if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
1.762 - SALIB_NAME="${LIBRARY_PREFIX}sawindbg${SHARED_LIBRARY_SUFFIX}"
1.763 -fi
1.764 -AC_SUBST(SALIB_NAME)
1.765 -
1.766 + # The name of the Service Agent jar.
1.767 + SALIB_NAME="${LIBRARY_PREFIX}saproc${SHARED_LIBRARY_SUFFIX}"
1.768 + if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
1.769 + SALIB_NAME="${LIBRARY_PREFIX}sawindbg${SHARED_LIBRARY_SUFFIX}"
1.770 + fi
1.771 + AC_SUBST(SALIB_NAME)
1.772 ])
1.773
1.774 AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
1.775 [
1.776 -#
1.777 -# ENABLE_DEBUG_SYMBOLS
1.778 -# This must be done after the toolchain is setup, since we're looking at objcopy.
1.779 -#
1.780 -AC_ARG_ENABLE([debug-symbols],
1.781 - [AS_HELP_STRING([--disable-debug-symbols],[disable generation of debug symbols @<:@enabled@:>@])])
1.782 + #
1.783 + # ENABLE_DEBUG_SYMBOLS
1.784 + # This must be done after the toolchain is setup, since we're looking at objcopy.
1.785 + #
1.786 + AC_ARG_ENABLE([debug-symbols],
1.787 + [AS_HELP_STRING([--disable-debug-symbols],[disable generation of debug symbols @<:@enabled@:>@])])
1.788
1.789 -AC_MSG_CHECKING([if we should generate debug symbols])
1.790 + AC_MSG_CHECKING([if we should generate debug symbols])
1.791
1.792 -if test "x$enable_debug_symbols" = "xyes" && test "x$OBJCOPY" = x; then
1.793 - # explicit enabling of enable-debug-symbols and can't find objcopy
1.794 - # this is an error
1.795 - AC_MSG_ERROR([Unable to find objcopy, cannot enable debug-symbols])
1.796 -fi
1.797 + if test "x$enable_debug_symbols" = "xyes" && test "x$OBJCOPY" = x; then
1.798 + # explicit enabling of enable-debug-symbols and can't find objcopy
1.799 + # this is an error
1.800 + AC_MSG_ERROR([Unable to find objcopy, cannot enable debug-symbols])
1.801 + fi
1.802
1.803 -if test "x$enable_debug_symbols" = "xyes"; then
1.804 - ENABLE_DEBUG_SYMBOLS=true
1.805 -elif test "x$enable_debug_symbols" = "xno"; then
1.806 - ENABLE_DEBUG_SYMBOLS=false
1.807 -else
1.808 - # default on macosx is false
1.809 - if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.810 + if test "x$enable_debug_symbols" = "xyes"; then
1.811 + ENABLE_DEBUG_SYMBOLS=true
1.812 + elif test "x$enable_debug_symbols" = "xno"; then
1.813 ENABLE_DEBUG_SYMBOLS=false
1.814 - # Default is on if objcopy is found, otherwise off
1.815 - elif test "x$OBJCOPY" != x || test "x$OPENJDK_TARGET_OS" = xwindows; then
1.816 - ENABLE_DEBUG_SYMBOLS=true
1.817 else
1.818 - ENABLE_DEBUG_SYMBOLS=false
1.819 + # Default is on if objcopy is found
1.820 + if test "x$OBJCOPY" != x; then
1.821 + ENABLE_DEBUG_SYMBOLS=true
1.822 + # MacOS X and Windows don't use objcopy but default is on for those OSes
1.823 + elif test "x$OPENJDK_TARGET_OS" = xmacosx || test "x$OPENJDK_TARGET_OS" = xwindows; then
1.824 + ENABLE_DEBUG_SYMBOLS=true
1.825 + else
1.826 + ENABLE_DEBUG_SYMBOLS=false
1.827 + fi
1.828 fi
1.829 -fi
1.830
1.831 -AC_MSG_RESULT([$ENABLE_DEBUG_SYMBOLS])
1.832 + AC_MSG_RESULT([$ENABLE_DEBUG_SYMBOLS])
1.833
1.834 -#
1.835 -# ZIP_DEBUGINFO_FILES
1.836 -#
1.837 -AC_MSG_CHECKING([if we should zip debug-info files])
1.838 -AC_ARG_ENABLE([zip-debug-info],
1.839 - [AS_HELP_STRING([--disable-zip-debug-info],[disable zipping of debug-info files @<:@enabled@:>@])],
1.840 - [enable_zip_debug_info="${enableval}"], [enable_zip_debug_info="yes"])
1.841 -AC_MSG_RESULT([${enable_zip_debug_info}])
1.842 + #
1.843 + # ZIP_DEBUGINFO_FILES
1.844 + #
1.845 + AC_MSG_CHECKING([if we should zip debug-info files])
1.846 + AC_ARG_ENABLE([zip-debug-info],
1.847 + [AS_HELP_STRING([--disable-zip-debug-info],[disable zipping of debug-info files @<:@enabled@:>@])],
1.848 + [enable_zip_debug_info="${enableval}"], [enable_zip_debug_info="yes"])
1.849 + AC_MSG_RESULT([${enable_zip_debug_info}])
1.850
1.851 -if test "x${enable_zip_debug_info}" = "xno"; then
1.852 - ZIP_DEBUGINFO_FILES=false
1.853 -else
1.854 - ZIP_DEBUGINFO_FILES=true
1.855 -fi
1.856 + if test "x${enable_zip_debug_info}" = "xno"; then
1.857 + ZIP_DEBUGINFO_FILES=false
1.858 + else
1.859 + ZIP_DEBUGINFO_FILES=true
1.860 + fi
1.861
1.862 -AC_SUBST(ENABLE_DEBUG_SYMBOLS)
1.863 -AC_SUBST(ZIP_DEBUGINFO_FILES)
1.864 -AC_SUBST(CFLAGS_DEBUG_SYMBOLS)
1.865 -AC_SUBST(CXXFLAGS_DEBUG_SYMBOLS)
1.866 + AC_SUBST(ENABLE_DEBUG_SYMBOLS)
1.867 + AC_SUBST(ZIP_DEBUGINFO_FILES)
1.868 + AC_SUBST(CFLAGS_DEBUG_SYMBOLS)
1.869 + AC_SUBST(CXXFLAGS_DEBUG_SYMBOLS)
1.870 ])
1.871
1.872 # Support for customization of the build process. Some build files
1.873 @@ -592,5 +592,5 @@
1.874 # for a degree of customization of the build targets and the rules/recipes
1.875 # to create them
1.876 AC_ARG_WITH([custom-make-dir], [AS_HELP_STRING([--with-custom-make-dir],
1.877 - [use this directory for custom build/make files])], [CUSTOM_MAKE_DIR=$with_custom_make_dir])
1.878 +[use this directory for custom build/make files])], [CUSTOM_MAKE_DIR=$with_custom_make_dir])
1.879 AC_SUBST(CUSTOM_MAKE_DIR)
