From: Bruno Haible <bruno@clisp.org>
Date: Sun, 20 Jun 2021 12:25:39 +0000 (+0200)
Subject: build: Simplify further.
X-Git-Tag: v0.22~240
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97767a7c3716f4a93c3ea260ddb874872974ff43;p=thirdparty%2Fgettext.git

build: Simplify further.

* gettext-runtime/intl/Makefile.am: Assume BUILD_INCLUDED_LIBINTL is true.
* gettext-runtime/intl/configure.ac: Remove BUILD_INCLUDED_LIBINTL conditional.
* gettext-runtime/m4/gettext.m4 (AM_GNU_GETTEXT): Don't set
BUILD_INCLUDED_LIBINTL.
---

diff --git a/gettext-runtime/intl/Makefile.am b/gettext-runtime/intl/Makefile.am
index a4a099933..c33c7b785 100644
--- a/gettext-runtime/intl/Makefile.am
+++ b/gettext-runtime/intl/Makefile.am
@@ -208,11 +208,9 @@ nodist_include_HEADERS = libintl.h
 noinst_LTLIBRARIES = libintl.la
 libintl_la_SOURCES = $(LIBINTLSOURCES)
 else
-if BUILD_INCLUDED_LIBINTL
 noinst_LTLIBRARIES = libgnuintl.la
 libgnuintl_la_SOURCES = $(LIBINTLSOURCES)
 endif
-endif
 
 # export.h is an auxiliary file used in constructing the .h files.
 EXTRA_DIST += export.h
diff --git a/gettext-runtime/intl/configure.ac b/gettext-runtime/intl/configure.ac
index 13d7cfa70..3f829e0a4 100644
--- a/gettext-runtime/intl/configure.ac
+++ b/gettext-runtime/intl/configure.ac
@@ -85,7 +85,6 @@ dnl (OK, not quite, the AC_CONFIG_FILES has also some parts.)
 AM_GNU_GETTEXT([here], [need-ngettext])
 dnl Conditionals for the intl/ directory.
 AM_CONDITIONAL([USE_INCLUDED_LIBINTL], [test $USE_INCLUDED_LIBINTL = yes])
-AM_CONDITIONAL([BUILD_INCLUDED_LIBINTL], [test $BUILD_INCLUDED_LIBINTL = yes])
 AM_CONDITIONAL([PRELOADABLE_LIBINTL],
   [test $USE_INCLUDED_LIBINTL = no && test $GLIBC2 = yes && test "$enable_shared" = yes])
 
diff --git a/gettext-runtime/m4/gettext.m4 b/gettext-runtime/m4/gettext.m4
index c799ba2bf..a841d9c50 100644
--- a/gettext-runtime/m4/gettext.m4
+++ b/gettext-runtime/m4/gettext.m4
@@ -1,4 +1,4 @@
-# gettext.m4 serial 74 (gettext-0.21.1)
+# gettext.m4 serial 75 (gettext-0.21.1)
 dnl Copyright (C) 1995-2014, 2016, 2018-2021 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -98,7 +98,6 @@ AC_DEFUN([AM_GNU_GETTEXT],
   AC_REQUIRE([AM_NLS])
 
   m4_if(gt_building_libintl_in_same_build_tree, yes, [
-    BUILD_INCLUDED_LIBINTL=no
     USE_INCLUDED_LIBINTL=no
   ])
   LIBINTL=
@@ -271,7 +270,6 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
 
       if test "$nls_cv_use_gnu_gettext" = "yes"; then
         dnl Mark actions used to generate GNU NLS library.
-        BUILD_INCLUDED_LIBINTL=yes
         USE_INCLUDED_LIBINTL=yes
         LIBINTL="m4_if([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LIBICONV $LIBTHREAD"
         LTLIBINTL="m4_if([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LTLIBICONV $LTLIBTHREAD"
@@ -342,12 +340,7 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
   fi
 
   m4_if(gt_building_libintl_in_same_build_tree, yes, [
-    dnl In GNU gettext we have to set BUILD_INCLUDED_LIBINTL to 'yes'
-    dnl because some of the testsuite requires it.
-    BUILD_INCLUDED_LIBINTL=yes
-
     dnl Make all variables we use known to autoconf.
-    AC_SUBST([BUILD_INCLUDED_LIBINTL])
     AC_SUBST([USE_INCLUDED_LIBINTL])
     AC_SUBST([CATOBJEXT])
   ])