[hipl-commit] [trunk] Rev 4106: build system: Get rid of autogen.sh.
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: hipl-commit@xxxxxxxxxxxxx
- Date: Tue, 30 Mar 2010 17:40:28 +0300
Committer: Diego Biurrun <diego@xxxxxxxxxx>
Date: 30/03/2010 at 17:40:28
Revision: 4106
Revision-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk
Log:
build system: Get rid of autogen.sh.
autogen.sh is just a thin wrapper around autoreconf and pointless as such.
Running autoreconf directly allows for more control. The HIPL build
requirements are now properly documented in the INSTALL file.
Modified:
D autogen.sh
A INSTALL
M Makefile.am
M doc/HACKING
M doc/HOWTO.xml
M test/maintainer/sync-all
M test/packaging/create-deb.sh
M test/packaging/hipl-deb.spec
M test/packaging/hipl-rpm.spec
M tools/hipl_autobuild.sh
=== added file 'INSTALL'
--- INSTALL 1970-01-01 00:00:00 +0000
+++ INSTALL 2010-03-30 14:39:09 +0000
@@ -0,0 +1,48 @@
+How to get HIPL
+===============
+
+The latest version of HIPL is always available through Bazaar. Run the command
+
+ bzr checkout http://hipl.hiit.fi/hipl/hipl-bzr/trunk
+
+to get an anonymous read-only checkout or
+
+ bzr checkout bzr+ssh://hipl.hiit.fi/var/archive/hipl-bzr/trunk
+
+if you are a developer with an ssh account on the server.
+
+
+HIPL dependencies
+=================
+
+In order to compile HIPL you need autotools (autoconf, automake, libtool), GNU
+Make and gcc. libgtk2.0, openssl, libxml2, iptables, libcap, libsqlite3 and
+libconfig are required complete with development headers. For Perl, Socket6,
+IO::Socket::INET6, Net::IP and Net::DNS modules are required. You can
optionally
+install xmlto to build the HOWTO and doxygen to build the code documentation.
+
+HIPL places certain requirements on your kernel. Starting from Linux kernel
+version 2.6.27, no changes are necessary. If you run an older version, look
+at the patches/kernel directory to find patches for your Linux kernel version.
+Alternatively, you can use userspace ipsec as provided by hipfw. If you want
+to use the optional native programming interface, you need to patch your kernel
+anyway.
+
+
+How to build HIPL
+=================
+
+From the trunk directory in the HIPL sources, run the following command to
+build HIPL:
+
+ ./configure && make
+
+If you are working with a Bazaar checkout, you will have to bootstrap the
+autotools build system with
+
+ autoreconf [--install]
+
+before running configure.
+
+./configure --help will display the multitude of configuration options
+available for HIPL.
=== modified file 'Makefile.am'
--- Makefile.am 2010-03-30 14:22:04 +0000
+++ Makefile.am 2010-03-30 14:39:09 +0000
@@ -10,7 +10,7 @@
EXTRA_DIST = .vimrc debian doc hipext hipfwmi patches
EXTRA_DIST += test/configs test/demo test/maintainer test/openwrt
EXTRA_DIST += test/packaging test/packets test/performance
-EXTRA_DIST += autogen.sh check_header_verbosity.sh i3/i3-cfg-PL.xml
+EXTRA_DIST += check_header_verbosity.sh i3/i3-cfg-PL.xml
EXTRA_DIST += release.version tcp verbose-headers.txt
EXTRA_DIST += $(wildcard $(addprefix $(srcdir)/test/,*.cgi *.pl *.py *.sh))
EXTRA_DIST += $(wildcard $(addprefix $(srcdir)/tools/,*.cfg *.pl *.py *.sh))
=== modified file 'doc/HACKING'
--- doc/HACKING 2010-03-29 17:47:36 +0000
+++ doc/HACKING 2010-03-30 14:39:09 +0000
@@ -993,7 +993,10 @@
software. With the scripts, RPM (e.g. for Fedora Core) and DEB (for Debian)
packages can be created.
-To create the RPM package, type: "./autogen && ./configure && make bin".
+To create the RPM package, type:
+
+autoreconf --install && ./configure && make rpm
+
This will create a source tar.gz (in the same
directory) which will be used when building the RPM file. After the
script has run successfully, follow the instructions given by the
@@ -1018,8 +1021,11 @@
Debian
------
-DEB package is created similarly: "./autogen && ./configure && make
-bin". Correspondingly, the binary packages are written to /usr/src/debian
+DEB package is created similarly:
+
+autoreconf --install && ./configure && make deb
+
+Correspondingly, the binary packages are written to /usr/src/debian
REPOSITORY MANAGEMENT FOR FEDORA AND UBUNTU
===========================================
@@ -1045,7 +1051,7 @@
---------------------------------
You must do the following things first at the server:
-* yum install <./autogen.sh --help>
+* yum install <required packages>
* yum install createrepo
* ln -s /usr/src/redhat /home/hipl
@@ -1074,7 +1080,7 @@
---------------------------------
You must do the following things first at the server:
-* apt-get install <./autogen.sh --help>
+* apt-get install <required packages>
* apt-get install pax
Install the following tool to the host where building packages:
=== modified file 'doc/HOWTO.xml'
--- doc/HOWTO.xml 2010-03-30 14:33:32 +0000
+++ doc/HOWTO.xml 2010-03-30 14:39:09 +0000
@@ -44,7 +44,7 @@
</para></listitem>
</orderedlist>
<para>
- The HIPL library and header dependencies are not listed here. Type
"./autogen.sh --help"
+ The HIPL library and header dependencies are not listed here. Read the
INSTALL file
to see what software you need to install before compilation of HIPL.
</para>
<para> Network Requirements</para>
@@ -357,7 +357,7 @@
and then run the following:
</para></listitem>
<listitem><para>
- ./autogen.sh
+ autoreconf --install
</para></listitem>
<listitem><para>
./configure
@@ -593,7 +593,8 @@
<programlisting>
$ tla get hipl--main--2.6 hipl--main--2.6
$ cd hipl--main--2.6
- $ ./autogen.sh
+ $ autoreconf --install
+ $ ./configure
$ make dist
$ cp hipl-main.tar.gz path/to/kamikaze/dl
</programlisting>
@@ -1564,7 +1565,7 @@
commands (assuming a clean source tree): </para>
<para><programlisting>
- ./autogen.sh --enable-maemo
+ ./configure --enable-maemo
</programlisting></para>
<para>
@@ -2654,7 +2655,7 @@
<section id="ch_dns_data">
<title>DNS Server with HIP Support</title>
<para>
- Tools directory contains hipdnskeyparse a script (after running
./autogens.h) which converts public
+ Tools directory contains hipdnskeyparse a script which converts public
key file contents to different DNS zone file formats. To convert
to unpatched BIND9 format, run the following:
<programlisting>
@@ -4389,10 +4390,16 @@
e.g. cd hipl
</para></listitem>
<listitem><para>
- Run autogen.sh
- </para></listitem>
- <listitem><para>
- ./autogen.sh
+ Run autoreconf
+ </para></listitem>
+ <listitem><para>
+ autoreconf --install
+ </para></listitem>
+ <listitem><para>
+ Run configure
+ </para></listitem>
+ <listitem><para>
+ ./configure
</para></listitem>
<listitem><para>
Run make
=== modified file 'test/maintainer/sync-all'
--- test/maintainer/sync-all 2010-03-05 02:21:54 +0000
+++ test/maintainer/sync-all 2010-03-30 14:39:09 +0000
@@ -20,7 +20,7 @@
wget http://hipl.hiit.fi/hipl/hipl.tar.gz &&
tar xvzf hipl.tar.gz &&
cd main &&
-./autogen.sh &&
+autoreconf --install &&
./configure &&
make bin syncrepo"
=== modified file 'test/packaging/create-deb.sh'
--- test/packaging/create-deb.sh 2010-03-30 14:33:32 +0000
+++ test/packaging/create-deb.sh 2010-03-30 14:39:09 +0000
@@ -618,7 +618,7 @@
# jk: do not re-configure as it messes up any configs we might need.
cd "$HIPL"
#echo "** Running make in $HIPL"
- #./autogen.sh
+ #autoreconf --install
#./configure --prefix=/usr
#echo "** Running make in $HIPL"
#if ! make clean all;then
=== modified file 'test/packaging/hipl-deb.spec'
--- test/packaging/hipl-deb.spec 2010-03-30 14:33:32 +0000
+++ test/packaging/hipl-deb.spec 2010-03-30 14:39:09 +0000
@@ -27,7 +27,7 @@
# Note: in subsequent releases me may want to use --disable-debugging
%build
-./autogen.sh --prefix=/usr
+autoreconf --install
%configure --prefix=/usr
make -C doc
make -j 4 all
=== modified file 'test/packaging/hipl-rpm.spec'
--- test/packaging/hipl-rpm.spec 2010-03-30 14:16:44 +0000
+++ test/packaging/hipl-rpm.spec 2010-03-30 14:39:09 +0000
@@ -27,7 +27,7 @@
# Note: in subsequent releases me may want to use --disable-debugging
%build
-./autogen.sh --prefix=/usr
+autoreconf --install
%configure --prefix=/usr
make -C doc
make -j 4 all
=== modified file 'tools/hipl_autobuild.sh'
--- tools/hipl_autobuild.sh 2010-03-29 22:37:02 +0000
+++ tools/hipl_autobuild.sh 2010-03-30 14:39:09 +0000
@@ -65,7 +65,7 @@
compile()
{
CONFIGURATION="--prefix=$(pwd)/local_install $@"
- run_program "./autogen.sh" &&
+ run_program "autoreconf --install" &&
run_program "./configure" $CONFIGURATION &&
run_program "make -j17" &&
run_program "make -j17 checkheaders" &&
Other related posts:
- » [hipl-commit] [trunk] Rev 4106: build system: Get rid of autogen.sh. - Diego Biurrun
