diff options
author | Bill Wendling <isanbard@gmail.com> | 2011-03-25 07:56:32 +0000 |
---|---|---|
committer | Bill Wendling <isanbard@gmail.com> | 2011-03-25 07:56:32 +0000 |
commit | 4b28ae012749fd4c4d91213ae7f39767d48cb737 (patch) | |
tree | 8376197a6cae7f07f3068fda1d0975d137cfad57 | |
parent | 2c1cebe7b681e58c51b2c1d03129ba7fd14ad3db (diff) | |
download | llvm-4b28ae012749fd4c4d91213ae7f39767d48cb737.zip llvm-4b28ae012749fd4c4d91213ae7f39767d48cb737.tar.gz llvm-4b28ae012749fd4c4d91213ae7f39767d48cb737.tar.bz2 |
* Change version to 2.9.
* Default to optimizations enabled.
* Default to assertions disabled.
llvm-svn: 128269
-rw-r--r-- | llvm/autoconf/configure.ac | 10 | ||||
-rwxr-xr-x | llvm/configure | 25 |
2 files changed, 17 insertions, 18 deletions
diff --git a/llvm/autoconf/configure.ac b/llvm/autoconf/configure.ac index 9259633..27d9bd4 100644 --- a/llvm/autoconf/configure.ac +++ b/llvm/autoconf/configure.ac @@ -31,12 +31,12 @@ dnl=== dnl===-----------------------------------------------------------------------=== dnl Initialize autoconf and define the package name, version number and dnl email address for reporting bugs. -AC_INIT([[llvm]],[[2.9svn]],[llvmbugs@cs.uiuc.edu]) +AC_INIT([[llvm]],[[2.9]],[llvmbugs@cs.uiuc.edu]) dnl Provide a copyright substitution and ensure the copyright notice is included dnl in the output of --version option of the generated configure script. -AC_SUBST(LLVM_COPYRIGHT,["Copyright (c) 2003-2010 University of Illinois at Urbana-Champaign."]) -AC_COPYRIGHT([Copyright (c) 2003-2010 University of Illinois at Urbana-Champaign.]) +AC_SUBST(LLVM_COPYRIGHT,["Copyright (c) 2003-2011 University of Illinois at Urbana-Champaign."]) +AC_COPYRIGHT([Copyright (c) 2003-2011 University of Illinois at Urbana-Champaign.]) dnl Indicate that we require autoconf 2.59 or later. Ths is needed because we dnl use some autoconf macros only available in 2.59. @@ -411,7 +411,7 @@ dnl===-----------------------------------------------------------------------=== dnl --enable-optimized : check whether they want to do an optimized build: AC_ARG_ENABLE(optimized, AS_HELP_STRING( - --enable-optimized,[Compile with optimizations enabled (default is NO)]),,enableval=$optimize) + --enable-optimized,[Compile with optimizations enabled (default is YES)]),,enableval=$optimize) if test ${enableval} = "no" ; then AC_SUBST(ENABLE_OPTIMIZED,[[]]) else @@ -429,7 +429,7 @@ fi dnl --enable-assertions : check whether they want to turn on assertions or not: AC_ARG_ENABLE(assertions,AS_HELP_STRING( - --enable-assertions,[Compile with assertion checks enabled (default is YES)]),, enableval="yes") + --enable-assertions,[Compile with assertion checks enabled (default is NO)]),, enableval="no") if test ${enableval} = "yes" ; then AC_SUBST(DISABLE_ASSERTIONS,[[]]) else diff --git a/llvm/configure b/llvm/configure index 959822f..52bf9882 100755 --- a/llvm/configure +++ b/llvm/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for llvm 2.9svn. +# Generated by GNU Autoconf 2.60 for llvm 2.9. # # Report bugs to <llvmbugs@cs.uiuc.edu>. # @@ -561,8 +561,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='llvm' PACKAGE_TARNAME='-llvm-' -PACKAGE_VERSION='2.9svn' -PACKAGE_STRING='llvm 2.9svn' +PACKAGE_VERSION='2.9' +PACKAGE_STRING='llvm 2.9' PACKAGE_BUGREPORT='llvmbugs@cs.uiuc.edu' ac_unique_file="lib/VMCore/Module.cpp" @@ -1328,7 +1328,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures llvm 2.9svn to adapt to many kinds of systems. +\`configure' configures llvm 2.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1394,7 +1394,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of llvm 2.9svn:";; + short | recursive ) echo "Configuration of llvm 2.9:";; esac cat <<\_ACEOF @@ -1402,10 +1402,9 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-polly Use polly if available (default is YES) - --enable-optimized Compile with optimizations enabled (default is NO) + --enable-optimized Compile with optimizations enabled (default is YES) --enable-profiling Compile with profiling enabled (default is NO) - --enable-assertions Compile with assertion checks enabled (default is - YES) + --enable-assertions Compile with assertion checks enabled (default is NO) --enable-expensive-checks Compile with expensive debug checks enabled (default is NO) @@ -1551,7 +1550,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -llvm configure 2.9svn +llvm configure 2.9 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1567,7 +1566,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by llvm $as_me 2.9svn, which was +It was created by llvm $as_me 2.9, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -4774,7 +4773,7 @@ fi if test "${enable_assertions+set}" = set; then enableval=$enable_assertions; else - enableval="yes" + enableval="no" fi if test ${enableval} = "yes" ; then @@ -22942,7 +22941,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by llvm $as_me 2.9svn, which was +This file was extended by llvm $as_me 2.9, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22995,7 +22994,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -llvm config.status 2.9svn +llvm config.status 2.9 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" |