diff options
| author | Pawel Wodnicki <pawel@32bitmicro.com> | 2012-11-21 16:13:35 +0000 |
|---|---|---|
| committer | Pawel Wodnicki <pawel@32bitmicro.com> | 2012-11-21 16:13:35 +0000 |
| commit | 50a66acf1b7920e26618939882701be0e0574ca2 (patch) | |
| tree | a9547e27b6d78cae5f9d5baefabd585774319b40 | |
| parent | 81c4d420bfe93446ca2b167315f12bf275441683 (diff) | |
| download | llvm-50a66acf1b7920e26618939882701be0e0574ca2.tar.gz llvm-50a66acf1b7920e26618939882701be0e0574ca2.tar.bz2 llvm-50a66acf1b7920e26618939882701be0e0574ca2.tar.xz | |
Merging r168319 into 3.2 release branch
Fix a pasto.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_32@168432 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | autoconf/configure.ac | 6 | ||||
| -rwxr-xr-x | configure | 12 |
2 files changed, 10 insertions, 8 deletions
diff --git a/autoconf/configure.ac b/autoconf/configure.ac index f1842a6d8a..7715531a33 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -685,9 +685,9 @@ AC_ARG_ENABLE(backtraces, [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, @@ -704,6 +704,7 @@ ENABLE_PIC ENABLE_SHARED ENABLE_EMBED_STDCXX ENABLE_TIMESTAMPS +ENABLE_BACKTRACES TARGETS_TO_BUILD LLVM_ENUM_TARGETS LLVM_ENUM_ASM_PRINTERS @@ -5390,11 +5391,11 @@ else 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 @@ else 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_PIC!$ENABLE_PIC$ac_delim 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 @@ LIBOBJS!$LIBOBJS$ac_delim 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 |