Revert now-unnecessary override of config.guess on Alpine Linux 3.10.

* m4/musl.m4: Revert 2020-09-19 patch.
* m4/setlocale_null.m4: Likewise.
* modules/setlocale-null: Likewise.

diff --git a/ChangeLog b/ChangeLog
index d2ba0c62d686c07b0d9c2b0a3be90d3c3efd2070..cc1cd4a40a51b69bdfbc191afc7d1609e0ba4f09 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2020-09-20  Bruno Haible  <bruno@clisp.org>
+
+       Revert now-unnecessary override of config.guess on Alpine Linux 3.10.
+       * m4/musl.m4: Revert 2020-09-19 patch.
+       * m4/setlocale_null.m4: Likewise.
+       * modules/setlocale-null: Likewise.
+
 2020-09-19  Ben Pfaff  <blp@cs.stanford.edu>
             Bruno Haible  <bruno@clisp.org>
 

diff --git a/m4/musl.m4 b/m4/musl.m4
index 343c71a7ce5a1d1b04f60000b378a3b2627c192f..d552cd781d6b0f2256605925b0575294ab3fd08d 100644 (file)
--- a/m4/musl.m4
+++ b/m4/musl.m4
@@ -1,4 +1,4 @@
-# musl.m4 serial 2
+# musl.m4 serial 3
 dnl Copyright (C) 2019-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,
@@ -9,40 +9,10 @@ dnl with or without modifications, as long as this notice is preserved.
 # <https://lists.gnu.org/archive/html/bug-gnulib/2018-02/msg00079.html>.
 # From Bruno Haible.
 
-# There are three ways to test for musl libc:
-# a. Look at the 'ldd --version' output. This is how config.guess
-#    does it. But it fails on Alpine Linux 3.10, because on this system
-#    'ldd' is a shell script that does not understand the '--version'
-#    option.
-# b. Test whether the header file <bits/alltypes.h> exists.
-# c. Test whether the header file <stdarg.h> defines the macro
-#    __DEFINED_va_list.
-# We use a+c.
-
 AC_DEFUN_ONCE([gl_MUSL_LIBC],
-[
-  AC_REQUIRE([gl_MUSL_CANONICAL_HOST])
-  case "$host_os" in
-    *-musl*) AC_DEFINE([MUSL_LIBC], [1], [Define to 1 on musl libc.]) ;;
-  esac
-])
-
-# Like AC_CANONICAL_HOST, except for a fix regarding Alpine Linux 3.10.
-
-AC_DEFUN([gl_MUSL_CANONICAL_HOST],
 [
   AC_REQUIRE([AC_CANONICAL_HOST])
   case "$host_os" in
-    linux*-gnu*)
-      AC_EGREP_CPP([actually_musl],
-        [#include <stdarg.h>
-         #ifdef __DEFINED_va_list
-          actually_musl
-         #endif
-        ],
-        [host=`echo "$host" | sed -e 's/gnu.*/musl/'`
-         host_os=`echo "$host_os" | sed -e 's/gnu.*/musl/'`
-        ])
-      ;;
+    *-musl*) AC_DEFINE([MUSL_LIBC], [1], [Define to 1 on musl libc.]) ;;
   esac
 ])

diff --git a/m4/setlocale_null.m4 b/m4/setlocale_null.m4
index 20c5c99cc0e660e8d812624d989eac46a9cfcc1e..fc1e3e142227122053a13a9f25b6b7750c404f6a 100644 (file)
--- a/m4/setlocale_null.m4
+++ b/m4/setlocale_null.m4
@@ -1,4 +1,4 @@
-# setlocale_null.m4 serial 3
+# setlocale_null.m4 serial 4
 dnl Copyright (C) 2019-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,
@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_SETLOCALE_NULL],
 [
-  AC_REQUIRE([gl_MUSL_CANONICAL_HOST])
+  AC_REQUIRE([AC_CANONICAL_HOST])
   AC_REQUIRE([gl_PTHREADLIB])
   AC_CHECK_HEADERS_ONCE([threads.h])
 

diff --git a/modules/setlocale-null b/modules/setlocale-null
index d8c57a240e318e0f68022a84521add4d1ae72e46..2774004ff1f3b4a92fe5b8552123d9a3f1d24c1f 100644 (file)
--- a/modules/setlocale-null
+++ b/modules/setlocale-null
@@ -7,7 +7,6 @@ lib/setlocale_null.c
 lib/setlocale-lock.c
 lib/windows-initguard.h
 m4/setlocale_null.m4
-m4/musl.m4
 m4/threadlib.m4
 m4/visibility.m4