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