From: Bruno Haible <bruno@clisp.org>
Date: Mon, 19 Jun 2023 10:12:57 +0000 (+0200)
Subject: build: Move a .m4 file to where it belongs.
X-Git-Tag: v0.23~427
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c94a3207dc0b1d21c83fa0609ef29ac75a75d306;p=thirdparty%2Fgettext.git

build: Move a .m4 file to where it belongs.

* autogen.sh: Pass '-I m4' when generating gettext-runtime/intl/configure.
* gettext-runtime/intl/m4/intdiv0.m4: Moved here from
gettext-runtime/m4/intdiv0.m4.
* gettext-runtime/intl/Makefile.am (ACLOCAL_AMFLAGS): Add '-I m4'.
(EXTRA_DIST): Add m4/intdiv0.m4.
* gettext-runtime/m4/Makefile.am (EXTRA_DIST): Remove intdiv0.m4.
---

diff --git a/autogen.sh b/autogen.sh
index 462a6b207..b9ddc7e11 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -424,7 +424,7 @@ dir0=`pwd`
 
 echo "$0: generating configure in gettext-runtime/intl..."
 cd gettext-runtime/intl
-aclocal -I ../../m4 -I ../m4 -I gnulib-m4 \
+aclocal -I ../../m4 -I ../m4 -I m4 -I gnulib-m4 \
   && autoconf \
   && autoheader && touch config.h.in \
   && touch ChangeLog \
diff --git a/gettext-runtime/intl/Makefile.am b/gettext-runtime/intl/Makefile.am
index f6d8f547b..1694815cd 100644
--- a/gettext-runtime/intl/Makefile.am
+++ b/gettext-runtime/intl/Makefile.am
@@ -18,11 +18,12 @@
 ## Process this file with automake to produce Makefile.in.
 
 AUTOMAKE_OPTIONS = 1.10 gnu no-dependencies
-ACLOCAL_AMFLAGS = -I ../../m4 -I ../m4 -I gnulib-m4
+ACLOCAL_AMFLAGS = -I ../../m4 -I ../m4 -I m4 -I gnulib-m4
 
 SUBDIRS = gnulib-lib
 
-EXTRA_DIST =
+EXTRA_DIST = \
+  m4/intdiv0.m4
 BUILT_SOURCES =
 MOSTLYCLEANFILES = core *.stackdump
 CLEANFILES =
diff --git a/gettext-runtime/m4/intdiv0.m4 b/gettext-runtime/intl/m4/intdiv0.m4
similarity index 100%
rename from gettext-runtime/m4/intdiv0.m4
rename to gettext-runtime/intl/m4/intdiv0.m4
diff --git a/gettext-runtime/m4/Makefile.am b/gettext-runtime/m4/Makefile.am
index 0a3cc602a..cfe7b5574 100644
--- a/gettext-runtime/m4/Makefile.am
+++ b/gettext-runtime/m4/Makefile.am
@@ -23,7 +23,6 @@ build-to-host.m4 \
 gettext.m4 \
 glibc2.m4 \
 iconv.m4 \
-intdiv0.m4 \
 intlmacosx.m4 \
 nls.m4 \
 po.m4 \