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 e9299b63f204c0d1b9965feabc6201834e6bfc55..77e954b7c2d15359c7f6e40d6f7aa329c4adb1e3 100644 (file)
--- 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 25f8dfac4beda6da9b239d9f28298ed978d6a440..eda9d28ec55a916ee567284663948e6bbfe0b5bd 100644 (file)
--- 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 dba0775ce2d135f7a1930b053f8d4a3e2aab7519..d5e612a2305e0be2540fdeeb7eb79755591007fc 100644 (file)
--- 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
 ])