diff options
| author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-07-17 00:56:27 (EDT) |
|---|---|---|
| committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-07-17 00:56:27 (EDT) |
| commit | dd32b60780af568ce2149aad4eecdbe7864f5c67 (patch) | |
| tree | 282df9c947acb2a55f44123b54e85b3089770eca | |
| parent | 6b5ca01869aa11436e7bae37683db2a627ef7504 (diff) | |
gettextize-ize
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rwxr-xr-x | autogen.sh | 10 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | po/.gitignore | 10 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 |
6 files changed, 32 insertions, 3 deletions
@@ -4,7 +4,8 @@ *~ *.orig -# Files generated by aclocal, autoconf, and automake +# Files generated by gettextize, aclocal, autoconf, and automake +/ABOUT-NLS /aclocal.m4 /autom4te.cache/ /configure diff --git a/Makefile.am b/Makefile.am index 3fc2de4..ae13115 100644 --- a/Makefile.am +++ b/Makefile.am @@ -57,6 +57,7 @@ fbcon2png_LDADD = \ $(ASAN_CFLAGS) fbcon2png_LINK = $(LINK) version.c EXTRA_fbcon2png_DEPENDENCIES = version.c +EXTRA_DIST = build-aux/config.rpath CLEANFILES = version.c version.c: $(fbcon2png_OBJECTS) $(fbcon2png_DEPENDENCIES) @@ -64,3 +65,5 @@ version.c: $(fbcon2png_OBJECTS) $(fbcon2png_DEPENDENCIES) "$(PACKAGE_VERSION_GIT)" >version.c include $(top_srcdir)/src/local.mk + +SUBDIRS = . po @@ -2,7 +2,7 @@ # # Script to generate the build system. # -# Copyright (C) 2013 Patrick McDermott +# Copyright (C) 2013, 2019 Patrick McDermott # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright @@ -19,6 +19,14 @@ srcdir="${0%/*}" cat >ChangeLog <<-EOF This file is generated upon release. Run \`git log\` for a list of changes. EOF + # Force gettextize to be non-interactive. Stupid but necessary. + LC_ALL=C expect -f - <<-EOF + spawn gettextize --force --no-changelog + expect "Press Return to acknowledge the previous * paragraphs." + send "\n" + EOF + # This file contains a huge outdated matrix of unrelated packages. + >ABOUT-NLS aclocal autoconf autoheader diff --git a/configure.ac b/configure.ac index f63e1e3..d4986b4 100644 --- a/configure.ac +++ b/configure.ac @@ -28,6 +28,12 @@ AM_SILENT_RULES([yes]) AM_CONDITIONAL([IN_GIT], [test -d "${srcdir}/.git" && command -v git >/dev/null 2>&1]) +GETTEXT_PACKAGE="${PACKAGE}" +AC_SUBST([GETTEXT_PACKAGE]) +AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["${GETTEXT_PACKAGE}"], + [Define the gettext package to be used.]) +AM_GNU_GETTEXT([external]) + AC_PROG_CC() AM_PROG_CC_C_O() @@ -88,6 +94,6 @@ PKG_CHECK_MODULES([LIBPNG], [libpng]) LIBPNG_CFLAGS="$(printf ' %s' "${LIBPNG_CFLAGS}" | \ sed 's/ -I/ -isystem/g;')" -AC_CONFIG_FILES([Makefile]) +AC_CONFIG_FILES([Makefile po/Makefile.in]) AC_CONFIG_HEADERS([config.h]) AC_OUTPUT() diff --git a/po/.gitignore b/po/.gitignore new file mode 100644 index 0000000..ee2ca03 --- /dev/null +++ b/po/.gitignore @@ -0,0 +1,10 @@ +/Makefile.in.in +/Makevars.template +/Rules-quot +/*.sed +/POTFILES +/*.pot +/*.po +/*.mo +/*@boldquot.header +/*@quot.header diff --git a/po/POTFILES.in b/po/POTFILES.in new file mode 100644 index 0000000..e723152 --- /dev/null +++ b/po/POTFILES.in @@ -0,0 +1 @@ +src/main.c |