[llvm-branch-commits] [llvm-branch] r168432 - in /llvm/branches/release_32: ./ autoconf/configure.ac configure

[Pawel Wodnicki]

Author: pawel
Date: Wed Nov 21 10:13:35 2012
New Revision: 168432

URL: http://llvm.org/viewvc/llvm-project?rev=168432&view=rev
Log:
Merging r168319 into 3.2 release branch

Fix a pasto.

Modified:
    llvm/branches/release_32/   (props changed)
    llvm/branches/release_32/autoconf/configure.ac
    llvm/branches/release_32/configure

Propchange: llvm/branches/release_32/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 21 10:13:35 2012
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,167718-167719,167731,167737,167743,167750,167784,167811,167817,167855,167860-167864,167875,167942,167948,167966,168001,168189,168198,168316,168352
+/llvm/trunk:155241,167718-167719,167731,167737,167743,167750,167784,167811,167817,167855,167860-167864,167875,167942,167948,167966,168001,168189,168198,168316,168319,168352

Modified: llvm/branches/release_32/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_32/autoconf/configure.ac?rev=168432&r1=168431&r2=168432&view=diff
==============================================================================
--- llvm/branches/release_32/autoconf/configure.ac (original)
+++ llvm/branches/release_32/autoconf/configure.ac Wed Nov 21 10:13:35 2012
@@ -685,9 +685,9 @@
                  [Enable embedding backtraces on crash (default is YES)]),,
                  enableval=default)
 case "$enableval" in
-  yes) AC_SUBST(ENABLE_TIMESTAMPS,[1]) ;;
-  no)  AC_SUBST(ENABLE_TIMESTAMPS,[0]) ;;
-  default) AC_SUBST(ENABLE_TIMESTAMPS,[1]) ;;
+  yes) AC_SUBST(ENABLE_BACKTRACES,[1]) ;;
+  no)  AC_SUBST(ENABLE_BACKTRACES,[0]) ;;
+  default) AC_SUBST(ENABLE_BACKTRACES,[1]) ;;
   *) AC_MSG_ERROR([Invalid setting for --enable-backtraces. Use "yes" or "no"]) ;;
 esac
 AC_DEFINE_UNQUOTED([ENABLE_BACKTRACES],$ENABLE_BACKTRACES,

Modified: llvm/branches/release_32/configure
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_32/configure?rev=168432&r1=168431&r2=168432&view=diff
==============================================================================
--- llvm/branches/release_32/configure (original)
+++ llvm/branches/release_32/configure Wed Nov 21 10:13:35 2012
@@ -704,6 +704,7 @@
 ENABLE_SHARED
 ENABLE_EMBED_STDCXX
 ENABLE_TIMESTAMPS
+ENABLE_BACKTRACES
 TARGETS_TO_BUILD
 LLVM_ENUM_TARGETS
 LLVM_ENUM_ASM_PRINTERS
@@ -5390,11 +5391,11 @@
 fi
 
 case "$enableval" in
-  yes) ENABLE_TIMESTAMPS=1
+  yes) ENABLE_BACKTRACES=1
  ;;
-  no)  ENABLE_TIMESTAMPS=0
+  no)  ENABLE_BACKTRACES=0
  ;;
-  default) ENABLE_TIMESTAMPS=1
+  default) ENABLE_BACKTRACES=1
  ;;
   *) { { echo "$as_me:$LINENO: error: Invalid setting for --enable-backtraces. Use \"yes\" or \"no\"" >&5
 echo "$as_me: error: Invalid setting for --enable-backtraces. Use \"yes\" or \"no\"" >&2;}
@@ -10315,7 +10316,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10318 "configure"
+#line 10317 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -21971,6 +21972,7 @@
 ENABLE_SHARED!$ENABLE_SHARED$ac_delim
 ENABLE_EMBED_STDCXX!$ENABLE_EMBED_STDCXX$ac_delim
 ENABLE_TIMESTAMPS!$ENABLE_TIMESTAMPS$ac_delim
+ENABLE_BACKTRACES!$ENABLE_BACKTRACES$ac_delim
 TARGETS_TO_BUILD!$TARGETS_TO_BUILD$ac_delim
 LLVM_ENUM_TARGETS!$LLVM_ENUM_TARGETS$ac_delim
 LLVM_ENUM_ASM_PRINTERS!$LLVM_ENUM_ASM_PRINTERS$ac_delim
@@ -22062,7 +22064,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 94; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 95; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5