build: Restore installation of preloadable_libintl.so (regression 2021-06-15).

* gettext-tools/configure.ac (USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL,
PRELOADABLE_LIBINTL): Remove unused conditionals.
* gettext-runtime/configure.ac (PRELOADABLE_LIBINTL): Define as before in
gettext-tools/configure.ac.
* PACKAGING: Update regarding preloadable_libintl.so.

diff --git a/PACKAGING b/PACKAGING
index cf1ae86aded935ca79cc822a86c306725f106f86..46a161232e580524b0d94e8ca2799138f05a716d 100644 (file)
--- a/PACKAGING
+++ b/PACKAGING
@@ -126,7 +126,8 @@ is according to the following file list.
       $prefix/lib/libgettextlib*
       $prefix/lib/libgettextsrc*
       $prefix/lib/libgettextpo*
-      $prefix/lib/preloadable_libintl.so  (only installed on glibc systems)
+      $prefix/lib/preloadable_libintl.so  (only installed on glibc systems;
+                                           actually installed by gettext-runtime's "make install")
       $prefix/lib/gettext/*
       $prefix/share/locale/*/LC_MESSAGES/gettext-tools.mo
       $prefix/share/gettext/config.rpath

diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac
index 2b0afc62745820a55298e6c998a741a604bf6bb8..c53147187ac6ca46d7e7d5318f68bf3034c7be26 100644 (file)
--- a/gettext-runtime/configure.ac
+++ b/gettext-runtime/configure.ac
@@ -101,7 +101,8 @@ AM_GNU_GETTEXT([use-libtool], [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], [false])
+AM_CONDITIONAL([PRELOADABLE_LIBINTL],
+  [test $USE_INCLUDED_LIBINTL = no && test $GLIBC2 = yes && test "$enable_shared" = yes])
 
 dnl Checks for header files, functions and declarations.
 gl_INIT

diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index 623fde4fc40a27faafe36035e59c0a379c7f6437..7c9011906a4bab6cafd1faf8ba980591f72c8efe 100644 (file)
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -123,11 +123,6 @@ dnl Checks for libraries.
 dnl These are the only lines required to internationalize the package.
 dnl (OK, not quite, the AC_CONFIG_FILES has also some parts.)
 AM_GNU_GETTEXT([use-libtool], [need-ngettext], [\${top_builddir}/../gettext-runtime/intl])
-dnl Conditionals for referencing the ../gettext-runtime/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])
 
 dnl This option allows to build gettext-tools without (re)building libtextstyle.
 AC_ARG_WITH([installed-libtextstyle],