summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2020-12-29 04:00:53 +0100
committerBruno Haible <bruno@clisp.org>2020-12-29 04:00:53 +0100
commitb29d62dfaf8c55b18e9c8f30322a9bcde5255cb7 (patch)
treeea0dae57fe6179ee8b79cac785f77869e5d4531c /m4
parent8add0168e2bc3158b830aa00a0b0a03d3d27ffa9 (diff)
downloadgnulib-b29d62dfaf8c55b18e9c8f30322a9bcde5255cb7.tar.gz
havelib: Fix for Solaris 11 OpenIndiana and Solaris 11 OmniOS.
* m4/lib-prefix.m4 (AC_LIB_PREPARE_MULTILIB): In acl_is_expected_elfclass, use 'expr', not 'test'.
Diffstat (limited to 'm4')
-rw-r--r--m4/lib-prefix.m49
1 files changed, 6 insertions, 3 deletions
diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4
index 28bb3d366a..2bcdfdfecc 100644
--- a/m4/lib-prefix.m4
+++ b/m4/lib-prefix.m4
@@ -1,4 +1,4 @@
-# lib-prefix.m4 serial 18
+# lib-prefix.m4 serial 19
dnl Copyright (C) 2001-2005, 2008-2020 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -198,20 +198,23 @@ AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
echo
}
fi
+ # Use 'expr', not 'test', to compare the values of func_elfclass, because on
+ # Solaris 11 OpenIndiana and Solaris 11 OmniOS, the result is 001 or 002,
+ # not 1 or 2.
changequote(,)dnl
case $HOST_CPU_C_ABI_32BIT in
yes)
# 32-bit ABI.
acl_is_expected_elfclass ()
{
- test "`func_elfclass | sed -e 's/[ ]//g'`" = 1
+ expr "`func_elfclass | sed -e 's/[ ]//g'`" = 1 > /dev/null
}
;;
no)
# 64-bit ABI.
acl_is_expected_elfclass ()
{
- test "`func_elfclass | sed -e 's/[ ]//g'`" = 2
+ expr "`func_elfclass | sed -e 's/[ ]//g'`" = 2 > /dev/null
}
;;
*)