From 881854b714cb3987911800c88345ea61db40fb03 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Tue, 24 Jan 2023 02:14:53 -0500 Subject: [PATCH] Fix configuration on Solaris 8. There is an quoting error in Gnulib's threadlib.m4 which causes incorrect configuration settings on old Solaris. We can repeat the simple check with correct quoting to workaround the problem. Additionally, pull in DX_LINGUAS fixes from dxcommon to avoid tripping on Solaris' pre-POSIX /bin/awk. --- common | 2 +- configure.ac | 10 ++++++++++ m4/.gitignore | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/common b/common index b7a7076..70c8454 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit b7a7076354b0837c6da080270bd0d6da2dfce75b +Subproject commit 70c84546fa5ecaba26e4ed021b292a5580f304f0 diff --git a/configure.ac b/configure.ac index 7729fcc..9572e8c 100644 --- a/configure.ac +++ b/configure.ac @@ -28,6 +28,16 @@ gl_EARLY LT_INIT gl_INIT +# Work around quoting bug in Gnulib threadlib.m4 which prevents +# correct detection on e.g., Solaris 8. These platforms require +# PTHREAD_IN_USE_DETECTION_HARD to be set otherwise cdecl99 will +# crash when reporting an error as initialization is not done. +# +# If this gets fixed in Gnulib, we can remove this. +AS_CASE([$host_os], + [[solaris2.[1-9] | solaris2.[1-9].*]], + [AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD])]) + # As the mbrtowc replacement module is not used by the library, there is # no need for multithreaded mbrtowc (all programs are single threaded). AC_DEFINE([GNULIB_MBRTOWC_SINGLE_THREAD], [1], [Define to 1.]) diff --git a/m4/.gitignore b/m4/.gitignore index 53d1fb2..6cf6b45 100644 --- a/m4/.gitignore +++ b/m4/.gitignore @@ -1,3 +1,4 @@ +/*.orig /00gnulib.m4 /absolute-header.m4 /alloca.m4 -- 2.43.2