From: KO Myung-Hun <komh78@gmail.com>
Date: Sun, 8 Nov 2015 05:57:59 +0000 (+0900)
Subject: build: Do not include os2compat.[ch]
X-Git-Tag: v0.19.7~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f2223058e136a9396b9b53eb094897a398b7fa6;p=thirdparty%2Fgettext.git

build: Do not include os2compat.[ch]

kLIBC does not need os2compat.[ch]
* gettext-runtime/configure.ac (AH_BOTTOM): Do not include
intl/os2compat.h on kLIBC.
* gettext-runtime/intl/osdep.c: Do not include os2compat.c on kLIBC.
* gettext-tools/configure.ac (AH_BOTTOM): Do not include
intl/os2compat.h on kLIBC.

Copyright-paperwork-exempt: yes
---

diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac
index e9299b63f..77e954b7c 100644
--- a/gettext-runtime/configure.ac
+++ b/gettext-runtime/configure.ac
@@ -102,7 +102,7 @@ AH_BOTTOM([
 #endif
 
 /* Extra OS/2 (emx+gcc) defines.  */
-#ifdef __EMX__
+#if defined __EMX__ && !defined __KLIBC__
 # include "intl/os2compat.h"
 #endif
 ])
diff --git a/gettext-runtime/intl/osdep.c b/gettext-runtime/intl/osdep.c
index 25f8dfac4..eda9d28ec 100644
--- a/gettext-runtime/intl/osdep.c
+++ b/gettext-runtime/intl/osdep.c
@@ -16,7 +16,7 @@
 
 #if defined __CYGWIN__ || defined __MINGW32__
 # include "intl-exports.c"
-#elif defined __EMX__
+#elif defined __EMX__ && !defined __KLIBC__
 # include "os2compat.c"
 #else
 /* Avoid AIX compiler warning.  */
diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index dba0775ce..d5e612a23 100644
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -286,7 +286,7 @@ AH_BOTTOM([
 #endif
 
 /* Extra OS/2 (emx+gcc) defines.  */
-#ifdef __EMX__
+#if defined __EMX__ && !defined __KLIBC__
 # include "intl/os2compat.h"
 #endif
 ])