diff options
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 |