From 35a8aee77e6053bea27313cb032e8850538bd6ac Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Sun, 24 Aug 2003 23:28:41 +0000 Subject: [PATCH] Clarify the configure message for when pre-xfsctl libxfs.h versions are being used for builds --- aclocal.m4 | 33 +++++++++++++++++---------------- m4/package_xfslibs.m4 | 14 +++++++------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 895bf99b..817fd3e4 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,14 +1,15 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4-p6 +# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*- -dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. +# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without -dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A -dnl PARTICULAR PURPOSE. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. # # Generic macro, sets up all of the global packaging variables. @@ -203,8 +204,8 @@ 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 does not exist.' - echo 'Install the XFS programs (xfsprogs) development package.' + echo 'FATAL ERROR: cannot find a valid header file.' + echo 'Install or upgrade the XFS development package.' echo 'Alternatively, run "make install-dev" from the xfsprogs source.' exit 1 fi @@ -214,8 +215,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 does not exist.' - echo 'Install the XFS programs (xfsprogs) development package.' + echo 'FATAL ERROR: cannot find a valid header file.' + echo 'Install or upgrade the XFS development package.' echo 'Alternatively, run "make install-dev" from the xfsprogs source.' exit 1 fi @@ -225,8 +226,8 @@ 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 'Alternatively, run "make install-dev" from the xfsprogs source.' + echo 'Install or upgrade the XFS library package.' + echo 'Alternatively, run "make install-lib" from the xfsprogs source.' exit 1 ]) libxfs="-lxfs" @@ -240,7 +241,7 @@ 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 ]) diff --git a/m4/package_xfslibs.m4 b/m4/package_xfslibs.m4 index 7831bc4e..cf38ff0f 100644 --- a/m4/package_xfslibs.m4 +++ b/m4/package_xfslibs.m4 @@ -2,8 +2,8 @@ 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 does not exist.' - echo 'Install the XFS programs (xfsprogs) development package.' + echo 'FATAL ERROR: cannot find a valid 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 +13,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 does not exist.' - echo 'Install the XFS programs (xfsprogs) development package.' + echo 'FATAL ERROR: cannot find a valid header file.' + echo 'Install or upgrade the XFS development package.' echo 'Alternatively, run "make install-dev" from the xfsprogs source.' exit 1 fi @@ -24,8 +24,8 @@ 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 'Alternatively, run "make install-dev" from the xfsprogs source.' + echo 'Install or upgrade the XFS library package.' + echo 'Alternatively, run "make install-lib" from the xfsprogs source.' exit 1 ]) libxfs="-lxfs" @@ -39,7 +39,7 @@ 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 ]) -- 2.30.2