texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: Attempt at separate directory for non-gnulib m4 f


From: Gavin D. Smith
Subject: branch master updated: Attempt at separate directory for non-gnulib m4 files
Date: Sat, 19 Oct 2024 10:53:04 -0400

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 3f20268f06 Attempt at separate directory for non-gnulib m4 files
3f20268f06 is described below

commit 3f20268f0631650f06d51a4f341d42ac99c248ce
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sat Oct 19 15:44:46 2024 +0100

    Attempt at separate directory for non-gnulib m4 files
    
    * tp/Texinfo/XS/configure.ac (AC_CONFIG_MACRO_DIRS):
    Add 'm4' as a directory as well as 'gnulib/m4'.
    * tp/Texinfo/XS/Makefile.am (ACLOCAL_AMFLAGS): Add '-I m4'.
    
    This means files from libtoolize and gettextize should be
    copied under tp/Texinfo/XS/m4, not tp/Texinfo/XS/gnulib/m4.
---
 .gitignore                 | 10 +++++-----
 ChangeLog                  | 11 +++++++++++
 tp/Texinfo/XS/Makefile.am  |  2 +-
 tp/Texinfo/XS/configure.ac |  2 +-
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 25fea049be..9e5ddc65b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -120,11 +120,11 @@ tp/Texinfo/XS/gnulib/lib/wctype.h
 
 tp/Texinfo/XS/gnulib/lib/uniconv/*.lo
 
-tp/Texinfo/XS/gnulib/m4/libtool.m4
-tp/Texinfo/XS/gnulib/m4/ltoptions.m4
-tp/Texinfo/XS/gnulib/m4/ltsugar.m4
-tp/Texinfo/XS/gnulib/m4/ltversion.m4
-tp/Texinfo/XS/gnulib/m4/lt~obsolete.m4
+tp/Texinfo/XS/m4/libtool.m4
+tp/Texinfo/XS/m4/ltoptions.m4
+tp/Texinfo/XS/m4/ltsugar.m4
+tp/Texinfo/XS/m4/ltversion.m4
+tp/Texinfo/XS/m4/lt~obsolete.m4
 
 tp/Texinfo/XS/gnulib/po/*.gmo
 tp/Texinfo/XS/gnulib/po/POTFILES
diff --git a/ChangeLog b/ChangeLog
index c18e57bd0a..626bc76227 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2024-10-19  Gavin Smith <gavinsmith0123@gmail.com>
+
+       Attempt at separate directory for non-gnulib m4 files
+
+       * tp/Texinfo/XS/configure.ac (AC_CONFIG_MACRO_DIRS):
+       Add 'm4' as a directory as well as 'gnulib/m4'.
+       * tp/Texinfo/XS/Makefile.am (ACLOCAL_AMFLAGS): Add '-I m4'.
+
+       This means files from libtoolize and gettextize should be
+       copied under tp/Texinfo/XS/m4, not tp/Texinfo/XS/gnulib/m4.
+
 2024-10-19  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/main/utils.c (messages_and_encodings_setup): rename
diff --git a/tp/Texinfo/XS/Makefile.am b/tp/Texinfo/XS/Makefile.am
index 895a301b61..7c654d4669 100644
--- a/tp/Texinfo/XS/Makefile.am
+++ b/tp/Texinfo/XS/Makefile.am
@@ -25,7 +25,7 @@ AM_CPPFLAGS = -I$(srcdir)
 GNULIB_CPPFLAGS = -I$(srcdir)/gnulib/lib \
   -I$(builddir)/gnulib/lib
 
-ACLOCAL_AMFLAGS = -I gnulib/m4
+ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4
 
 SUBDIRS=gnulib/lib gnulib/po
 
diff --git a/tp/Texinfo/XS/configure.ac b/tp/Texinfo/XS/configure.ac
index 29812191f5..780dc3e5a0 100644
--- a/tp/Texinfo/XS/configure.ac
+++ b/tp/Texinfo/XS/configure.ac
@@ -13,7 +13,7 @@
 AC_INIT([GNU Texinfo], [7.1.90])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE
-AC_CONFIG_MACRO_DIR([gnulib/m4])
+AC_CONFIG_MACRO_DIRS([m4 gnulib/m4])
 
 CONVERTER=texi2any
 AC_SUBST([CONVERTER])



reply via email to

[Prev in Thread] Current Thread [Next in Thread]