Roger Pau Monne
2012-Feb-21 01:01 UTC
[PATCH v6] build: add autoconf to replace custom checks in tools/check
Added autotools magic to replace custom check scripts. The previous checks have been ported to autoconf, and some additional ones have been added (plus the suggestions from running autoscan). Two files are created as a result from executing configure script, config/Tools.mk and config.h. conf/Tools.mk is included by tools/Rules.mk, and contains most of the options previously defined in .config, that can now be set passing parameters or defining environment variables when executing configure script. config.h is only used by libxl/xl to detect yajl_version.h. Changes since v5: * Remove dummy configure generation from autogen.sh since it''s already on the source tree. * Removed autogen.sh since it was only a wrapper for calling autoconf. * Remove comment regarding yajl_version.h from configure.ac. Changes since v4: * Updated to tip. * Include config.h from compiler command line when building libxl and xl to assure yajl_version.h presence and correctly detect yajl version. * Added glib-2.0 check with appropiate m4 macros. * Purged config.h.in from unnecessary defines that could mess with the build system. * Removed tools/config.sub, tools/config.guess, tools/configure and configure to make the patch fit mailing list limit. Changes since v3: * Copied config.guess and config.sub from automake 1.11. * Added a test to check for uuid.h on BSD and uuid/uuid.h on Linux. Changes since v2: * Changed order of config/Tools.mk include. * Added "-e" to autogen.sh shebang. * Added necessary files (config.*) and output from Autoheader and Autoconf. * Removed Autoconf from build dependencies and updated README. Changes since v1: * Moved autoconf stuff inside tools folder. * Add Makefile rules for cleaning. * Removed Automake dependency. * Create autogen.sh to automatically create configure script when building from source repository. * Cached values of options passed from command line. * Add necessary ignores to .hgignore. * Added Autoconf to the list of dependencies. * Changed hypen to underscore in XML2 and CURL variable names. * Added script to get version from xen/Makefile. * Set Ocaml tools to optional. * Added procedence of m4/ocaml.m4. Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu> .hgignore | 6 + Config.mk | 39 ------ Makefile | 2 - README | 4 + config/Tools.mk.in | 50 +++++++ configure | 2 + tools/Makefile | 3 +- tools/Rules.mk | 7 +- tools/blktap/drivers/Makefile | 2 +- tools/blktap/drivers/check_gcrypt | 14 -- tools/check/Makefile | 26 ---- tools/check/README | 20 --- tools/check/check_brctl | 13 -- tools/check/check_crypto_lib | 11 - tools/check/check_curl | 13 -- tools/check/check_iproute | 15 -- tools/check/check_libaio_devel | 11 - tools/check/check_libaio_lib | 9 - tools/check/check_openssl_devel | 6 - tools/check/check_python | 13 -- tools/check/check_python_devel | 17 -- tools/check/check_python_xml | 12 - tools/check/check_udev | 22 --- tools/check/check_uuid_devel | 7 - tools/check/check_x11_devel | 9 - tools/check/check_xgettext | 6 - tools/check/check_xml2 | 14 -- tools/check/check_yajl_devel | 8 - tools/check/check_zlib_devel | 6 - tools/check/check_zlib_lib | 12 - tools/check/chk | 63 --------- tools/check/funcs.sh | 106 ---------------- tools/config.h.in | 16 ++ tools/configure.ac | 192 ++++++++++++++++++++++++++++++ tools/debugger/gdbsx/xg/Makefile | 1 - tools/install.sh | 1 + tools/libfsimage/Makefile | 6 +- tools/libfsimage/check-libext2fs | 21 --- tools/libxen/Makefile | 8 +- tools/libxl/Makefile | 7 +- tools/libxl/libxl_json.h | 2 +- tools/m4/default_lib.m4 | 8 + tools/m4/disable_feature.m4 | 13 ++ tools/m4/enable_feature.m4 | 13 ++ tools/m4/ocaml.m4 | 241 ++++++++++++++++++++++++++++++++++++++ tools/m4/path_or_fail.m4 | 6 + tools/m4/pkg.m4 | 157 ++++++++++++++++++++++++ tools/m4/python_devel.m4 | 18 ++ tools/m4/python_version.m4 | 12 + tools/m4/python_xml.m4 | 10 + tools/m4/set_cflags_ldflags.m4 | 20 +++ tools/m4/udev.m4 | 32 +++++ tools/m4/uuid.m4 | 10 + version.sh | 5 + 54 files changed, 836 insertions(+), 511 deletions(-) _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xensource.com/xen-devel
Ian Jackson
2012-Feb-21 12:20 UTC
Re: [PATCH v6] build: add autoconf to replace custom checks in tools/check
Roger Pau Monne writes ("[PATCH v6] build: add autoconf to replace custom
checks in tools/check"):> Changes since v5:
>
> * Remove dummy configure generation from autogen.sh since it''s
> already on the source tree.
But it doesn''t seem to exist in the patch. Did you forget to add it ?
> * Removed autogen.sh since it was only a wrapper for calling
> autoconf.
I would keep this because it makes it clear how to run autoconf.
This is useful even if the invocation is very vanilla.
Ian.
Roger Pau Monné
2012-Feb-21 12:22 UTC
Re: [PATCH v6] build: add autoconf to replace custom checks in tools/check
2012/2/21 Ian Jackson <Ian.Jackson@eu.citrix.com>:> Roger Pau Monne writes ("[PATCH v6] build: add autoconf to replace custom checks in tools/check"): >> Changes since v5: >> >> * Remove dummy configure generation from autogen.sh since it's >> already on the source tree. > > But it doesn't seem to exist in the patch. Did you forget to add it ? > >> * Removed autogen.sh since it was only a wrapper for calling >> autoconf. > > I would keep this because it makes it clear how to run autoconf. > This is useful even if the invocation is very vanilla.I've removed it because it only contained a `cd tools && autoconf`, but I will re-add it and send the patch.> > Ian._______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xensource.com/xen-devel