From c92f4a0053986f2bcd7c68b0936e77edf2506bfd Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 9 Nov 2004 19:13:41 +0000 Subject: [PATCH] add tagging conventions and fix configure for gettext 0.14 Patches applied: * bonzini@gnu.org--2004b/sed--stable--4.1--patch-15 add tagging conventions and fix configure for gettext 0.14 git-archimport-id: bonzini@gnu.org--2004b/sed--ssed--3.61--patch-9 --- configure.ac | 12 +++++++++--- pcre/Makefile.am | 2 +- po/LINGUAS | 1 + 3 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 po/LINGUAS diff --git a/configure.ac b/configure.ac index 61f60cc..c9dae4f 100644 --- a/configure.ac +++ b/configure.ac @@ -106,9 +106,15 @@ AM_CONDITIONAL(MAKEINFO_HTML, test "x$enable_html" = xmakeinfo) AM_CONDITIONAL(TEXI2HTML_HTML, test "x$enable_html" = xtexi2html) -ALL_LINGUAS="af ca cs da de el eo es et fi fr ga gl he hr hu id it ja ko nl pl pt_BR ro ru sk sl sr sv tr zh_CN" -AM_GNU_GETTEXT_VERSION(0.11) -AM_GNU_GETTEXT(, need-ngettext) +AC_DEFUN([AM_MKINSTALLDIRS], [MKINSTALLDIRS="$mkdir_p" AC_SUBST(MKINSTALLDIRS)]) +AM_GNU_GETTEXT_VERSION(0.14) +AM_GNU_GETTEXT(no-libtool, need-ngettext, ../intl) +AC_CONFIG_COMMANDS([gettext-fix], [ + sed -e 's/^mkinstalldirs *=.*/mkinstalldirs=$(MKINSTALLDIRS)/' \ + -e 's/$(DOMAIN)/'$PACKAGE'/g' \ + -e 's/$(XGETTEXT_OPTIONS)/-k_ -kN_/g' \ + -e 's/$(top_builddir)/../g' po/Makefile > po/Makefile.tmp + mv po/Makefile.tmp po/Makefile], [PACKAGE=$PACKAGE]) AC_CONFIG_FILES([bootstrap.sh], chmod +x bootstrap.sh) AC_CONFIG_FILES([Makefile doc/Makefile \ diff --git a/pcre/Makefile.am b/pcre/Makefile.am index 0e83e32..3cbcb95 100644 --- a/pcre/Makefile.am +++ b/pcre/Makefile.am @@ -10,7 +10,7 @@ libpcre_a_SOURCES = regtables.c regsub.c regstudy.c regposix.c regperl.c \ reginfo.c regexec.c regexp.c regdebug.c INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/intl -I$(top_srcdir)/pcre \ - -I$(top_srcdir) + -I$(top_srcdir) -I$(top_builddir)/intl pcregrep_SOURCES = pcregrep.c pcregrep_LDADD = libpcre.a diff --git a/po/LINGUAS b/po/LINGUAS new file mode 100644 index 0000000..cb92b48 --- /dev/null +++ b/po/LINGUAS @@ -0,0 +1 @@ +af ca cs da de el eo es et fi fr ga gl he hr hu id it ja ko nl pl pt_BR ro ru sk sl sr sv tr zh_CN