havelib: Recognize ELF platform despite SunPRO C on Linux.

* m4/lib-prefix.m4 (AC_LIB_PREPARE_MULTILIB): Recognize Linux as an ELF
platform, even with the SunPRO C compiler that does not define __ELF__.

diff --git a/ChangeLog b/ChangeLog
index a5a7ac7ea13bb05530baf5d99ad20545d878df29..797dd77c6254cb15bb7942f62f9cb351d346aadc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-03-28  Bruno Haible  <bruno@clisp.org>
+
+       havelib: Recognize ELF platform despite SunPRO C on Linux.
+       * m4/lib-prefix.m4 (AC_LIB_PREPARE_MULTILIB): Recognize Linux as an ELF
+       platform, even with the SunPRO C compiler that does not define __ELF__.
+
 2024-03-28  Collin Funk  <collin.funk1@gmail.com>
 
        gnulib-tool.py: Fix missing 'gnulib-cache.m4' in EXTRA_DIST.

diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4
index f327c6ef033aa00c0b6d71412dd6d675e0326fa7..61dc248e3d473fab1af731ff4ebbc1d2e12f1e63 100644 (file)
--- a/m4/lib-prefix.m4
+++ b/m4/lib-prefix.m4
@@ -1,4 +1,4 @@
-# lib-prefix.m4 serial 22
+# lib-prefix.m4 serial 23
 dnl Copyright (C) 2001-2005, 2008-2024 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -174,7 +174,7 @@ AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
 
   AC_CACHE_CHECK([for ELF binary format], [gl_cv_elf],
     [AC_EGREP_CPP([Extensible Linking Format],
-       [#if defined __ELF__ || (defined __linux__ && defined __EDG__)
+       [#if defined __ELF__ || (defined __linux__ && (defined __EDG__ || defined __SUNPRO_C))
         Extensible Linking Format
         #endif
        ],