Skip to content

Commit 4b28ae0

Browse files
committed
* Change version to 2.9.
* Default to optimizations enabled. * Default to assertions disabled. llvm-svn: 128269
1 parent 2c1cebe commit 4b28ae0

File tree

2 files changed

+17
-18
lines changed

2 files changed

+17
-18
lines changed

llvm/autoconf/configure.ac

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ dnl===
3131
dnl===-----------------------------------------------------------------------===
3232
dnl Initialize autoconf and define the package name, version number and
3333
dnl email address for reporting bugs.
34-
AC_INIT([[llvm]],[[2.9svn]],[[email protected]])
34+
AC_INIT([[llvm]],[[2.9]],[[email protected]])
3535

3636
dnl Provide a copyright substitution and ensure the copyright notice is included
3737
dnl in the output of --version option of the generated configure script.
38-
AC_SUBST(LLVM_COPYRIGHT,["Copyright (c) 2003-2010 University of Illinois at Urbana-Champaign."])
39-
AC_COPYRIGHT([Copyright (c) 2003-2010 University of Illinois at Urbana-Champaign.])
38+
AC_SUBST(LLVM_COPYRIGHT,["Copyright (c) 2003-2011 University of Illinois at Urbana-Champaign."])
39+
AC_COPYRIGHT([Copyright (c) 2003-2011 University of Illinois at Urbana-Champaign.])
4040

4141
dnl Indicate that we require autoconf 2.59 or later. Ths is needed because we
4242
dnl use some autoconf macros only available in 2.59.
@@ -411,7 +411,7 @@ dnl===-----------------------------------------------------------------------===
411411

412412
dnl --enable-optimized : check whether they want to do an optimized build:
413413
AC_ARG_ENABLE(optimized, AS_HELP_STRING(
414-
--enable-optimized,[Compile with optimizations enabled (default is NO)]),,enableval=$optimize)
414+
--enable-optimized,[Compile with optimizations enabled (default is YES)]),,enableval=$optimize)
415415
if test ${enableval} = "no" ; then
416416
AC_SUBST(ENABLE_OPTIMIZED,[[]])
417417
else
@@ -429,7 +429,7 @@ fi
429429

430430
dnl --enable-assertions : check whether they want to turn on assertions or not:
431431
AC_ARG_ENABLE(assertions,AS_HELP_STRING(
432-
--enable-assertions,[Compile with assertion checks enabled (default is YES)]),, enableval="yes")
432+
--enable-assertions,[Compile with assertion checks enabled (default is NO)]),, enableval="no")
433433
if test ${enableval} = "yes" ; then
434434
AC_SUBST(DISABLE_ASSERTIONS,[[]])
435435
else

llvm/configure

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.60 for llvm 2.9svn.
3+
# Generated by GNU Autoconf 2.60 for llvm 2.9.
44
#
55
# Report bugs to <[email protected]>.
66
#
@@ -561,8 +561,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
561561
# Identity of this package.
562562
PACKAGE_NAME='llvm'
563563
PACKAGE_TARNAME='-llvm-'
564-
PACKAGE_VERSION='2.9svn'
565-
PACKAGE_STRING='llvm 2.9svn'
564+
PACKAGE_VERSION='2.9'
565+
PACKAGE_STRING='llvm 2.9'
566566
PACKAGE_BUGREPORT='[email protected]'
567567

568568
ac_unique_file="lib/VMCore/Module.cpp"
@@ -1328,7 +1328,7 @@ if test "$ac_init_help" = "long"; then
13281328
# Omit some internal or obsolete options to make the list less imposing.
13291329
# This message is too long to be a string in the A/UX 3.1 sh.
13301330
cat <<_ACEOF
1331-
\`configure' configures llvm 2.9svn to adapt to many kinds of systems.
1331+
\`configure' configures llvm 2.9 to adapt to many kinds of systems.
13321332

13331333
Usage: $0 [OPTION]... [VAR=VALUE]...
13341334

@@ -1394,18 +1394,17 @@ fi
13941394

13951395
if test -n "$ac_init_help"; then
13961396
case $ac_init_help in
1397-
short | recursive ) echo "Configuration of llvm 2.9svn:";;
1397+
short | recursive ) echo "Configuration of llvm 2.9:";;
13981398
esac
13991399
cat <<\_ACEOF
14001400

14011401
Optional Features:
14021402
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
14031403
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
14041404
--enable-polly Use polly if available (default is YES)
1405-
--enable-optimized Compile with optimizations enabled (default is NO)
1405+
--enable-optimized Compile with optimizations enabled (default is YES)
14061406
--enable-profiling Compile with profiling enabled (default is NO)
1407-
--enable-assertions Compile with assertion checks enabled (default is
1408-
YES)
1407+
--enable-assertions Compile with assertion checks enabled (default is NO)
14091408
--enable-expensive-checks
14101409
Compile with expensive debug checks enabled (default
14111410
is NO)
@@ -1551,7 +1550,7 @@ fi
15511550
test -n "$ac_init_help" && exit $ac_status
15521551
if $ac_init_version; then
15531552
cat <<\_ACEOF
1554-
llvm configure 2.9svn
1553+
llvm configure 2.9
15551554
generated by GNU Autoconf 2.60
15561555

15571556
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1567,7 +1566,7 @@ cat >config.log <<_ACEOF
15671566
This file contains any messages produced by compilers while
15681567
running configure, to aid debugging if configure makes a mistake.
15691568

1570-
It was created by llvm $as_me 2.9svn, which was
1569+
It was created by llvm $as_me 2.9, which was
15711570
generated by GNU Autoconf 2.60. Invocation command line was
15721571

15731572
$ $0 $@
@@ -4774,7 +4773,7 @@ fi
47744773
if test "${enable_assertions+set}" = set; then
47754774
enableval=$enable_assertions;
47764775
else
4777-
enableval="yes"
4776+
enableval="no"
47784777
fi
47794778

47804779
if test ${enableval} = "yes" ; then
@@ -22942,7 +22941,7 @@ exec 6>&1
2294222941
# report actual input values of CONFIG_FILES etc. instead of their
2294322942
# values after options handling.
2294422943
ac_log="
22945-
This file was extended by llvm $as_me 2.9svn, which was
22944+
This file was extended by llvm $as_me 2.9, which was
2294622945
generated by GNU Autoconf 2.60. Invocation command line was
2294722946

2294822947
CONFIG_FILES = $CONFIG_FILES
@@ -22995,7 +22994,7 @@ Report bugs to <[email protected]>."
2299522994
_ACEOF
2299622995
cat >>$CONFIG_STATUS <<_ACEOF
2299722996
ac_cs_version="\\
22998-
llvm config.status 2.9svn
22997+
llvm config.status 2.9
2299922998
configured by $0, generated by GNU Autoconf 2.60,
2300022999
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
2300123000

0 commit comments

Comments
 (0)