Update to rra-c-util 10.5

[kerberos/krb5-strength.git] / m4 / lib-pathname.m4

diff --git a/m4/lib-pathname.m4 b/m4/lib-pathname.m4
index 46e887978e4e541c5cee1494706f0bf641aab203..e5ffbd7211777ab9c8c1808240dd6548839ac5d5 100644 (file)
--- a/m4/lib-pathname.m4
+++ b/m4/lib-pathname.m4
@@ -1,3 +1,5 @@
+# serial 1
+
 dnl Determine the library path name.
 dnl
 dnl Red Hat systems and some other Linux systems use lib64 and lib32 rather
@@ -9,13 +11,11 @@ dnl the compilation environment.  If a suffix is given, a slash and that
 dnl suffix will be appended, to allow for adding a subdirectory of the library
 dnl directory.
 dnl
-dnl This file also provides the Autoconf macro RRA_SET_LIBDIR, which sets the
-dnl libdir variable to PREFIX/lib{,32,64} as appropriate.
-dnl
 dnl The canonical version of this file is maintained in the rra-c-util
 dnl package, available at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
 dnl
 dnl Written by Russ Allbery <eagle@eyrie.org>
+dnl Copyright 2021-2022 Russ Allbery <eagle@eyrie.org>
 dnl Copyright 2008-2009
 dnl     The Board of Trustees of the Leland Stanford Junior University
 dnl
@@ -37,10 +37,10 @@ dnl see.
 AC_DEFUN([_RRA_LIB_ARCH_NAME],
 [rra_lib_arch_name=lib
  AC_CHECK_SIZEOF([long])
- AS_IF([test "$ac_cv_sizeof_long" -eq 4 && test -d /usr/lib32],
-     [rra_lib_arch_name=lib32],
-     [AS_IF([test "$ac_cv_sizeof_long" -eq 8 && test -d /usr/lib64],
-         [rra_lib_arch_name=lib64])])])
+ AS_IF([test "$ac_cv_sizeof_long" -eq 4],
+    [rra_lib_arch_name=lib32],
+    [AS_IF([test "$ac_cv_sizeof_long" -eq 8],
+        [rra_lib_arch_name=lib64])])])
 
 dnl Set VARIABLE to -LPREFIX/lib{,32,64} or -LPREFIX/lib{,32,64}/SUFFIX as
 dnl appropriate.
@@ -53,11 +53,4 @@ AC_DEFUN([RRA_SET_LDFLAGS],
     [AS_IF([test x"$3" = x],
         [$1="[$]$1 -L$2/lib"],
         [$1="[$]$1 -L$2/lib/$3"])])
- $1=`echo "[$]$1" | sed -e 's/^ *//'`])
-
-dnl Set libdir to PREFIX/lib{,32,64} as appropriate.
-AC_DEFUN([RRA_SET_LIBDIR],
-[AC_REQUIRE([_RRA_LIB_ARCH_NAME])
- AS_IF([test -d "$1/$rra_lib_arch_name"],
-    [libdir="$1/${rra_lib_arch_name}"],
-    [libdir="$1/lib"])])
+ $1=`AS_ECHO(["[$]$1"]) | sed -e 's/^ *//'`])