1.1 --- a/common/autoconf/generated-configure.sh Tue Dec 11 11:29:58 2012 +0100
1.2 +++ b/common/autoconf/generated-configure.sh Tue Dec 11 11:33:34 2012 +0100
1.3 @@ -3674,7 +3674,7 @@
1.4 #CUSTOM_AUTOCONF_INCLUDE
1.5
1.6 # Do not change or remove the following line, it is needed for consistency checks:
1.7 -DATE_WHEN_GENERATED=1355221697
1.8 +DATE_WHEN_GENERATED=1355221914
1.9
1.10 ###############################################################################
1.11 #
1.12 @@ -27820,34 +27820,34 @@
1.13 # ENABLE_DEBUG_SYMBOLS
1.14 # This must be done after the toolchain is setup, since we're looking at objcopy.
1.15 #
1.16 -ENABLE_DEBUG_SYMBOLS=default
1.17 -
1.18 -# default on macosx is no...
1.19 -if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.20 - ENABLE_DEBUG_SYMBOLS=no
1.21 -fi
1.22 -
1.23 # Check whether --enable-debug-symbols was given.
1.24 if test "${enable_debug_symbols+set}" = set; then :
1.25 - enableval=$enable_debug_symbols; ENABLE_DEBUG_SYMBOLS=${enable_debug_symbols}
1.26 + enableval=$enable_debug_symbols;
1.27 fi
1.28
1.29
1.30 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should generate debug symbols" >&5
1.31 $as_echo_n "checking if we should generate debug symbols... " >&6; }
1.32
1.33 -if test "x$ENABLE_DEBUG_SYMBOLS" = "xyes" && test "x$OBJCOPY" = x; then
1.34 +if test "x$enable_debug_symbols" = "xyes" && test "x$OBJCOPY" = x; then
1.35 # explicit enabling of enable-debug-symbols and can't find objcopy
1.36 # this is an error
1.37 as_fn_error $? "Unable to find objcopy, cannot enable debug-symbols" "$LINENO" 5
1.38 fi
1.39
1.40 -if test "x$ENABLE_DEBUG_SYMBOLS" = "xdefault"; then
1.41 +if test "x$enable_debug_symbols" = "xyes"; then
1.42 + ENABLE_DEBUG_SYMBOLS=true
1.43 +elif test "x$enable_debug_symbols" = "xno"; then
1.44 + ENABLE_DEBUG_SYMBOLS=false
1.45 +else
1.46 + # default on macosx is false
1.47 + if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.48 + ENABLE_DEBUG_SYMBOLS=false
1.49 # Default is on if objcopy is found, otherwise off
1.50 - if test "x$OBJCOPY" != x || test "x$OPENJDK_TARGET_OS" = xwindows; then
1.51 - ENABLE_DEBUG_SYMBOLS=yes
1.52 - else
1.53 - ENABLE_DEBUG_SYMBOLS=no
1.54 + elif test "x$OBJCOPY" != x || test "x$OPENJDK_TARGET_OS" = xwindows; then
1.55 + ENABLE_DEBUG_SYMBOLS=true
1.56 + else
1.57 + ENABLE_DEBUG_SYMBOLS=false
1.58 fi
1.59 fi
1.60
1.61 @@ -27857,25 +27857,21 @@
1.62 #
1.63 # ZIP_DEBUGINFO_FILES
1.64 #
1.65 -ZIP_DEBUGINFO_FILES=yes
1.66 -
1.67 # Check whether --enable-zip-debug-info was given.
1.68 if test "${enable_zip_debug_info+set}" = set; then :
1.69 - enableval=$enable_zip_debug_info; ZIP_DEBUGINFO_FILES=${enable_zip_debug_info}
1.70 + enableval=$enable_zip_debug_info;
1.71 fi
1.72
1.73
1.74 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should zip debug-info files" >&5
1.75 $as_echo_n "checking if we should zip debug-info files... " >&6; }
1.76 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZIP_DEBUGINFO_FILES" >&5
1.77 -$as_echo "$ZIP_DEBUGINFO_FILES" >&6; }
1.78 -
1.79 -# Hotspot wants ZIP_DEBUGINFO_FILES to be 1 for yes
1.80 -# use that...
1.81 -if test "x$ZIP_DEBUGINFO_FILES" = "xyes"; then
1.82 - ZIP_DEBUGINFO_FILES=1
1.83 -else
1.84 - ZIP_DEBUGINFO_FILES=0
1.85 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_zip_debug_info}" >&5
1.86 +$as_echo "${enable_zip_debug_info}" >&6; }
1.87 +
1.88 +if test "x${enable_zip_debug_info}" = "xno"; then
1.89 + ZIP_DEBUGINFO_FILES=false
1.90 +else
1.91 + ZIP_DEBUGINFO_FILES=true
1.92 fi
1.93
1.94
