Skip to content

Commit 680c0b8

Browse files
committed
Change CI scripts to use "autoreconf -i" and update docs
autoconf 2.70 requires use of `autoreconf -i` for the AC_CANONICAL_HOST macro, which is pulled in by AC_FUNC_MMAP. Update CI configuration to use this, and change the instructions in the INSTALL and README.md files to match.
1 parent 550c6b1 commit 680c0b8

4 files changed

Lines changed: 5 additions & 10 deletions

File tree

.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ build_script:
3434
- set MSYSTEM=MINGW64
3535
- set PATH=C:/msys64/usr/bin;C:/msys64/mingw64/bin;%PATH%
3636
- git submodule update --init --recursive
37-
- "sh -lc \"autoheader && autoconf && ./configure --enable-werror CFLAGS='-g -O3' && make -j2\""
37+
- "sh -lc \"autoreconf -i && ./configure --enable-werror CFLAGS='-g -O3' && make -j2\""
3838

3939
#build_script:
4040
# - make

.cirrus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ compile_template: &COMPILE
3333
fi
3434
if test "$USE_CONFIG" = "yes"; then
3535
MAKE_OPTS=
36-
autoreconf
36+
autoreconf -i
3737
eval ./configure --enable-plugins --enable-werror $CONFIG_OPTS CFLAGS=\"-g -O3 $CFLAGS\" || \
3838
( cat config.log; false )
3939
else

INSTALL

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ In addition, building the configure script requires:
1717

1818
autoheader
1919
autoconf
20+
autoreconf
2021

2122
Running the configure script uses awk, along with a number of
2223
standard UNIX tools (cat, cp, grep, mv, rm, sed, among others). Almost
@@ -79,12 +80,7 @@ This step is only needed if configure.ac has been changed, or if configure
7980
does not exist (for example, when building from a git clone). The
8081
configure script and config.h.in can be built by running:
8182

82-
autoheader
83-
autoconf
84-
85-
If you have a full GNU autotools install, you can alternatively run:
86-
87-
autoreconf
83+
autoreconf -i
8884

8985
Basic Installation
9086
==================

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ committed to this repository, so building the code from a Git repository
2828
requires extra steps:
2929

3030
```sh
31-
autoheader # If using configure, generate the header template...
32-
autoconf # ...and configure script (or use autoreconf to do both)
31+
autoreconf -i # Build the configure script and install files it uses
3332
./configure # Optional but recommended, for choosing extra functionality
3433
make
3534
make install

0 commit comments

Comments
 (0)