Permalink
Browse files

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
  • Loading branch information...
1 parent 8be8012 commit 2b6c038a5e07b50cdbeca0a62efe319878937593 Reid Spencer committed Oct 10, 2004
Showing with 1,684 additions and 567 deletions.
  1. +6 −5 autoconf/AutoRegen.sh
  2. +410 −289 autoconf/configure.am
  3. +522 −0 autoconf/depcomp
  4. +283 −212 autoconf/install-sh
  5. +353 −0 autoconf/missing
  6. +110 −61 autoconf/mkinstalldirs
View
@@ -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
Oops, something went wrong.

0 comments on commit 2b6c038

Please sign in to comment.