From 871be1d8b5059a7c84e6f593eeb4ab10d0750b48 Mon Sep 17 00:00:00 2001 From: Rich Johnston Date: Tue, 28 Aug 2012 17:26:08 +0000 Subject: [PATCH] xfstests: Use installed libraries only The xfstests autotools currently searches locally in ../{acl,attr,dmapi,xfsprogs} for libraries that xfstests depends upon, in addition to searching for them in their regular installed locations on a system, e.g. /usr/lib. It appears this feature was added (but not documented) so that xfs developers can build and run xfstests without having to install the libraries. This can lead to trouble if you expect that xfstests is using the versions of the libraries installed on the system. If a local library was found and not installed, libtool will create a wrapper script to call the binary from the .libs directory. This patch will remove searching for local libraries so that the installed libraries are always used. Signed-off-by: Rich Johnston Reviewed-by: Dave Chinner Reviewed-by: Ben Myer --- m4/package_acldev.m4 | 2 -- m4/package_attrdev.m4 | 4 ---- m4/package_dmapidev.m4 | 2 -- m4/package_xfslibs.m4 | 6 ------ 4 files changed, 14 deletions(-) diff --git a/m4/package_acldev.m4 b/m4/package_acldev.m4 index 0cbd19f5..25d60194 100644 --- a/m4/package_acldev.m4 +++ b/m4/package_acldev.m4 @@ -30,8 +30,6 @@ AC_DEFUN([AC_PACKAGE_NEED_ACLINIT_LIBACL], exit 1 ]) libacl="-lacl" - test -f `pwd`/../acl/libacl/libacl.la && \ - libacl="`pwd`/../acl/libacl/libacl.la" test -f ${libexecdir}${libdirsuffix}/libacl.la && \ libacl="${libexecdir}${libdirsuffix}/libacl.la" AC_SUBST(libacl) diff --git a/m4/package_attrdev.m4 b/m4/package_attrdev.m4 index 461ddffb..12251ceb 100644 --- a/m4/package_attrdev.m4 +++ b/m4/package_attrdev.m4 @@ -46,8 +46,6 @@ AC_DEFUN([AC_PACKAGE_NEED_GETXATTR_LIBATTR], exit 1 ]) libattr="-lattr" - test -f `pwd`/../attr/libattr/libattr.la && \ - libattr="`pwd`/../attr/libattr/libattr.la" test -f ${libexecdir}${libdirsuffix}/libattr.la && \ libattr="${libexecdir}${libdirsuffix}/libattr.la" AC_SUBST(libattr) @@ -62,8 +60,6 @@ AC_DEFUN([AC_PACKAGE_NEED_ATTRGET_LIBATTR], exit 1 ]) libattr="-lattr" - test -f `pwd`/../attr/libattr/libattr.la && \ - libattr="`pwd`/../attr/libattr/libattr.la" test -f ${libexecdir}${libdirsuffix}/libattr.la && \ libattr="${libexecdir}${libdirsuffix}/libattr.la" AC_SUBST(libattr) diff --git a/m4/package_dmapidev.m4 b/m4/package_dmapidev.m4 index 652db306..6a7257ee 100644 --- a/m4/package_dmapidev.m4 +++ b/m4/package_dmapidev.m4 @@ -20,8 +20,6 @@ AC_DEFUN([AC_PACKAGE_WANT_DMAPI], echo ]) libdm="-ldm" - test -f `pwd`/../dmapi/libdm/libdm.la && \ - libdm="`pwd`/../dmapi/libdm/libdm.la" test -f ${libexecdir}${libdirsuffix}/libdm.la && \ libdm="${libexecdir}${libdirsuffix}/libdm.la" AC_SUBST(libdm) diff --git a/m4/package_xfslibs.m4 b/m4/package_xfslibs.m4 index f5167a2b..78a3dc47 100644 --- a/m4/package_xfslibs.m4 +++ b/m4/package_xfslibs.m4 @@ -51,8 +51,6 @@ AC_DEFUN([AC_PACKAGE_NEED_LIBXFSINIT_LIBXFS], exit 1 ]) libxfs="-lxfs" - test -f `pwd`/../xfsprogs/libxfs/libxfs.la && \ - libxfs="`pwd`/../xfsprogs/libxfs/libxfs.la" test -f ${libexecdir}${libdirsuffix}/libxfs.la && \ libxfs="${libexecdir}${libdirsuffix}/libxfs.la" AC_SUBST(libxfs) @@ -67,8 +65,6 @@ AC_DEFUN([AC_PACKAGE_NEED_OPEN_BY_FSHANDLE], exit 1 ]) libhdl="-lhandle" - test -f `pwd`/../xfsprogs/libhandle/libhandle.la && \ - libhdl="`pwd`/../xfsprogs/libhandle/libhandle.la" test -f ${libexecdir}${libdirsuffix}/libhandle.la && \ libhdl="${libexecdir}${libdirsuffix}/libhandle.la" AC_SUBST(libhdl) @@ -83,8 +79,6 @@ AC_DEFUN([AC_PACKAGE_NEED_ATTRLIST_LIBHANDLE], exit 1 ]) libhdl="-lhandle" - test -f `pwd`/../xfsprogs/libhandle/libhandle.la && \ - libhdl="`pwd`/../xfsprogs/libhandle/libhandle.la" test -f ${libexecdir}${libdirsuffix}/libhandle.la && \ libhdl="${libexecdir}${libdirsuffix}/libhandle.la" AC_SUBST(libhdl) -- 2.47.3