common/autoconf/generated-configure.sh

changeset 855
ac09e62d5e6b
parent 841
547316ea137d
parent 854
22c6f0b7e2b5
child 864
9e177e7fc438
     1.1 --- a/common/autoconf/generated-configure.sh	Thu Oct 17 09:40:42 2013 -0700
     1.2 +++ b/common/autoconf/generated-configure.sh	Sat Oct 19 08:51:39 2013 -0700
     1.3 @@ -824,6 +824,7 @@
     1.4  OS_VERSION_MAJOR
     1.5  PKG_CONFIG
     1.6  CODESIGN
     1.7 +DSYMUTIL
     1.8  XATTR
     1.9  IS_GNU_TIME
    1.10  TIME
    1.11 @@ -10592,6 +10593,64 @@
    1.12  $as_echo "yes" >&6; }
    1.13        fi
    1.14      fi
    1.15 +
    1.16 +
    1.17 +    for ac_prog in dsymutil
    1.18 +do
    1.19 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
    1.20 +set dummy $ac_prog; ac_word=$2
    1.21 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    1.22 +$as_echo_n "checking for $ac_word... " >&6; }
    1.23 +if ${ac_cv_path_DSYMUTIL+:} false; then :
    1.24 +  $as_echo_n "(cached) " >&6
    1.25 +else
    1.26 +  case $DSYMUTIL in
    1.27 +  [\\/]* | ?:[\\/]*)
    1.28 +  ac_cv_path_DSYMUTIL="$DSYMUTIL" # Let the user override the test with a path.
    1.29 +  ;;
    1.30 +  *)
    1.31 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    1.32 +for as_dir in $PATH
    1.33 +do
    1.34 +  IFS=$as_save_IFS
    1.35 +  test -z "$as_dir" && as_dir=.
    1.36 +    for ac_exec_ext in '' $ac_executable_extensions; do
    1.37 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    1.38 +    ac_cv_path_DSYMUTIL="$as_dir/$ac_word$ac_exec_ext"
    1.39 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    1.40 +    break 2
    1.41 +  fi
    1.42 +done
    1.43 +  done
    1.44 +IFS=$as_save_IFS
    1.45 +
    1.46 +  ;;
    1.47 +esac
    1.48 +fi
    1.49 +DSYMUTIL=$ac_cv_path_DSYMUTIL
    1.50 +if test -n "$DSYMUTIL"; then
    1.51 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
    1.52 +$as_echo "$DSYMUTIL" >&6; }
    1.53 +else
    1.54 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    1.55 +$as_echo "no" >&6; }
    1.56 +fi
    1.57 +
    1.58 +
    1.59 +  test -n "$DSYMUTIL" && break
    1.60 +done
    1.61 +
    1.62 +
    1.63 +    if test "x$DSYMUTIL" = x; then
    1.64 +        if test "xdsymutil" = x; then
    1.65 +          PROG_NAME=dsymutil
    1.66 +        else
    1.67 +          PROG_NAME=dsymutil
    1.68 +        fi
    1.69 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
    1.70 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
    1.71 +        as_fn_error $? "Cannot continue" "$LINENO" 5
    1.72 +    fi
    1.73    fi
    1.74  
    1.75  
    1.76 @@ -29539,11 +29598,11 @@
    1.77    elif test "x$enable_debug_symbols" = "xno"; then
    1.78      ENABLE_DEBUG_SYMBOLS=false
    1.79    else
    1.80 -    # default on macosx is false
    1.81 -    if test "x$OPENJDK_TARGET_OS" = xmacosx; then
    1.82 -      ENABLE_DEBUG_SYMBOLS=false
    1.83 -      # Default is on if objcopy is found, otherwise off
    1.84 -    elif test "x$OBJCOPY" != x || test "x$OPENJDK_TARGET_OS" = xwindows; then
    1.85 +  # Default is on if objcopy is found
    1.86 +  if test "x$OBJCOPY" != x; then
    1.87 +    ENABLE_DEBUG_SYMBOLS=true
    1.88 +  # MacOS X and Windows don't use objcopy but default is on for those OSes
    1.89 +  elif test "x$OPENJDK_TARGET_OS" = xmacosx || test "x$OPENJDK_TARGET_OS" = xwindows; then
    1.90        ENABLE_DEBUG_SYMBOLS=true
    1.91      else
    1.92        ENABLE_DEBUG_SYMBOLS=false

mercurial