# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
+# The AC_MULTILIB macro was extracted and modified from
+# gettext-0.15's AC_LIB_PREPARE_MULTILIB macro in the lib-prefix.m4 file
+# so that the correct paths can be used for 64-bit libraries.
+#
+dnl Copyright (C) 2001-2005 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.
+dnl From Bruno Haible.
+
+dnl AC_MULTILIB creates a variable libdirsuffix, containing
+dnl the suffix of the libdir, either "" or "64".
+dnl Only do this if the given enable parameter is "yes".
+AC_DEFUN([AC_MULTILIB],
+[
+ dnl There is no formal standard regarding lib and lib64. The current
+ dnl practice is that on a system supporting 32-bit and 64-bit instruction
+ dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit
+ dnl libraries go under $prefix/lib. We determine the compiler's default
+ dnl mode by looking at the compiler's library search path. If at least
+ dnl of its elements ends in /lib64 or points to a directory whose absolute
+ dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the
+ dnl default, namely "lib".
+ enable_lib64="$1"
+ libdirsuffix=""
+ searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+ if test "$enable_lib64" = "yes" -a -n "$searchpath"; then
+ save_IFS="${IFS= }"; IFS=":"
+ for searchdir in $searchpath; do
+ if test -d "$searchdir"; then
+ case "$searchdir" in
+ */lib64/ | */lib64 ) libdirsuffix=64 ;;
+ *) searchdir=`cd "$searchdir" && pwd`
+ case "$searchdir" in
+ */lib64 ) libdirsuffix=64 ;;
+ esac ;;
+ esac
+ fi
+ done
+ IFS="$save_IFS"
+ fi
+ AC_SUBST(libdirsuffix)
+])
+
AC_DEFUN([AC_PACKAGE_NEED_SYS_ACL_H],
[ AC_CHECK_HEADERS([sys/acl.h])
if test "$ac_cv_header_sys_acl_h" != "yes"; then
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"
+ test -f ${libexecdir}${libdirsuffix}/libacl.la && \
+ libacl="${libexecdir}${libdirsuffix}/libacl.la"
AC_SUBST(libacl)
])
AC_SUBST(have_aio)
])
+AC_DEFUN([AC_PACKAGE_WANT_DMAPI],
+ [ AC_CHECK_HEADERS(sys/dmapi/dmapi.h, [ have_dmapi=true ], [ have_dmapi=false ])
+ AC_SUBST(have_dmapi)
+ ])
+
AC_DEFUN([AC_PACKAGE_NEED_ATTR_XATTR_H],
[ AC_CHECK_HEADERS([attr/xattr.h])
if test "$ac_cv_header_attr_xattr_h" != "yes"; then
libattr="-lattr"
test -f `pwd`/../attr/libattr/libattr.la && \
libattr="`pwd`/../attr/libattr/libattr.la"
- test -f /usr/lib/libattr.la && libattr="/usr/lib/libattr.la"
+ test -f ${libexecdir}${libdirsuffix}/libattr.la && \
+ libattr="${libexecdir}${libdirsuffix}/libattr.la"
AC_SUBST(libattr)
])
libattr="-lattr"
test -f `pwd`/../attr/libattr/libattr.la && \
libattr="`pwd`/../attr/libattr/libattr.la"
- test -f /usr/lib/libattr.la && libattr="/usr/lib/libattr.la"
+ test -f ${libexecdir}${libdirsuffix}/libattr.la && \
+ libattr="${libexecdir}${libdirsuffix}/libattr.la"
AC_SUBST(libattr)
])
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"
+ if test $have_db = true; then
+ libgdbm="-lgdbm"
fi
AC_SUBST(libgdbm)
AC_SUBST(have_db)
])
-#
+#
# Generic macro, sets up all of the global packaging variables.
# The following environment variables may be set to override defaults:
# DEBUG OPTIMIZER MALLOCLIB PLATFORM DISTRIBUTION INSTALL_USER INSTALL_GROUP
debug_build="$DEBUG"
AC_SUBST(debug_build)
- OPTIMIZER=${OPTIMIZER:-'-g'} dnl -O2
+ OPTIMIZER=${OPTIMIZER:-'-g -O2'}
opt_build="$OPTIMIZER"
AC_SUBST(opt_build)
malloc_lib="$MALLOCLIB"
AC_SUBST(malloc_lib)
- pkg_user=`id -u`
+ pkg_user=`id -u -n`
test -z "$INSTALL_USER" || pkg_user="$INSTALL_USER"
AC_SUBST(pkg_user)
- pkg_group=`id -g`
+ pkg_group=`id -g -n`
test -z "$INSTALL_GROUP" || pkg_group="$INSTALL_GROUP"
AC_SUBST(pkg_group)
AC_SUBST(libuuid)
])
+AC_DEFUN([AC_PACKAGE_NEED_XFS_XFS_H],
+ [ AC_CHECK_HEADERS([xfs/xfs.h])
+ if test "$ac_cv_header_xfs_xfs_h" != "yes"; then
+ echo
+ echo 'FATAL ERROR: cannot find a valid <xfs/xfs.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_LIBXFS_H],
[ AC_CHECK_HEADERS([xfs/libxfs.h])
if test "$ac_cv_header_xfs_libxfs_h" != "yes"; then
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)
])
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)
])
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_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.'