diff options
| author | Reid Spencer <rspencer@reidspencer.com> | 2004-10-10 19:09:33 +0000 |
|---|---|---|
| committer | Reid Spencer <rspencer@reidspencer.com> | 2004-10-10 19:09:33 +0000 |
| commit | 2b6c038a5e07b50cdbeca0a62efe319878937593 (patch) | |
| tree | df3e9e4fab8c181de1a418ac6971b2c4438f8fe1 /autoconf/AutoRegen.sh | |
| parent | 8be8012ba493f1b17967c4ad7863c5709bf34a75 (diff) | |
| download | llvm-2b6c038a5e07b50cdbeca0a62efe319878937593.tar.gz llvm-2b6c038a5e07b50cdbeca0a62efe319878937593.tar.bz2 llvm-2b6c038a5e07b50cdbeca0a62efe319878937593.tar.xz | |
Ensure timestamp on saved contents of configure.ac is not changed.
Use correct options to automake.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16879 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'autoconf/AutoRegen.sh')
| -rwxr-xr-x | autoconf/AutoRegen.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/autoconf/AutoRegen.sh b/autoconf/AutoRegen.sh index f264054464..90cf16aa63 100755 --- a/autoconf/AutoRegen.sh +++ b/autoconf/AutoRegen.sh @@ -7,10 +7,12 @@ if test "$1" = --with-automake ; then outfile=configure_am configfile=configure.am with_automake=1 -else +elif test -z "$1" ; then outfile=configure configfile=configure.ac with_automake=0 +else + die "Invalid option: $1" fi test -d autoconf && test -f autoconf/$configfile && cd autoconf test -f $configfile || die "Can't find 'autoconf' dir; please cd into it first" @@ -48,7 +50,7 @@ echo "" echo "Regenerating aclocal.m4 with aclocal" cwd=`pwd` if test $with_automake -eq 1 ; then - cp configure.ac .configure.ac.save + mv configure.ac .configure.ac.save cp configure.am configure.ac cp configure.am ../configure.ac fi @@ -61,9 +63,8 @@ autoheader -I autoconf -I autoconf/m4 autoconf/$configfile || die "autoheader fa if test $with_automake -eq 1 ; then echo "Regenerating makefiles with automake 1.9.2" cp autoconf/aclocal.m4 . - automake --foreign --add-missing --copy - rm configure.ac + automake --gnu --add-missing --copy --force-missing cd $cwd - cp .configure.ac.save configure.ac + mv .configure.ac.save configure.ac fi exit 0 |