Date: Tue, 24 Jun 2008 09:33:27 GMT From: Gabor Kovesdan <gabor@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 144017 for review Message-ID: <200806240933.m5O9XRXi039443@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=144017 Change 144017 by gabor@gabor_server on 2008/06/24 09:32:58 - Complete NLS support: - Add Makefile glue - It can be disabled now with WITHOUT_NLS Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/Makefile#5 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#40 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#22 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/Makefile#5 (text+ko) ==== @@ -20,4 +20,14 @@ LDADD= -lz -lbz2 DPADD= ${LIBZ} ${LIBBZ2} +.if !defined(WITHOUT_NLS) +NLS= hu_HU.ISO8859-2 +NLSSRCFILES= ${NLS:S@$@.msg@} +.for lang in ${NLS} +NLSSRCDIR_${lang}= ${.CURDIR}/nls +.endfor +.else +CFLAGS+= -DWITHOUT_NLS +.endif + .include <bsd.prog.mk> ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#40 (text+ko) ==== @@ -44,7 +44,6 @@ #include <errno.h> #include <getopt.h> #include <locale.h> -#include <nl_types.h> #include <regex.h> #include <stdio.h> #include <stdlib.h> @@ -54,6 +53,10 @@ #include "grep.h" #ifndef WITHOUT_NLS +#include <nl_types.h> +nl_catd catalog; +#endif + char *errstr[] = { "", /* 1*/ "(standard input)", @@ -71,9 +74,6 @@ /*12*/ "Value out of range" }; -nl_catd catalog; -#endif - /* Flags passed to regcomp() and regexec() */ int cflags; int eflags = REG_STARTEND; ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#22 (text+ko) ====
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200806240933.m5O9XRXi039443>