From: Bruno Haible <bruno@clisp.org>
Date: Thu, 26 Sep 2024 00:34:22 +0000 (+0200)
Subject: gettext.m4: Simplify after gnulib changed.
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=8a628932c96a67ce3ad6f0de2c66cba915874f18;p=thirdparty%2Fgettext.git

gettext.m4: Simplify after gnulib changed.

* gettext-runtime/m4/gettext.m4 (AM_GNU_GETTEXT): Invoke
gl_BUILD_TO_HOST_LOCALEDIR.
---

diff --git a/gettext-runtime/m4/gettext.m4 b/gettext-runtime/m4/gettext.m4
index 8cd3890b2..c8580c95f 100644
--- a/gettext-runtime/m4/gettext.m4
+++ b/gettext-runtime/m4/gettext.m4
@@ -1,5 +1,5 @@
 # gettext.m4
-# serial 79 (gettext-0.23)
+# serial 80 (gettext-0.23)
 dnl Copyright (C) 1995-2014, 2016, 2018-2024 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -365,21 +365,7 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
   AC_SUBST([POSUB])
 
   dnl Define localedir_c and localedir_c_make.
-  dnl Find the final value of localedir.
-  gt_saved_prefix="${prefix}"
-  gt_saved_datarootdir="${datarootdir}"
-  gt_saved_localedir="${localedir}"
-  dnl Unfortunately, prefix gets only finally determined at the end of
-  dnl configure.
-  if test "X$prefix" = "XNONE"; then
-    prefix="$ac_default_prefix"
-  fi
-  eval datarootdir="$datarootdir"
-  eval localedir="$localedir"
-  gl_BUILD_TO_HOST([localedir])
-  localedir="${gt_saved_localedir}"
-  datarootdir="${gt_saved_datarootdir}"
-  prefix="${gt_saved_prefix}"
+  gl_BUILD_TO_HOST_LOCALEDIR
 ])