diff options
| author | Dave Chinner <david@fromorbit.com> | 2010-01-26 14:21:47 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2010-01-26 14:21:47 +1100 |
| commit | 82e1e14dba44ce53b93ef109d5479cafa3ac3596 (patch) | |
| tree | 038759935c4925fce4e14c8341822bce1c5b416d /m4 | |
| parent | 31792fea5009b45db85f31cad652f3f63c67f462 (diff) | |
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>
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/package_dmapidev.m4 | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/m4/package_dmapidev.m4 b/m4/package_dmapidev.m4 index 89330bd8..652db306 100644 --- a/m4/package_dmapidev.m4 +++ b/m4/package_dmapidev.m4 @@ -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) ]) |