Autotool improvements.
PATCH 1/1 Autotool improvements.
From: Pekka Pessi <[email protected]>
Bootstrap script now tries to use explicitly versioned automake, which makes life easier with scratchbox and friends. Bootstrap also uses autoreconf instead of explictly running various autotools.
--- Makefile.am | 2 ++ bootstrap | 38 +++++++++++++++++++++++++++++++++----- configure.ac | 3 ++- 3 files changed, 37 insertions(+), 6 deletions(-)
Makefile.am +2 -0
@@ -1,6 +1,8 @@ AM_MAKEFLAGS = --no-print-directory +ACLOCAL_AMFLAGS = -I m4 + includedir = @includedir@/ofono include_HEADERS = include/log.h include/plugin.h include/history.h \
bootstrap +33 -5
@@ -1,7 +1,35 @@ #!/bin/sh -aclocal && \ - autoheader && \ - libtoolize --automake --copy --force && - automake --add-missing --copy && \ - autoconf +if test -z "$AUTOMAKE" +then + for version in 1.10 1.11 1.12 + do + if which automake-$version > /dev/null + then + AUTOMAKE=automake-$version ACLOCAL=aclocal-$version + export AUTOMAKE ACLOCAL + break + fi + done +fi + +if test -z "$AUTOMAKE" +then + for version in 1.10 1.11 1.12 + do + if automake --version | head -1 | fgrep -q $version + then + AUTOMAKE=automake ACLOCAL=aclocal + export AUTOMAKE ACLOCAL + fi + done +fi + +# Remove libtool files (in case they conflict with older libtool) +rm -f m4/libtool.m4 \ + m4/lt~obsolete.m4 \ + m4/ltoptions.m4 \ + m4/ltsugar.m4 \ + m4/ltversion.m4 + +autoreconf --install --force "$@"
configure.ac +2 -1
@@ -1,8 +1,9 @@ AC_PREREQ(2.60) AC_INIT(ofono, 0.7) -AM_INIT_AUTOMAKE([foreign subdir-objects]) +AM_INIT_AUTOMAKE([foreign subdir-objects 1.10]) AM_CONFIG_HEADER(config.h) +AC_CONFIG_MACRO_DIR([m4]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
Signature · 1 line
1.6.0.4
Quoted 5 lines · you
From: Pekka Pessi <[email protected]>
Bootstrap script now tries to use explicitly versioned automake, which makes life easier with scratchbox and friends. Bootstrap also uses autoreconf instead of explictly running various autotools.
As autoreconf already uses those variables, I wonder why not just call it and be done with it.
Signature · 1 line
Rémi Denis-Courmont
Hi guys,
Quoted 6 lines
Quoted 3 lines
Bootstrap script now tries to use explicitly versioned automake, which makes life easier with scratchbox and friends. Bootstrap also uses autoreconf instead of explictly running various autotools.
As autoreconf already uses those variables, I wonder why not just call it and be done with it.
when I started using the bootstrap stuff we use accross BlueZ, ConnMan, oFono etc. the autoreconf was horrible and broken. Let me look into this again and see how we can make this more consistent. Especially since everybody should use automake-1.11 do get the sexy silent build system.
Regards
Marcel
Quoted 11 lines · you
Quoted 6 lines
Quoted 3 lines
Bootstrap script now tries to use explicitly versioned automake, which makes life easier with scratchbox and friends. Bootstrap also uses autoreconf instead of explictly running various autotools.
As autoreconf already uses those variables, I wonder why not just call it and be done with it.
when I started using the bootstrap stuff we use accross BlueZ, ConnMan, oFono etc. the autoreconf was horrible and broken. Let me look into this again and see how we can make this more consistent. Especially since everybody should use automake-1.11 do get the sexy silent build system.
VLC has been using autoreconf without problem for a while. We require automake 1.9.
Signature · 1 line
Rémi Denis-Courmont