Finalize 1.8.3 release.

[ginac.git] / m4 / lib-prefix.m4

diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4
index 3c94db0acbd28bcca747d212e991561b0bf98186..c8a0b464c2804e7f10ed9abcaed5bb43f23b0e49 100644 (file)
--- a/m4/lib-prefix.m4
+++ b/m4/lib-prefix.m4
@@ -1,5 +1,5 @@
-# lib-prefix.m4 serial 19
-dnl Copyright (C) 2001-2005, 2008-2021 Free Software Foundation, Inc.
+# lib-prefix.m4 serial 17
+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,
 dnl with or without modifications, as long as this notice is preserved.
@@ -180,8 +180,8 @@ AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
        ],
        [gl_cv_elf=yes],
        [gl_cv_elf=no])
-    ])
-  if test $gl_cv_elf = yes; then
+     ])
+  if test $gl_cv_elf; then
     # Extract the ELF class of a file (5th byte) in decimal.
     # Cf. https://en.wikipedia.org/wiki/Executable_and_Linkable_Format#File_header
     if od -A x < /dev/null >/dev/null 2>/dev/null; then
@@ -198,23 +198,20 @@ 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 ()
         {
-          expr "`func_elfclass | sed -e 's/[   ]//g'`" = 1 > /dev/null
+          test "`func_elfclass | sed -e 's/[   ]//g'`" = 1
         }
         ;;
       no)
         # 64-bit ABI.
         acl_is_expected_elfclass ()
         {
-          expr "`func_elfclass | sed -e 's/[   ]//g'`" = 2 > /dev/null
+          test "`func_elfclass | sed -e 's/[   ]//g'`" = 2
         }
         ;;
       *)