summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2001-01-15 14:59:52 +0000
committerBruno Haible <bruno@clisp.org>2001-01-15 14:59:52 +0000
commite0560b43903ad644e19cff68c3b744a39d891613 (patch)
tree06626d434c05c2100b54330c3c6b6ff82926b803 /src
parent4d48f86a3ab0114dce08c731553f90727f7dde03 (diff)
downloadexternal_gettext-e0560b43903ad644e19cff68c3b744a39d891613.zip
external_gettext-e0560b43903ad644e19cff68c3b744a39d891613.tar.gz
external_gettext-e0560b43903ad644e19cff68c3b744a39d891613.tar.bz2
Portability fixes for K&R C compilers, SunOS "make" and others.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog9
-rw-r--r--src/Makefile.am6
-rw-r--r--src/po-lex.c4
3 files changed, 14 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d061b04..1e81e11 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2001-01-05 Bruno Haible <haible@clisp.cons.org>
+
+ * Makefile.am (po-gram-gen.h): Don't use $^, not supported by the
+ SUSV2 "make" specification.
+ (LDADD): Add @INTLLIBS@. Needed on Solaris without
+ --with-included-gettext.
+ * po-lex.c (gram_max_allowed_errors): Change type to
+ 'unsigned int'.
+
2001-01-01 Bruno Haible <haible@clisp.cons.org>
Implement plural form handling.
diff --git a/src/Makefile.am b/src/Makefile.am
index 2cdf093..3ad74f5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
## Makefile for program src directory in GNU NLS utilities package.
-## Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
+## Copyright (C) 1995-1998, 2000, 2001 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
@@ -34,7 +34,7 @@ l = @l@
INCLUDES = -I. -I$(srcdir) -I.. -I$(top_srcdir)/lib -I../intl \
-I$(top_srcdir)/intl
DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
-LDADD = ../lib/libnlsut.a ../intl/libintl.$la
+LDADD = ../lib/libnlsut.a @INTLLIBS@ ../intl/libintl.$la
SED = sed
YACC = @YACC@ -d
@@ -57,7 +57,7 @@ BUILT_SOURCES = po-gram-gen.c po-hash-gen.c po-gram-gen.h po-hash-gen.h
po-lex.o: po-gram-gen2.h
po-gram-gen2.h: po-gram-gen.h
- $(SED) 's/[yY][yY]/po_gram_/g' $^ > $@-tmp
+ $(SED) 's/[yY][yY]/po_gram_/g' $(srcdir)/po-gram-gen.h > $@-tmp
mv $@-tmp $@
DISTCLEANFILES = po-gram-gen2.h
diff --git a/src/po-lex.c b/src/po-lex.c
index a3474b9..83f0cdd 100644
--- a/src/po-lex.c
+++ b/src/po-lex.c
@@ -1,5 +1,5 @@
/* GNU gettext - internationalization aids
- Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
This file was written by Peter Miller <millerp@canb.auug.org.au>
@@ -58,7 +58,7 @@
static FILE *fp;
lex_pos_ty gram_pos;
-size_t gram_max_allowed_errors = 20;
+unsigned int gram_max_allowed_errors = 20;
static int pass_comments = 0;
static int pass_obsolete_entries = 0;