From: Ralf Corsépius Date: Mon, 17 Sep 2007 02:11:39 +0000 (+0200) Subject: Add if defined(ENABLE_NLS) guards around i18n-initialization. X-Git-Tag: rpm-4.6.0-rc1~1850 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=05088ee6db16aba98ca305eb034bb90be7348fca;p=platform%2Fupstream%2Frpm.git Add if defined(ENABLE_NLS) guards around i18n-initialization. --- diff --git a/lib/poptALL.c b/lib/poptALL.c index 73dd2a4..cd973d8 100644 --- a/lib/poptALL.c +++ b/lib/poptALL.c @@ -332,6 +332,7 @@ rpmcliInit(int argc, char *const argv[], struct poptOption * optionsTable) #if defined(ENABLE_NLS) (void) setlocale(LC_ALL, "" ); + (void) bindtextdomain(PACKAGE, LOCALEDIR); (void) textdomain(PACKAGE); #endif diff --git a/tools/rpminject.c b/tools/rpminject.c index 2ed1e25..1a15774 100644 --- a/tools/rpminject.c +++ b/tools/rpminject.c @@ -464,10 +464,12 @@ main(int argc, char *argv[]) #endif setprogname(argv[0]); /* Retrofit glibc __progname */ +#if defined(ENABLE_NLS) (void)setlocale(LC_ALL, "" ); (void)bindtextdomain(PACKAGE, LOCALEDIR); (void)textdomain(PACKAGE); +#endif optCon = poptGetContext("rpminject", argc, (const char **) argv, diff --git a/tools/rpmsort.c b/tools/rpmsort.c index 9b14da9..9fa3437 100644 --- a/tools/rpmsort.c +++ b/tools/rpmsort.c @@ -286,10 +286,12 @@ main(int argc, const char *argv[]) mtrace(); /* Trace malloc only if MALLOC_TRACE=mtrace-output-file. */ #endif setprogname(argv[0]); /* Retrofit glibc __progname */ +#if defined(ENABLE_NLS) (void)setlocale(LC_ALL, "" ); (void)bindtextdomain(PACKAGE, LOCALEDIR); (void)textdomain(PACKAGE); +#endif _depends_debug = 1;