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
This commit is contained in:
Paolo Bonzini committed 2008-01-09 16:13:51 +01:00
1 parent a2b389051b
commit c92f4a0053
3 files changed
+11 -4

No files matched your search

+9 -3
View File
@@ -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 \
+1 -1
View File
@@ -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
+1
View File
@@ -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