From 377e31128e72c62c27008dfd4878ff4bc619b577 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 31 Oct 2022 23:28:19 -0700 Subject: [PROPOSED] Revert change re default HAVE_GETTEXT on macOS * Makefile: Add commentary about this. * private.h (HAVE_GETTEXT): Revert previous change in this area. --- Makefile | 2 ++ private.h | 6 +----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index e64acba6..1d8472fb 100644 --- a/Makefile +++ b/Makefile @@ -196,6 +196,7 @@ PACKRATLIST= UTF8_LOCALE= en_US.utf8 # Non-default libraries needed to link. +# On some hosts, this should have -lintl unless CFLAGS has -DHAVE_GETTEXT=0. LDLIBS= # Add the following to the end of the "CFLAGS=" line as needed to override @@ -213,6 +214,7 @@ LDLIBS= # -DHAVE_GETRANDOM if getrandom works (e.g., GNU/Linux), # -DHAVE_GETRANDOM=0 to avoid using getrandom # -DHAVE_GETTEXT if gettext works (e.g., GNU/Linux, FreeBSD, Solaris), +# where LDLIBS also needs to contain -lintl on some hosts; # -DHAVE_GETTEXT=0 to avoid using gettext # -DHAVE_INCOMPATIBLE_CTIME_R if your system's time.h declares # ctime_r and asctime_r incompatibly with the POSIX standard diff --git a/private.h b/private.h index 03091521..7cbd56d2 100644 --- a/private.h +++ b/private.h @@ -63,11 +63,7 @@ # define HAVE_GENERIC (201112 <= __STDC_VERSION__) #endif -/* Disable gettext by default on macOS, because too many macOS - installations are so messed up that '#include ' compiles - but 'gettext ("hello")' does not link. */ -#if (!defined HAVE_GETTEXT && defined __has_include \ - && ! (defined __APPLE__ && defined __MACH__)) +#if !defined HAVE_GETTEXT && defined __has_include # if __has_include() # define HAVE_GETTEXT true # endif -- 2.37.2