diff options
| author | Roger Pau Monne <roger.pau@citrix.com> | 2012-09-14 10:02:47 +0100 |
|---|---|---|
| committer | Roger Pau Monne <roger.pau@citrix.com> | 2012-09-14 10:02:47 +0100 |
| commit | 19459d56f493b380e2df30e06822cc7b01183186 (patch) | |
| tree | 9b397d655903efa89e6522badd7e33489f6d41d0 /tools/m4 | |
| parent | 393a6e75afb627fe126bfc8050bd53b9e086e1dc (diff) | |
| download | xen-19459d56f493b380e2df30e06822cc7b01183186.tar.gz xen-19459d56f493b380e2df30e06822cc7b01183186.tar.bz2 xen-19459d56f493b380e2df30e06822cc7b01183186.zip | |
libfsimage: add ext4 support for CentOS 5.x
CentOS 5.x forked e2fs ext4 support into a different package called
e4fs, and so headers and library names changed from ext2fs to ext4fs.
Check if ext4fs/ext2fs.h and -lext4fs work, and use that instead of
ext2fs to build libfsimage. This patch assumes that if the ext4fs
library is present it should always be used instead of ext2fs.
This patch includes a rework of the ext2fs check, a new ext4fs check
and a minor modification in libfsimage to use the correct library.
Signed-off-by: Roger Pau Monne <roger.pau@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'tools/m4')
| -rw-r--r-- | tools/m4/extfs.m4 | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/tools/m4/extfs.m4 b/tools/m4/extfs.m4 new file mode 100644 index 0000000000..7309da978d --- /dev/null +++ b/tools/m4/extfs.m4 @@ -0,0 +1,20 @@ +AC_DEFUN([AX_CHECK_EXTFS], [ +AC_CHECK_HEADER([ext2fs/ext2fs.h], [ +AC_CHECK_LIB([ext2fs], [ext2fs_open2], [ + AC_DEFINE([INCLUDE_EXTFS_H], [<ext2fs/ext2fs.h>], + [Define extfs header to use]) + EXTFS_LIBS="-lext2fs" +]) +]) +dnl This is a temporary hack for CentOS 5.x, which split the ext4 support +dnl of ext2fs in a different package. Once CentOS 5.x is no longer supported +dnl we can remove this. +AC_CHECK_HEADER([ext4fs/ext2fs.h], [ +AC_CHECK_LIB([ext4fs], [ext2fs_open2], [ + AC_DEFINE([INCLUDE_EXTFS_H], [<ext4fs/ext2fs.h>], + [Define extfs header to use]) + EXTFS_LIBS="-lext4fs" +]) +]) +AC_SUBST(EXTFS_LIBS) +]) |