From: Dmitry V. Levin <ldv@altlinux.org>
Date: Fri, 25 Apr 2014 22:52:06 +0000 (+0000)
Subject: Use bootstrap script consistently
X-Git-Tag: v4.9~70
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3e69bdf41a1c272028d9347bc55d7f73e3c4de46;p=strace

Use bootstrap script consistently

Now that ./xlat/gen.sh has to be run before autoreconf,
replace all autoreconf calls with ./bootstrap call.

* bootstrap: Forward arguments to autoreconf.
* build_static_example.sh: Replace autoreconf call with bootstrap call.
* make-dist: Likewise.
* qemu_multiarch_testing/README: Likewise.
---

diff --git a/bootstrap b/bootstrap
index 196d8e46..91d1a8fb 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,3 +1,3 @@
 #!/bin/sh
 ./xlat/gen.sh
-exec autoreconf -f -i
+exec autoreconf -f -i "$@"
diff --git a/build_static_example.sh b/build_static_example.sh
index 5c0e5fab..31ee264f 100755
--- a/build_static_example.sh
+++ b/build_static_example.sh
@@ -24,6 +24,6 @@ export CFLAGS="-Os\
  -Wl,-Map=strace.mapfile\
 "
 
-autoreconf -i -f
+./bootstrap
 ./configure $BUILDFLAG #--enable-maintainer-mode
 make CC="$CC" CFLAGS="$CFLAGS"
diff --git a/make-dist b/make-dist
index fffedfb0..16c97979 100755
--- a/make-dist
+++ b/make-dist
@@ -16,7 +16,7 @@ git checkout -f "$tag"
 
 ./git-set-file-times
 
-autoreconf -i -f
+./bootstrap
 
 ./configure --enable-maintainer-mode
 
diff --git a/qemu_multiarch_testing/README b/qemu_multiarch_testing/README
index 712b953b..756da24e 100644
--- a/qemu_multiarch_testing/README
+++ b/qemu_multiarch_testing/README
@@ -3,7 +3,7 @@ How to test strace build using Aboriginal Linux's system images.
 * Put a autoconf'ed strace source tree into hdc.dir/strace dir.
 For example, this should work:
 git clone git://strace.git.sourceforge.net/gitroot/strace/strace &&
-cd strace && autoreconf -i -f
+cd strace && ./bootstrap
 
 * Run ./make-hdc-img.sh: it will generate ext2 image file,
 hdc.img, from hdc.dir/* data. This requires root for loop mount.