From: Bruno Haible <bruno@clisp.org>
Date: Tue, 15 Jun 2021 08:36:08 +0000 (+0200)
Subject: Fix build failure on AIX 7.
X-Git-Tag: v0.21.1~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42faee0e41e808398cb60d9762a6fc7c9148e2ba;p=thirdparty%2Fgettext.git

Fix build failure on AIX 7.

* gettext-runtime/m4/intl.m4 (AM_INTL_SUBDIR): Require gl_LOCALE_H_DEFAULTS
before gt_INTL_THREAD_LOCALE_NAME.
---

diff --git a/gettext-runtime/m4/intl.m4 b/gettext-runtime/m4/intl.m4
index 788bc120a..5e1cb5449 100644
--- a/gettext-runtime/m4/intl.m4
+++ b/gettext-runtime/m4/intl.m4
@@ -1,4 +1,4 @@
-# intl.m4 serial 46 (gettext-0.21.1)
+# intl.m4 serial 47 (gettext-0.21.1)
 dnl Copyright (C) 1995-2014, 2016-2021 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -39,7 +39,12 @@ AC_DEFUN([AM_INTL_SUBDIR],
   AC_REQUIRE([gl_GLIBC21])dnl
   AC_REQUIRE([gl_XSIZE])dnl
   AC_REQUIRE([gl_FCNTL_O_FLAGS])dnl
+
+  dnl Make sure LOCALENAME_ENHANCE_LOCALE_FUNCS gets initialized to 0 before,
+  dnl not after, it has been set to 1 by gt_INTL_THREAD_LOCALE_NAME.
+  AC_REQUIRE([gl_LOCALE_H_DEFAULTS])
   AC_REQUIRE([gt_INTL_THREAD_LOCALE_NAME])
+
   AC_REQUIRE([gt_INTL_MACOSX])dnl
   AC_REQUIRE([gl_EXTERN_INLINE])dnl
   AC_REQUIRE([gt_GL_ATTRIBUTE])dnl