More merge conflicts
[xfstests-dev.git] / aclocal.m4
index 7eb5fbbc9216cade858bf0778f8eee3ef5e645e4..6e9e49843b3040e89ae66b525a85e5cfb38c0829 100644 (file)
@@ -76,59 +76,66 @@ AC_DEFUN([AC_PACKAGE_NEED_UTILITY],
 #  MSGFMT MSGMERGE RPM
 #
 AC_DEFUN([AC_PACKAGE_UTILITIES],
-  [ if test -z "$CC"; then
-        AC_PROG_CC
-    fi
+  [ AC_PROG_CC
     cc="$CC"
     AC_SUBST(cc)
     AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler])
 
     if test -z "$MAKE"; then
-        AC_PATH_PROG(MAKE, make, /usr/bin/make)
+        AC_PATH_PROG(MAKE, gmake,, /usr/bin:/usr/freeware/bin)
+    fi
+    if test -z "$MAKE"; then
+        AC_PATH_PROG(MAKE, make,, /usr/bin)
     fi
     make=$MAKE
     AC_SUBST(make)
     AC_PACKAGE_NEED_UTILITY($1, "$make", make, [GNU make])
 
     if test -z "$LIBTOOL"; then
-       AC_PATH_PROG(LIBTOOL, libtool,,/usr/bin:/usr/local/bin)
+       AC_PATH_PROG(LIBTOOL, libtool,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
     fi
     libtool=$LIBTOOL
     AC_SUBST(libtool)
     AC_PACKAGE_NEED_UTILITY($1, "$libtool", libtool, [GNU libtool])
 
     if test -z "$TAR"; then
-        AC_PATH_PROG(TAR, tar)
+        AC_PATH_PROG(TAR, tar,, /usr/freeware/bin:/bin:/usr/local/bin:/usr/bin)
     fi
     tar=$TAR
     AC_SUBST(tar)
     if test -z "$ZIP"; then
-        AC_PATH_PROG(ZIP, gzip, /bin/gzip)
+        AC_PATH_PROG(ZIP, gzip,, /bin:/usr/local/bin:/usr/freeware/bin)
     fi
+
     zip=$ZIP
     AC_SUBST(zip)
+
     if test -z "$MAKEDEPEND"; then
         AC_PATH_PROG(MAKEDEPEND, makedepend, /bin/true)
     fi
     makedepend=$MAKEDEPEND
     AC_SUBST(makedepend)
+
     if test -z "$AWK"; then
-        AC_PATH_PROG(AWK, awk, /bin/awk)
+        AC_PATH_PROG(AWK, awk,, /bin:/usr/bin)
     fi
     awk=$AWK
     AC_SUBST(awk)
+
     if test -z "$SED"; then
-        AC_PATH_PROG(SED, sed, /bin/sed)
+        AC_PATH_PROG(SED, sed,, /bin:/usr/bin)
     fi
     sed=$SED
     AC_SUBST(sed)
+
     if test -z "$ECHO"; then
-        AC_PATH_PROG(ECHO, echo, /bin/echo)
+        AC_PATH_PROG(ECHO, echo,, /bin:/usr/bin)
     fi
     echo=$ECHO
     AC_SUBST(echo)
+
     if test -z "$SORT"; then
-        AC_PATH_PROG(SORT, sort, /bin/sort)
+        AC_PATH_PROG(SORT, sort,, /bin:/usr/bin)
     fi
     sort=$SORT
     AC_SUBST(sort)
@@ -138,13 +145,14 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
 
     if test "$enable_gettext" = yes; then
         if test -z "$MSGFMT"; then
-                AC_CHECK_PROG(MSGFMT, msgfmt, /usr/bin/msgfmt)
+                AC_PATH_PROG(MSGFMT, msgfmt,, /usr/bin:/usr/freeware/bin)
         fi
         msgfmt=$MSGFMT
         AC_SUBST(msgfmt)
         AC_PACKAGE_NEED_UTILITY($1, "$msgfmt", msgfmt, gettext)
+
         if test -z "$MSGMERGE"; then
-                AC_CHECK_PROG(MSGMERGE, msgmerge, /usr/bin/msgmerge)
+                AC_PATH_PROG(MSGMERGE, msgmerge,, /usr/bin:/usr/freeware/bin)
         fi
         msgmerge=$MSGMERGE
         AC_SUBST(msgmerge)
@@ -152,10 +160,11 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
     fi
 
     if test -z "$RPM"; then
-        AC_PATH_PROG(RPM, rpm, /bin/rpm)
+        AC_PATH_PROG(RPM, rpm,, /bin:/usr/freeware/bin)
     fi
     rpm=$RPM
     AC_SUBST(rpm)
+
     dnl .. and what version is rpm
     rpm_version=0
     test -x $RPM && rpm_version=`$RPM --version \
@@ -173,15 +182,31 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
     AC_SUBST(rpmbuild)
   ])
 
-AC_DEFUN([AC_PACKAGE_NEED_UUID_H],
-  [ AC_CHECK_HEADERS(uuid.h)
-    if test $ac_cv_header_uuid_h = no; then
-       AC_CHECK_HEADERS(uuid/uuid.h,, [
-       echo
-       echo 'FATAL ERROR: could not find a valid UUID header.'
-       echo 'Install the Universally Unique Identifiers development package.'
-       exit 1])
-    fi
+AC_DEFUN([AC_CHECK_GENERAL_HEADERS],
+  [ AC_HEADER_STDC
+    AC_CHECK_HEADERS([ assert.h                \
+                       bstring.h               \
+                       libgen.h                \
+                       dirent.h                \
+                       errno.h                 \
+                       malloc.h                \
+                       uuid.h                  \
+                       uuid/uuid.h             \
+                       sys/uuid.h              \
+                       sys/file.h              \
+                       sys/fcntl.h             \
+                       sys/syssgi.h            \
+                       sys/param.h             \
+                       sys/stat.h              \
+                       sys/statvfs.h           \
+                       sys/time.h              \
+                       sys/ioctl.h             \
+                       sys/wait.h              \
+                       sys/types.h             \
+    ])
+    AC_CHECK_HEADERS([ sys/fs/xfs_fsops.h      \
+                       sys/fs/xfs_itable.h     \
+    ])
   ])
 
 AC_DEFUN([AC_PACKAGE_NEED_UUIDCOMPARE],
@@ -199,24 +224,25 @@ AC_DEFUN([AC_PACKAGE_NEED_UUIDCOMPARE],
     AC_SUBST(libuuid)
   ])
 
+
 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: cannot find a valid <xfs/libxfs.h> header file.'
-        echo 'Install or upgrade the XFS development package.'
-        echo 'Alternatively, run "make install-dev" from the xfsprogs source.'
+        echo 'FATAL ERROR: sys/acl.h does not exist.'
+        echo 'Install the access control lists (acl) development package.'
+        echo 'Alternatively, run "make install-lib" from the acl source.'
         exit 1
     fi
   ])
 
-AC_DEFUN([AC_PACKAGE_NEED_XFS_HANDLE_H],
-  [ AC_CHECK_HEADERS([xfs/handle.h])
-    if test "$ac_cv_header_xfs_handle_h" != "yes"; then
+AC_DEFUN([AC_PACKAGE_NEED_ACL_LIBACL_H],
+  [ AC_CHECK_HEADERS([acl/libacl.h])
+    if test "$ac_cv_header_acl_libacl_h" != "yes"; then
         echo
-        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.'
+        echo 'FATAL ERROR: acl/libacl.h does not exist.'
+        echo 'Install the access control lists (acl) development package.'
+        echo 'Alternatively, run "make install-lib" from the acl source.'
         exit 1
     fi
   ])
@@ -244,23 +270,11 @@ AC_DEFUN([AC_PACKAGE_NEED_ATTRLIST_LIBHANDLE],
         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 /usr/lib/libhandle.la && libhdl="/usr/lib/libhandle.la"
-    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); ],
-      [ echo ok ],
-      [ echo
-        echo 'FATAL ERROR: cannot find required macros in the XFS headers.'
-        echo 'Upgrade your XFS programs (xfsprogs) development package.'
-        echo 'Alternatively, run "make install-dev" from the xfsprogs source.'
-        exit 1
-      ])
+    libacl="-lacl"
+    test -f `pwd`/../acl/libacl/libacl.la && \
+        libacl="`pwd`/../acl/libacl/libacl.la"
+    test -f /usr/lib/libacl.la && libacl="/usr/lib/libacl.la"
+    AC_SUBST(libacl)
   ])
 
 AC_DEFUN([AC_PACKAGE_NEED_ATTR_XATTR_H],
@@ -285,11 +299,12 @@ AC_DEFUN([AC_PACKAGE_NEED_ATTR_ERROR_H],
     fi
   ])
 
-AC_DEFUN([AC_PACKAGE_NEED_ATTR_ATTRIBUTES_H],
-  [ AC_CHECK_HEADERS([attr/attributes.h])
-    if test "$ac_cv_header_attr_attributes_h" != "yes"; then
+AC_DEFUN([AC_PACKAGE_NEED_ATTRIBUTES_H],
+  [ have_attributes_h=false
+    AC_CHECK_HEADERS([attr/attributes.h sys/attributes.h], [have_attributes_h=true], )
+    if test "$have_attributes_h" = "false"; then
         echo
-        echo 'FATAL ERROR: attr/attributes.h does not exist.'
+        echo 'FATAL ERROR: attributes.h does not exist.'
         echo 'Install the extended attributes (attr) development package.'
         echo 'Alternatively, run "make install-lib" from the attr source.'
         exit 1
@@ -340,50 +355,94 @@ AC_DEFUN([AC_PACKAGE_NEED_ATTRIBUTES_MACROS],
     [ echo ok ])
   ])
 
-AC_DEFUN([AC_PACKAGE_NEED_SYS_ACL_H],
-  [ AC_CHECK_HEADERS([sys/acl.h])
-    if test "$ac_cv_header_sys_acl_h" != "yes"; then
+AC_DEFUN([AC_PACKAGE_WANT_NDBM],
+  [ AC_CHECK_HEADERS(ndbm.h, [ have_db=true ], [ have_db=false ])
+    libgdbm=""
+    AC_SUBST(libgdbm)
+    AC_SUBST(have_db)
+  ])
+
+AC_DEFUN([AC_PACKAGE_WANT_GDBM],
+  [ AC_CHECK_HEADERS([gdbm/ndbm.h], [ have_db=true ], [ have_db=false ])
+    if test $have_db = true -a -f /usr/lib/libgdbm.a; then
+       libgdbm="/usr/lib/libgdbm.a"
+    fi
+    AC_SUBST(libgdbm)
+    AC_SUBST(have_db)
+  ])
+
+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: sys/acl.h does not exist.'
-        echo 'Install the access control lists (acl) development package.'
-        echo 'Alternatively, run "make install-lib" from the acl source.'
+        echo 'FATAL ERROR: cannot find a valid <xfs/libxfs.h> header file.'
+        echo 'Install or upgrade the XFS development package.'
+        echo 'Alternatively, run "make install-dev" from the xfsprogs source.'
         exit 1
     fi
   ])
 
-AC_DEFUN([AC_PACKAGE_NEED_ACL_LIBACL_H],
-  [ AC_CHECK_HEADERS([acl/libacl.h])
-    if test "$ac_cv_header_acl_libacl_h" != "yes"; then
+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: acl/libacl.h does not exist.'
-        echo 'Install the access control lists (acl) development package.'
-        echo 'Alternatively, run "make install-lib" from the acl source.'
+        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
   ])
 
+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: 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
+  ])
 
-AC_DEFUN([AC_PACKAGE_NEED_ACLINIT_LIBACL],
-  [ AC_CHECK_LIB(acl, acl_init,, [
-       echo
-       echo 'FATAL ERROR: could not find a valid Access Control List library.'
-       echo 'Install either the libacl (rpm) or the libacl1 (deb) package.'
-       echo 'Alternatively, run "make install-lib" from the acl source.'
+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 or upgrade the XFS library package.'
+        echo 'Alternatively, run "make install-lib" from the xfsprogs source.'
         exit 1
     ])
-    libacl="-lacl"
-    test -f `pwd`/../acl/libacl/libacl.la && \
-        libacl="`pwd`/../acl/libacl/libacl.la"
-    test -f /usr/lib/libacl.la && libacl="/usr/lib/libacl.la"
-    AC_SUBST(libacl)
+    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"
+    AC_SUBST(libxfs)
   ])
 
-AC_DEFUN([AC_PACKAGE_WANT_LIBGDBM],
-  [ AC_CHECK_HEADER([gdbm/ndbm.h], [have_db=true ], [ have_db=false ])
-    if test $have_db = true -a -f /usr/lib/libgdbm.a; then
-       libgdbm="/usr/lib/libgdbm.a"
-    fi
-    AC_SUBST(libgdbm)
-    AC_SUBST(have_db)
+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 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"
+    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); ],
+      [ echo ok ],
+      [ echo
+        echo 'FATAL ERROR: cannot find required macros in the XFS headers.'
+        echo 'Upgrade your XFS programs (xfsprogs) development package.'
+        echo 'Alternatively, run "make install-dev" from the xfsprogs source.'
+        exit 1
+      ])
   ])