summaryrefslogtreecommitdiff
path: root/navit/country.c
diff options
context:
space:
mode:
authorzaxl <zaxl@ffa7fe5e-494d-0410-b361-a75ebd5db220>2008-10-31 20:12:34 +0000
committerzaxl <zaxl@ffa7fe5e-494d-0410-b361-a75ebd5db220>2008-10-31 20:12:34 +0000
commite0f550b5385fc30e0bc9b4d03dd113a67089fa3b (patch)
tree2e8437b64406ac2033193ac0bb700929859ec15e /navit/country.c
parente0afd5401d16d7fb6c9d09e487f51a0e5beb8639 (diff)
downloadnavit-e0f550b5385fc30e0bc9b4d03dd113a67089fa3b.tar.gz
FIX:build: Make --disable-nls and --with-included-gettext work.
Add navit_nls.h which defines gettext wrappers, please, include navit_nls.h and do not include libintl.h directly. Fix Makefiles.ams to pass make distcheck git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@1624 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/country.c')
-rw-r--r--navit/country.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/navit/country.c b/navit/country.c
index 97cdb9711..729349e6b 100644
--- a/navit/country.c
+++ b/navit/country.c
@@ -21,11 +21,11 @@
#include <stdio.h>
#include <stdlib.h>
#include <glib.h>
-#include <libintl.h>
#include "debug.h"
#include "item.h"
#include "country.h"
#include "search.h"
+#include "navit_nls.h"
struct country {
int id;
@@ -35,10 +35,6 @@ struct country {
char *name;
};
-#define gettext_noop(String) String
-#define _(STRING) gettext(STRING)
-#define _n(STRING) gettext_noop(STRING)
-
static struct country country[]= {
{ 20, "AND", "AD", "AND", /* 020 */ _n("Andorra")},
{784, "UAE", "AE", "ARE", /* 784 */ _n("United Arab Emirates")},