fix lib64 installs

Merge of master-melb:xfs-cmds:25657a by kenmcd.

7 files changed, 62 insertions, 11 deletions

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)
   ])