From: Tim Shimmin Date: Tue, 4 Apr 2006 06:06:00 +0000 (+0000) Subject: fix lib64 installs X-Git-Tag: v1.1.0~656 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e11d0477a18717de5253e2af292d028d896e4176;p=xfstests-dev.git fix lib64 installs Merge of master-melb:xfs-cmds:25657a by kenmcd. --- diff --git a/Makefile b/Makefile index 0ffbbf89..1d8071c6 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2000-2003 Silicon Graphics, Inc. All Rights Reserved. +# Copyright (c) 2000-2006 Silicon Graphics, Inc. All Rights Reserved. # TOPDIR = . @@ -36,7 +36,7 @@ $(CONFIGURE): ./configure aclocal.m4:: - aclocal --acdir=$(TOPDIR)/m4 --output=$@ + aclocal --acdir=`pwd`/m4 --output=$@ install install-dev install-lib: diff --git a/aclocal.m4 b/aclocal.m4 index 714c42cd..5cc06cb9 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.7.5 -*- Autoconf -*- +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005 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. @@ -11,6 +11,147 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +AC_DEFUN([AC_PACKAGE_NEED_SYS_ACL_H], + [ AC_CHECK_HEADERS([sys/acl.h]) + if test "$ac_cv_header_sys_acl_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-dev" from the acl 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 + echo + echo 'FATAL ERROR: acl/libacl.h does not exist.' + echo 'Install the access control lists (acl) development package.' + echo 'Alternatively, run "make install-dev" from the acl 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.' + 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_WANT_AIO], + [ AC_CHECK_HEADERS(libaio.h, [ have_aio=true ], [ have_aio=false ]) + AC_SUBST(have_aio) + ]) + +AC_DEFUN([AC_PACKAGE_NEED_ATTR_XATTR_H], + [ AC_CHECK_HEADERS([attr/xattr.h]) + if test "$ac_cv_header_attr_xattr_h" != "yes"; then + echo + echo 'FATAL ERROR: attr/xattr.h does not exist.' + echo 'Install the extended attributes (attr) development package.' + echo 'Alternatively, run "make install-dev" from the attr source.' + exit 1 + fi + ]) + +AC_DEFUN([AC_PACKAGE_NEED_ATTR_ERROR_H], + [ AC_CHECK_HEADERS([attr/error_context.h]) + if test "$ac_cv_header_attr_error_context_h" != "yes"; then + echo + echo 'FATAL ERROR: attr/error_context.h does not exist.' + echo 'Install the extended attributes (attr) development package.' + echo 'Alternatively, run "make install-dev" from the attr source.' + exit 1 + fi + ]) + +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: attributes.h does not exist.' + echo 'Install the extended attributes (attr) development package.' + echo 'Alternatively, run "make install-dev" from the attr source.' + exit 1 + fi + ]) + +AC_DEFUN([AC_PACKAGE_WANT_ATTRLIST_LIBATTR], + [ AC_CHECK_LIB(attr, attr_list, [have_attr_list=true], [have_attr_list=false]) + AC_SUBST(have_attr_list) + ]) + +AC_DEFUN([AC_PACKAGE_NEED_GETXATTR_LIBATTR], + [ AC_CHECK_LIB(attr, getxattr,, [ + echo + echo 'FATAL ERROR: could not find a valid Extended Attributes library.' + echo 'Install the extended attributes (attr) development package.' + echo 'Alternatively, run "make install-lib" from the attr source.' + exit 1 + ]) + 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" + AC_SUBST(libattr) + ]) + +AC_DEFUN([AC_PACKAGE_NEED_ATTRGET_LIBATTR], + [ AC_CHECK_LIB(attr, attr_get,, [ + echo + echo 'FATAL ERROR: could not find a valid Extended Attributes library.' + echo 'Install the extended attributes (attr) development package.' + echo 'Alternatively, run "make install-lib" from the attr source.' + exit 1 + ]) + 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" + AC_SUBST(libattr) + ]) + +AC_DEFUN([AC_PACKAGE_NEED_ATTRIBUTES_MACROS], + [ AC_MSG_CHECKING([macros in attr/attributes.h]) + AC_TRY_LINK([ +#include +#include ], + [ int x = ATTR_SECURE; ], [ echo ok ], [ + echo + echo 'FATAL ERROR: could not find a current attributes header.' + echo 'Upgrade the extended attributes (attr) development package.' + echo 'Alternatively, run "make install-dev" from the attr source.' + exit 1 ]) + ]) + +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) + ]) + # # Generic macro, sets up all of the global packaging variables. # The following environment variables may be set to override defaults: @@ -40,12 +181,12 @@ AC_DEFUN([AC_PACKAGE_GLOBALS], malloc_lib="$MALLOCLIB" AC_SUBST(malloc_lib) - PKG_USER=${INSTALL_USER:-'root'} - pkg_user="$PKG_USER" + pkg_user=`id -u` + test -z "$INSTALL_USER" || pkg_user="$INSTALL_USER" AC_SUBST(pkg_user) - PKG_GROUP=${INSTALL_GROUP:-'root'} - pkg_group="$PKG_GROUP" + pkg_group=`id -g` + test -z "$INSTALL_GROUP" || pkg_group="$INSTALL_GROUP" AC_SUBST(pkg_group) pkg_distribution=`uname -s` @@ -170,7 +311,7 @@ AC_DEFUN([AC_PACKAGE_UTILITIES], dnl .. and what version is rpm rpm_version=0 - test -x "$RPM" && rpm_version=`$RPM --version \ + test -n "$RPM" && test -x "$RPM" && rpm_version=`$RPM --version \ | awk '{print $NF}' | awk -F. '{V=1; print $V}'` AC_SUBST(rpm_version) dnl At some point in rpm 4.0, rpm can no longer build rpms, and @@ -212,142 +353,6 @@ AC_DEFUN([AC_PACKAGE_NEED_UUIDCOMPARE], AC_SUBST(libuuid) ]) -AC_DEFUN([AC_PACKAGE_NEED_SYS_ACL_H], - [ AC_CHECK_HEADERS([sys/acl.h]) - if test "$ac_cv_header_sys_acl_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-dev" from the acl 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 - echo - echo 'FATAL ERROR: acl/libacl.h does not exist.' - echo 'Install the access control lists (acl) development package.' - echo 'Alternatively, run "make install-dev" from the acl 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.' - 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], - [ AC_CHECK_HEADERS([attr/xattr.h]) - if test "$ac_cv_header_attr_xattr_h" != "yes"; then - echo - echo 'FATAL ERROR: attr/xattr.h does not exist.' - echo 'Install the extended attributes (attr) development package.' - echo 'Alternatively, run "make install-dev" from the attr source.' - exit 1 - fi - ]) - -AC_DEFUN([AC_PACKAGE_NEED_ATTR_ERROR_H], - [ AC_CHECK_HEADERS([attr/error_context.h]) - if test "$ac_cv_header_attr_error_context_h" != "yes"; then - echo - echo 'FATAL ERROR: attr/error_context.h does not exist.' - echo 'Install the extended attributes (attr) development package.' - echo 'Alternatively, run "make install-dev" from the attr source.' - exit 1 - fi - ]) - -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: attributes.h does not exist.' - echo 'Install the extended attributes (attr) development package.' - echo 'Alternatively, run "make install-dev" from the attr source.' - exit 1 - fi - ]) - -AC_DEFUN([AC_PACKAGE_WANT_ATTRLIST_LIBATTR], - [ AC_CHECK_LIB(attr, attr_list, [have_attr_list=true], [have_attr_list=false]) - AC_SUBST(have_attr_list) - ]) - -AC_DEFUN([AC_PACKAGE_NEED_GETXATTR_LIBATTR], - [ AC_CHECK_LIB(attr, getxattr,, [ - echo - echo 'FATAL ERROR: could not find a valid Extended Attributes library.' - echo 'Install the extended attributes (attr) development package.' - echo 'Alternatively, run "make install-lib" from the attr source.' - exit 1 - ]) - 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" - AC_SUBST(libattr) - ]) - -AC_DEFUN([AC_PACKAGE_NEED_ATTRGET_LIBATTR], - [ AC_CHECK_LIB(attr, attr_get,, [ - echo - echo 'FATAL ERROR: could not find a valid Extended Attributes library.' - echo 'Install the extended attributes (attr) development package.' - echo 'Alternatively, run "make install-lib" from the attr source.' - exit 1 - ]) - 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" - AC_SUBST(libattr) - ]) - -AC_DEFUN([AC_PACKAGE_NEED_ATTRIBUTES_MACROS], - [ AC_MSG_CHECKING([macros in attr/attributes.h]) - AC_TRY_LINK([ -#include -#include ], - [ int x = ATTR_SECURE; ], [ echo ok ], [ - echo - echo 'FATAL ERROR: could not find a current attributes header.' - echo 'Upgrade the extended attributes (attr) development package.' - echo 'Alternatively, run "make install-dev" from the attr source.' - exit 1 ]) - ]) - -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 @@ -451,8 +456,3 @@ AC_DEFUN([AC_PACKAGE_NEED_XFSCTL_MACRO], ]) ]) -AC_DEFUN([AC_PACKAGE_WANT_AIO], - [ AC_CHECK_HEADERS(libaio.h, [ have_aio=true ], [ have_aio=false ]) - AC_SUBST(have_aio) - ]) - diff --git a/m4/Makefile b/m4/Makefile index eda4bfe0..6c1d0e45 100644 --- a/m4/Makefile +++ b/m4/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2003 Silicon Graphics, Inc. All Rights Reserved. +# Copyright (c) 2003-2006 Silicon Graphics, Inc. All Rights Reserved. # TOPDIR = .. @@ -21,7 +21,8 @@ LSRCFILES = \ package_uuiddev.m4 \ package_xfslibs.m4 \ general_headers.m4 \ - visibility_hidden.m4 + visibility_hidden.m4 \ + multilib.m4 default: diff --git a/m4/multilib.m4 b/m4/multilib.m4 new file mode 100644 index 00000000..8d991d8d --- /dev/null +++ b/m4/multilib.m4 @@ -0,0 +1,43 @@ +# 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) +]) diff --git a/m4/package_acldev.m4 b/m4/package_acldev.m4 index 2508e2cb..0cbd19f5 100644 --- a/m4/package_acldev.m4 +++ b/m4/package_acldev.m4 @@ -32,6 +32,7 @@ AC_DEFUN([AC_PACKAGE_NEED_ACLINIT_LIBACL], 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) ]) diff --git a/m4/package_attrdev.m4 b/m4/package_attrdev.m4 index e0ae9305..461ddffb 100644 --- a/m4/package_attrdev.m4 +++ b/m4/package_attrdev.m4 @@ -48,7 +48,8 @@ AC_DEFUN([AC_PACKAGE_NEED_GETXATTR_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) ]) @@ -63,7 +64,8 @@ AC_DEFUN([AC_PACKAGE_NEED_ATTRGET_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) ]) diff --git a/m4/package_dmapidev.m4 b/m4/package_dmapidev.m4 index 1f9824ab..89330bd8 100644 --- a/m4/package_dmapidev.m4 +++ b/m4/package_dmapidev.m4 @@ -20,6 +20,7 @@ AC_DEFUN([AC_PACKAGE_NEED_MAKEHANDLE_LIBDM], libdm="-ldm" test -f `pwd`/../dmapi/libdm/libdm.la && \ libdm="`pwd`/../dmapi/libdm/libdm.la" - test -f /usr/lib/libdm.la && libdm="/usr/lib/libdm.la" + test -f ${libexecdir}${libdirsuffix}/libdm.la && \ + libdm="${libexecdir}${libdirsuffix}/libdm.la" AC_SUBST(libdm) ]) diff --git a/m4/package_gdbmdev.m4 b/m4/package_gdbmdev.m4 index 513e20f2..d826acdf 100644 --- a/m4/package_gdbmdev.m4 +++ b/m4/package_gdbmdev.m4 @@ -7,8 +7,8 @@ AC_DEFUN([AC_PACKAGE_WANT_NDBM], 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 -a -f ${libexecdir}${libdirsuffix}/libgdbm.a; then + libgdbm="${libexecdir}${libdirsuffix}/libgdbm.a" fi AC_SUBST(libgdbm) AC_SUBST(have_db) diff --git a/m4/package_xfslibs.m4 b/m4/package_xfslibs.m4 index af718c25..0a38e1b6 100644 --- a/m4/package_xfslibs.m4 +++ b/m4/package_xfslibs.m4 @@ -42,7 +42,8 @@ AC_DEFUN([AC_PACKAGE_NEED_LIBXFSINIT_LIBXFS], 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) ]) @@ -57,7 +58,8 @@ AC_DEFUN([AC_PACKAGE_NEED_OPEN_BY_FSHANDLE], 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) ]) @@ -72,7 +74,8 @@ AC_DEFUN([AC_PACKAGE_NEED_ATTRLIST_LIBHANDLE], 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) ])