From 2d00ead2e57653b771354a564f9a760c2ce0d18e Mon Sep 17 00:00:00 2001 From: aph Date: Fri, 31 Jan 2014 18:10:18 +0000 Subject: Fix build on OSX/Archlinux and add README - remove SELinux dependency for now - OSX: find libintl.h - OSX: fix compile errors - OSX: use hack around gettext nonsense - fix gettext on ubuntu - work around Arch's lack of -ltermcap - add README.md --- src/ex_docmd.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/ex_docmd.c') diff --git a/src/ex_docmd.c b/src/ex_docmd.c index d3d9c256be..88fe8e1c5d 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -206,8 +206,7 @@ static void ex_X __ARGS((exarg_T *eap)); static void ex_fold __ARGS((exarg_T *eap)); static void ex_foldopen __ARGS((exarg_T *eap)); static void ex_folddo __ARGS((exarg_T *eap)); -#if !((defined(HAVE_LOCALE_H) || defined(X_LOCALE)) \ - && (defined(FEAT_GETTEXT) || defined(FEAT_MBYTE))) +#ifndef HAVE_WORKING_LIBINTL # define ex_language ex_ni #endif # define ex_sign ex_ni @@ -3161,8 +3160,7 @@ char_u *buff; /* buffer for command string */ xp->xp_pattern = arg; break; -#if (defined(HAVE_LOCALE_H) || defined(X_LOCALE)) \ - && (defined(FEAT_GETTEXT) || defined(FEAT_MBYTE)) +#ifdef HAVE_WORKING_LIBINTL case CMD_language: p = skiptowhite(arg); if (*p == NUL) { @@ -4452,8 +4450,7 @@ static struct { {EXPAND_HELP, "help"}, {EXPAND_HIGHLIGHT, "highlight"}, {EXPAND_HISTORY, "history"}, -#if (defined(HAVE_LOCALE_H) || defined(X_LOCALE)) \ - && (defined(FEAT_GETTEXT) || defined(FEAT_MBYTE)) +#ifdef HAVE_WORKING_LIBINTL {EXPAND_LOCALES, "locale"}, #endif {EXPAND_MAPPINGS, "mapping"}, -- cgit