[PATCH 3/5] xftests: Use installed libraries only

[Rich Johnston <rjohnston@sgi.com>]

[-- Attachment #1: 3-5-xfstests-remove-relative-lib-paths.patch --]
[-- Type: text/plain, Size: 4068 bytes --]

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 touble 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 libraies so that the installed libraries are always used.

Signed-off-by: Rich Johnston <rjohnston@sgi.com>

---
 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(-)

Index: b/m4/package_acldev.m4
===================================================================
--- 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)
Index: b/m4/package_attrdev.m4
===================================================================
--- a/m4/package_attrdev.m4
+++ b/m4/package_attrdev.m4
@@ -46,8 +46,6 @@ AC_DEFUN([AC_PACKAGE_NEED_GETXATTR_LIBAT
         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_LIBATT
         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)
Index: b/m4/package_dmapidev.m4
===================================================================
--- 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)
Index: b/m4/package_xfslibs.m4
===================================================================
--- a/m4/package_xfslibs.m4
+++ b/m4/package_xfslibs.m4
@@ -51,8 +51,6 @@ AC_DEFUN([AC_PACKAGE_NEED_LIBXFSINIT_LIB
         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_FSHAND
         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_LIBHA
         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)

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs