xfstests: rebuild aclocal.m4

The local m4 configuration has not been built in a long time.
Trying to rebuild it results in failures with dmapi library
detection and libxfs.h detection macros. Fix the errors and rebuild
it.

Note: the new format for the aclocal.m4 file uses m4_include
directives which means it is much smaller than before and won't
need updating unless we include new m4 macro files.

Signed-off-by: Dave Chinner <david@fromorbit.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Dave Chinner
2010-01-26 14:21:47 +11:00
parent 31792fea50
commit 82e1e14dba
3 changed files with 22 additions and 521 deletions
+9 -6
View File
@@ -9,13 +9,15 @@ AC_DEFUN([AC_PACKAGE_NEED_XFS_DMAPI_H],
fi
])
AC_DEFUN([AC_PACKAGE_NEED_MAKEHANDLE_LIBDM],
[ AC_CHECK_LIB(dm, dm_make_handle,, [
AC_DEFUN([AC_PACKAGE_WANT_DMAPI],
[ AC_CHECK_LIB(dm, dm_make_handle, [ have_dmapi=true ], [
have_dmapi=false
echo
echo 'FATAL ERROR: could not find a valid DMAPI base library.'
echo 'Install the data migration API (dmapi) library package.'
echo 'Alternatively, run "make install" from the dmapi source.'
exit 1
echo 'WARNING: could not find a valid DMAPI base library.'
echo 'If you want DMAPI support please install the data migration'
echo 'API (dmapi) library package. Alternatively, run "make install"'
echo 'from the dmapi source.'
echo
])
libdm="-ldm"
test -f `pwd`/../dmapi/libdm/libdm.la && \
@@ -23,4 +25,5 @@ AC_DEFUN([AC_PACKAGE_NEED_MAKEHANDLE_LIBDM],
test -f ${libexecdir}${libdirsuffix}/libdm.la && \
libdm="${libexecdir}${libdirsuffix}/libdm.la"
AC_SUBST(libdm)
AC_SUBST(have_dmapi)
])