diff options
| author | Bruno Haible <bruno@clisp.org> | 2021-06-20 03:42:04 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2021-06-20 03:42:04 +0200 |
| commit | 3839ab211be840d732524cf95a8024fcc73a333e (patch) | |
| tree | b62c1c606a7723026d75ba21b3aa009d2f5ea97a | |
| parent | 4f8bcc586be07e34a078f61dc392139d469b0dc6 (diff) | |
| download | gettext-3839ab211be840d732524cf95a8024fcc73a333e.tar.gz | |
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.
| -rw-r--r-- | PACKAGING | 3 | ||||
| -rw-r--r-- | gettext-runtime/configure.ac | 3 | ||||
| -rw-r--r-- | gettext-tools/configure.ac | 5 |
3 files changed, 4 insertions, 7 deletions
@@ -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 2b0afc627..c53147187 100644 --- 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 623fde4fc..7c9011906 100644 --- 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], |