X-Git-Url: http://git.apps.os.sepia.ceph.com/?p=xfstests-dev.git;a=blobdiff_plain;f=m4%2Fpackage_xfslibs.m4;h=cafd9597c2abfdb1f9826eda1390f2d665c9f546;hp=7831bc4ed6e68c8bdbb09500868a31b56db351a4;hb=2c578cb87f78052c65c09f2db2ebc5e40c85a4af;hpb=c1ef92a938a11dc2b95fc8228a0286473b6145c2

diff --git a/m4/package_xfslibs.m4 b/m4/package_xfslibs.m4
index 7831bc4e..cafd9597 100644
--- a/m4/package_xfslibs.m4
+++ b/m4/package_xfslibs.m4
@@ -2,8 +2,18 @@ AC_DEFUN([AC_PACKAGE_NEED_XFS_LIBXFS_H],
   [ AC_CHECK_HEADERS([xfs/libxfs.h])
     if test "$ac_cv_header_xfs_libxfs_h" != "yes"; then
         echo
-        echo 'FATAL ERROR: XFS header <xfs/libxfs.h> does not exist.'
-        echo 'Install the XFS programs (xfsprogs) development package.'
+        echo 'FATAL ERROR: cannot find a valid <xfs/libxfs.h> header file.'
+        echo 'Run "make install-qa" from the xfsprogs source.'
+        exit 1
+    fi
+  ])
+
+AC_DEFUN([AC_PACKAGE_NEED_XFS_XQM_H],
+  [ AC_CHECK_HEADERS([xfs/xqm.h])
+    if test "$ac_cv_header_xfs_xqm_h" != "yes"; then
+        echo
+        echo 'FATAL ERROR: cannot find a valid <xfs/xqm.h> header file.'
+        echo 'Install or upgrade the XFS development package.'
         echo 'Alternatively, run "make install-dev" from the xfsprogs source.'
         exit 1
     fi
@@ -13,8 +23,8 @@ AC_DEFUN([AC_PACKAGE_NEED_XFS_HANDLE_H],
   [ AC_CHECK_HEADERS([xfs/handle.h])
     if test "$ac_cv_header_xfs_handle_h" != "yes"; then
         echo
-        echo 'FATAL ERROR: XFS header <xfs/handle.h> does not exist.'
-        echo 'Install the XFS programs (xfsprogs) development package.'
+        echo 'FATAL ERROR: cannot find a valid <xfs/handle.h> header file.'
+        echo 'Install or upgrade the XFS development package.'
         echo 'Alternatively, run "make install-dev" from the xfsprogs source.'
         exit 1
     fi
@@ -24,35 +34,66 @@ AC_DEFUN([AC_PACKAGE_NEED_LIBXFSINIT_LIBXFS],
   [ AC_CHECK_LIB(xfs, libxfs_init,, [
         echo
         echo 'FATAL ERROR: could not find a valid XFS base library.'
-        echo 'Install the XFS programs (xfsprogs) library package.'
+        echo 'Install or upgrade the XFS library package.'
         echo 'Alternatively, run "make install-dev" from the xfsprogs source.'
         exit 1
     ])
     libxfs="-lxfs"
     test -f `pwd`/../xfsprogs/libxfs/libxfs.la && \
         libxfs="`pwd`/../xfsprogs/libxfs/libxfs.la"
-    test -f /usr/lib/libxfs.la && libxfs="/usr/lib/libxfs.la"
+    test -f ${libexecdir}${libdirsuffix}/libxfs.la && \
+	libxfs="${libexecdir}${libdirsuffix}/libxfs.la"
     AC_SUBST(libxfs)
   ])
 
+AC_DEFUN([AC_PACKAGE_NEED_OPEN_BY_FSHANDLE],
+  [ AC_CHECK_LIB(handle, open_by_fshandle,, [
+        echo
+        echo 'FATAL ERROR: could not find a current XFS handle library.'
+        echo 'Install or upgrade the XFS library package.'
+        echo 'Alternatively, run "make install-dev" from the xfsprogs source.'
+        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)
+  ])
+
 AC_DEFUN([AC_PACKAGE_NEED_ATTRLIST_LIBHANDLE],
   [ AC_CHECK_LIB(handle, attr_list_by_handle,, [
         echo
         echo 'FATAL ERROR: could not find a current XFS handle library.'
-        echo 'Install the XFS programs (xfsprogs) library package.'
+        echo 'Install or upgrade the XFS library package.'
         echo 'Alternatively, run "make install-lib" from the xfsprogs source.'
         exit 1
     ])
     libhdl="-lhandle"
     test -f `pwd`/../xfsprogs/libhandle/libhandle.la && \
         libhdl="`pwd`/../xfsprogs/libhandle/libhandle.la"
-    test -f /usr/lib/libhandle.la && libhdl="/usr/lib/libhandle.la"
+    test -f ${libexecdir}${libdirsuffix}/libhandle.la && \
+	libhdl="${libexecdir}${libdirsuffix}/libhandle.la"
+    AC_SUBST(libhdl)
+  ])
+
+AC_DEFUN([AC_PACKAGE_NEED_IRIX_LIBHANDLE],
+  [ 
+    AC_MSG_CHECKING([libhandle.a for IRIX])
+    libhdl="`pwd`/../irix/libhandle/libhandle.a"
+    if ! test -f $libhdl; then
+	echo 'no'
+        echo 'FATAL ERROR: could not find IRIX XFS handle library.'
+        exit 1
+    fi
+    echo 'yes'
     AC_SUBST(libhdl)
   ])
 
 AC_DEFUN([AC_PACKAGE_NEED_XFSCTL_MACRO],
-  [ AC_MSG_CHECKING([xfsctl from xfs/libxfs.h])
-    AC_TRY_LINK([#include <xfs/libxfs.h>], [ int x = xfsctl(0, 0, 0, 0); ],
+  [ AC_MSG_CHECKING([xfsctl from xfs/xfs.h])
+    AC_TRY_LINK([#include <xfs/xfs.h>], [ int x = xfsctl(0, 0, 0, 0); ],
       [ echo ok ],
       [ echo
         echo 'FATAL ERROR: cannot find required macros in the XFS headers.'