build: fix macOS build without libintl

A more precise fix than commit v9.7-322-gc2e1816a5

* configure.ac (USE_NLS): new AM_CONDITIONAL.
* src/local.mk: add @INTL_MACOSX_LIBS@ to <prog>_LDADD that need it.

diff --git a/configure.ac b/configure.ac
index fd0b11a69a4536fb9fa38653080103bf54c42600..5e99ef386ce8a080becabc09b6135539dfa2edb4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -886,13 +886,13 @@ AC_SUBST([EXTRA_MANS])          AM_SUBST_NOTMAKE([EXTRA_MANS])
 AC_SUBST([built_programs], [$optional_bin_progs])
 
 AM_CONDITIONAL([CROSS_COMPILING], [test "$cross_compiling" = yes])
-
 ############################################################################
 
 # As long as "grep 'PRI[diouxX]' po/*.pot" reports matches in
 # translatable strings, we must use need-formatstring-macros here.
 AM_GNU_GETTEXT([external], [need-formatstring-macros])
 AM_GNU_GETTEXT_VERSION([0.19.2])
+AM_CONDITIONAL([USE_NLS], [test "$USE_NLS" = yes])
 
 # For a test of uniq: it uses the $LOCALE_FR envvar.
 gt_LOCALE_FR

diff --git a/src/local.mk b/src/local.mk
index a55c9f990a7e7359ce64113de4cd8cf4995eb937..14f4d0c13f449f31f2fc511057ea1338b7d0fb3d 100644 (file)
--- a/src/local.mk
+++ b/src/local.mk
@@ -337,6 +337,16 @@ src_sort_LDADD += $(LIBPMULTITHREAD)
 # for pthread_sigmask
 src_sort_LDADD += $(PTHREAD_SIGMASK_LIB)
 
+if !USE_NLS
+# for CFPreferencesCopyAppValue
+src_date_LDADD += $(INTL_MACOSX_LIBS)
+src_du_LDADD += $(INTL_MACOSX_LIBS)
+src_ls_LDADD += $(INTL_MACOSX_LIBS)
+src_pr_LDADD += $(INTL_MACOSX_LIBS)
+src_stat_LDADD += $(INTL_MACOSX_LIBS)
+src_uptime_LDADD += $(INTL_MACOSX_LIBS)
+endif
+
 # Get the release year from lib/version-etc.c.
 RELEASE_YEAR = \
   `sed -n '/.*COPYRIGHT_YEAR = \([0-9][0-9][0-9][0-9]\) };/s//\1/p' \