build: Build and install libtextstyle.

* autogen.sh: Recurse into libtextstyle directory.
* configure.ac: Likewise.
* Makefile.am (SUBDIRS): Add libtextstyle.
* DEPENDENCIES: Mention that libiconv and ncurses are also used by libtextstyle.
* PACKAGING: Recommend to ship libtextstyle as a third binary package.
* NEWS: Mention that libtextstyle is installed.
This commit is contained in:
Bruno Haible 2019-04-02 17:52:20 +02:00
parent 1ed481e88f
commit 283418cdf9
7 changed files with 49 additions and 15 deletions

View File

@ -10,9 +10,9 @@ We assume that the following environment variables are set:
** Update 'gnulib' git submodule:
git submodule foreach git pull origin master
./gitsub.sh upgrade
git add gnulib
git commit -m 'Update gnulib'
git commit -m 'Update to newest gnulib'
** Run these commands, in this order:

View File

@ -7,7 +7,8 @@ The following packages should be installed before GNU gettext is installed
- MacOS X 10.3 or newer, or
- NetBSD 3.0 or newer.
But highly recommended on all other systems.
Needed for character set conversion of PO files from/to Unicode.
Needed for character set conversion of PO files from/to Unicode
and for the iconv_ostream class of libtextstyle.
+ Homepage:
https://www.gnu.org/software/libiconv/
+ Download:
@ -18,7 +19,8 @@ The following packages should be installed before GNU gettext is installed
* GNU ncurses (preferred)
or libtermcap (discouraged) or a curses library (legacy).
+ Highly recommended.
Needed for the --color option of the 'msgcat' program.
Needed for styling of terminal output (libtextstyle and the --color
option of the 'msgcat' program).
+ Homepage:
https://www.gnu.org/software/ncurses/
+ Download:

View File

@ -1,5 +1,5 @@
## Makefile for the toplevel directory of GNU gettext
## Copyright (C) 1995-2018 Free Software Foundation, Inc.
## Copyright (C) 1995-2019 Free Software Foundation, Inc.
##
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@ -19,7 +19,7 @@
AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = gnulib-local gettext-runtime gettext-tools
SUBDIRS = gnulib-local gettext-runtime libtextstyle gettext-tools
changelog_etc = \
gettext-runtime/ChangeLog.0 \

6
NEWS
View File

@ -59,6 +59,12 @@
compliant. There is no conflict any more between these replacements
and other possible replacements provided by gnulib or mingw.
* Libtextstyle:
- This package installs a new library 'libtextstyle', together with a new
header file <textstyle.h>. It is a library for styling text output sent
to a console or terminal emulator.
Packagers: please see the suggested packaging hints in the file PACKAGING.
Version 0.19.8 - June 2016
* Support for reproducible builds:

View File

@ -3,12 +3,17 @@ Packaging hints for binary package distributors
Although the source of the gettext package comes as a single package,
I recommend that in distributions of binary packages the installed files
be split into two packages:
be split into three packages:
gettext-runtime
Contents: Runtime libraries and programs.
Audience: Anyone who wants to run internationalized programs.
libtextstyle
Contents: Text styling library.
Audience: Anyone who wants to run or develop programs that produce
styled text, to be displayed in a terminal emulator.
gettext-tools
Contents: Tools and documentation for developers and translators.
Audience: Anyone who wants to develop or localize internationalized
@ -27,6 +32,13 @@ The 'gettext-runtime' binary package can be installed by doing
make
make install
The 'libtextstyle' binary package can be installed by doing
cd libtextstyle
./configure
make
make install
The 'gettext-tools' binary package can be installed by doing
cd gettext-tools
@ -34,15 +46,15 @@ The 'gettext-tools' binary package can be installed by doing
make
make install
If you want to install both at the same time, you simply do at the toplevel
directory:
If you want to install all three at the same time, you simply do at the
top-level directory:
./configure
make
make install
The precise split between gettext and gettext-tools is according to the
following file list.
The precise split between gettext-runtime, libtextstyle, and gettext-tools
is according to the following file list.
gettext-runtime
@ -77,6 +89,14 @@ following file list.
$prefix/share/doc/libasprintf/autosprintf*.html
$prefix/share/info/autosprintf.info
libtextstyle
$prefix/lib/libtextstyle.*
$prefix/include/textstyle.h
$prefix/include/textstyle/*
$prefix/share/doc/libtextstyle/libtextstyle*.html
$prefix/share/info/libtextstyle.info
gettext-tools
Everything else, i.e. currently:

View File

@ -36,10 +36,11 @@
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
skip_gnulib=false
skip_gnulib_option=
while :; do
case "$1" in
--skip-gnulib) skip_gnulib=true; shift;;
--skip-gnulib) skip_gnulib=true; skip_gnulib_option='--skip-gnulib'; shift;;
*) break ;;
esac
done
@ -412,6 +413,11 @@ aclocal -I m4 -I ../m4 -I gnulib-m4 \
|| exit $?
cd "$dir0"
echo "$0: generating files in libtextstyle..."
cd libtextstyle
./autogen.sh $skip_gnulib_option || exit $?
cd "$dir0"
echo "$0: generating configure in gettext-tools/examples..."
cd gettext-tools/examples
aclocal -I ../../gettext-runtime/m4 -I ../../m4 \

View File

@ -1,5 +1,5 @@
dnl Configuration for the toplevel directory of GNU gettext
dnl Copyright (C) 1995-2018 Free Software Foundation, Inc.
dnl Copyright (C) 1995-2019 Free Software Foundation, Inc.
dnl
dnl This program is free software: you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
@ -37,7 +37,7 @@ dnl Checks for typedefs, structures, and compiler characteristics.
dnl Checks for library functions.
AC_CONFIG_SUBDIRS([gettext-runtime gettext-tools])
AC_CONFIG_SUBDIRS([gettext-runtime libtextstyle gettext-tools])
AM_EXTRA_RECURSIVE_TARGETS([maintainer-update-po])
@ -49,7 +49,7 @@ AC_CANONICAL_HOST
dnl Optional Features: AC_ARG_ENABLE calls
dnl Optional Packages: AC_ARG_WITH calls
dnl Some influential environment variables: AC_ARG_VAR calls
esyscmd([{ cd gettext-runtime && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; cd gettext-tools && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; } | sed -f build-aux/ac-help.sed ])
esyscmd([{ cd gettext-runtime && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; cd libtextstyle && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; cd gettext-tools && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; } | sed -f build-aux/ac-help.sed ])
AC_CONFIG_FILES([Makefile])