diff options
| author | Ian Jackson <ian.jackson@eu.citrix.com> | 2012-02-22 01:55:03 +0000 |
|---|---|---|
| committer | Ian Jackson <ian.jackson@eu.citrix.com> | 2012-02-22 01:55:03 +0000 |
| commit | 85896a7c4dc7b6b1dba2db79dfb0ca61738a92a4 (patch) | |
| tree | 680508e2d4592ff706364d6c5a000729003f5f04 /tools/libfsimage | |
| parent | fa674239ae719f35ee831d2d6fbfee1ccaab8303 (diff) | |
| download | xen-85896a7c4dc7b6b1dba2db79dfb0ca61738a92a4.tar.gz xen-85896a7c4dc7b6b1dba2db79dfb0ca61738a92a4.tar.bz2 xen-85896a7c4dc7b6b1dba2db79dfb0ca61738a92a4.zip | |
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.
[ tools/config.sub and config.guess copied from
autotools-dev 20100122.1 from Debian squeeze i386,
which is GPLv2.
tools/configure generated using the included ./autogen.sh
which ran autoconf 2.67-2 from Debian squeeze i386. autoconf
is GPLv3+ but has a special exception for the autoconf output;
this exception applies to us and exempts us from complying
with GPLv3+ for configure, which is good as Xen is GPL2 only.
- Ian Jackson ]
Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu>
Tested-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Diffstat (limited to 'tools/libfsimage')
| -rw-r--r-- | tools/libfsimage/Makefile | 6 | ||||
| -rwxr-xr-x | tools/libfsimage/check-libext2fs | 21 |
2 files changed, 5 insertions, 22 deletions
diff --git a/tools/libfsimage/Makefile b/tools/libfsimage/Makefile index bcb8b40fa5..5a506f3325 100644 --- a/tools/libfsimage/Makefile +++ b/tools/libfsimage/Makefile @@ -3,7 +3,11 @@ include $(XEN_ROOT)/tools/Rules.mk SUBDIRS-y = common ufs reiserfs iso9660 fat zfs SUBDIRS-$(CONFIG_X86) += xfs -SUBDIRS-y += $(shell env CC="$(CC)" ./check-libext2fs) +ifeq ($(CONFIG_EXT2FS), y) + SUBDIRS-y += ext2fs-lib +else + SUBDIRS-y += ext2fs +endif .PHONY: all clean install all clean install: %: subdirs-% diff --git a/tools/libfsimage/check-libext2fs b/tools/libfsimage/check-libext2fs deleted file mode 100755 index a86180629a..0000000000 --- a/tools/libfsimage/check-libext2fs +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -cat >ext2-test.c <<EOF -#include <ext2fs/ext2fs.h> - -int main() -{ - ext2fs_open2; -} -EOF - -${CC-gcc} -o ext2-test ext2-test.c -lext2fs >/dev/null 2>&1 -if [ $? = 0 ]; then - echo ext2fs-lib -else - echo ext2fs -fi - -rm -f ext2-test ext2-test.c - -exit 0 |