* [PATCH] cpufrequtils: make NLS optional
@ 2011-08-14 3:02 Matt Turner
2011-08-15 18:02 ` Dominik Brodowski
0 siblings, 1 reply; 2+ messages in thread
From: Matt Turner @ 2011-08-14 3:02 UTC (permalink / raw)
To: Dominik Brodowski; +Cc: cpufreq, Sergey Dryabzhinsky, Matt Turner
From: Sergey Dryabzhinsky <sergey.dryabzhinsky@gmail.com>
https://bugs.gentoo.org/205576
Signed-off-by: Matt Turner <mattst88@gmail.com>
---
Makefile | 1 +
utils/info.c | 10 +++++++++-
utils/set.c | 10 +++++++++-
3 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index ed6bdde..84f265d 100644
--- a/Makefile
+++ b/Makefile
@@ -121,6 +121,7 @@ CFLAGS += -pipe
ifeq ($(strip $(NLS)),true)
INSTALL_NLS += install-gmo
COMPILE_NLS += update-gmo
+ CPPFLAGS += -DNLS
endif
ifeq ($(strip $(CPUFRQ_BENCH)),true)
diff --git a/utils/info.c b/utils/info.c
index 38d906a..155e604 100644
--- a/utils/info.c
+++ b/utils/info.c
@@ -10,7 +10,6 @@
#include <errno.h>
#include <stdlib.h>
#include <string.h>
-#include <libintl.h>
#include <locale.h>
#include <getopt.h>
@@ -18,9 +17,18 @@
#include "cpufreq.h"
+#ifdef NLS
+#include <libintl.h>
#define _(String) gettext (String)
#define gettext_noop(String) String
#define N_(String) gettext_noop (String)
+#else
+#define gettext_noop(String) String
+#define _(String) gettext_noop (String)
+#define gettext(String) gettext_noop (String)
+#define N_(String) gettext_noop (String)
+#define textdomain(String)
+#endif
#define LINE_LEN 10
diff --git a/utils/set.c b/utils/set.c
index 2ece47e..bfca465 100644
--- a/utils/set.c
+++ b/utils/set.c
@@ -12,16 +12,24 @@
#include <limits.h>
#include <string.h>
#include <ctype.h>
-#include <libintl.h>
#include <locale.h>
#include <getopt.h>
#include "cpufreq.h"
+#ifdef NLS
+#include <libintl.h>
#define _(String) gettext(String)
#define gettext_noop(String) String
#define N_(String) gettext_noop(String)
+#else
+#define gettext_noop(String) String
+#define _(String) gettext_noop (String)
+#define gettext(String) gettext_noop (String)
+#define N_(String) gettext_noop (String)
+#define textdomain(String)
+#endif
#define NORM_FREQ_LEN 32
--
1.7.3.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] cpufrequtils: make NLS optional
2011-08-14 3:02 [PATCH] cpufrequtils: make NLS optional Matt Turner
@ 2011-08-15 18:02 ` Dominik Brodowski
0 siblings, 0 replies; 2+ messages in thread
From: Dominik Brodowski @ 2011-08-15 18:02 UTC (permalink / raw)
To: Matt Turner; +Cc: cpufreq, Sergey Dryabzhinsky
On Sat, Aug 13, 2011 at 11:02:20PM -0400, Matt Turner wrote:
> From: Sergey Dryabzhinsky <sergey.dryabzhinsky@gmail.com>
>
> https://bugs.gentoo.org/205576
>
> Signed-off-by: Matt Turner <mattst88@gmail.com>
Applied, thanks.
Best,
Dominik
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-08-15 18:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-14 3:02 [PATCH] cpufrequtils: make NLS optional Matt Turner
2011-08-15 18:02 ` Dominik Brodowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox