From 4a6d6b0b6d7c306c3d73e39a6a76f016ff60a6b1 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Tue, 12 Aug 2008 18:04:29 +0000 Subject: [PATCH] autogen.sh (new file): add script for running the GNU autotools in the right order. Mention and use new script in the appropriate places. --- ChangeLog | 10 ++++++++++ INSTALL | 8 ++++++++ autogen.sh | 10 ++++++++++ docs/README.developers | 6 ++---- test/setup-test | 2 +- 5 files changed, 31 insertions(+), 5 deletions(-) create mode 100755 autogen.sh diff --git a/ChangeLog b/ChangeLog index 0b0c883..1016132 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2008-08-12 Peter Maydell + + * autogen.sh (new file): add script for running the GNU + autotools in the right order + * INSTALL: mention that you need to run autogen.sh if you + got nmh from CVS + * docs/README.developers: mention autogen.sh rather than + suggesting running autoheader and autoconf by hand. + * test/setup-test: run autotools via autogen.sh + 2008-08-08 Eric Gillespie * sbr/discard.c, sbr/m_getfld.c, uip/scansbr.c: Add support for diff --git a/INSTALL b/INSTALL index a331387..e93a1b4 100644 --- a/INSTALL +++ b/INSTALL @@ -14,6 +14,14 @@ You should check the MACHINES file to see if there are any specific build instructions for your operating system. To build nmh, you will need an ANSI C compiler such as gcc. +0) If you have obtained nmh by checking it out of CVS, you will + need to run the GNU autotools to regenerate some files. + (If your directory already contains a file 'config.h.in' + then this has already been done and you do not need to do it.) + You can regenerate the files by running the command + + ./autogen.sh + 1) From the top-level source directory, run the command ./configure [options] diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..29a02b9 --- /dev/null +++ b/autogen.sh @@ -0,0 +1,10 @@ +#!/bin/sh +# +# Regenerate config.h.in, configure, etc. +# Necessary if building from CVS; not needed if +# building from a distributed tarball. + +set -e +autoheader +autoconf +date > stamp-h.in diff --git a/docs/README.developers b/docs/README.developers index a85f37d..23a1d2d 100644 --- a/docs/README.developers +++ b/docs/README.developers @@ -28,12 +28,10 @@ view of the developers (and the autoconf script). Note that the automatically generated autoconf files (such as config.h.in, stamp-h.in, and configure), are NOT kept in CVS. Thus, when you check out -a CVS tree, you need to do the following things before you can build +a CVS tree, you need to run the autogen.sh script before you can build anything: - % autoheader - % autoconf - % date > stamp-h.in + % ./autogen.sh ------------------- directory structure diff --git a/test/setup-test b/test/setup-test index 2636a5d..00ad57a 100755 --- a/test/setup-test +++ b/test/setup-test @@ -6,7 +6,7 @@ TEMPDIR=`mktemp -d /tmp/nmh-test-XXXXXXXX` echo $TEMPDIR > test-temp-dir cd .. -autoheader && autoconf && date > stamp-h.in +./autogen.sh ./configure --prefix=$TEMPDIR --with-locking=fcntl --enable-debug make clean make install -- 1.7.10.4