+2024-03-11 Collin Funk <collin.funk1@gmail.com>
+
+ gnulib-tool.py: Follow gnulib-tool changes, part 52.
+ Follow gnulib-tool change
+ 2021-12-15 Bruno Haible <bruno@clisp.org>
+ automake-subdir support: Look for 'subdir-objects' also in configure.ac.
+ * pygnulib/GLImport.py (GLImport.__init__): Check for 'subdir-objects'
+ in the AM_INIT_AUTOMAKE macro of configure.ac.
+
2024-03-10 Bruno Haible <bruno@clisp.org>
gnulib-tool.py: Tweak last commit.
--------------------------------------------------------------------------------
-commit b8124d982f454b8526b5e11934a2f71faac2b600
-Author: Bruno Haible <bruno@clisp.org>
-Date: Wed Dec 15 21:49:41 2021 +0100
-
- automake-subdir support: Look for 'subdir-objects' also in configure.ac.
-
- * gnulib-tool: Look for the automake options also in the first argument
- of the AM_INIT_AUTOMAKE invocation in configure.ac.
-
---------------------------------------------------------------------------------
-
commit 4b071c115309079528db7b60e8d2ffb22b129088
Author: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon Apr 26 23:31:29 2021 -0700
# Determine whether --automake-subdir is supported.
if self.config['automake_subdir']:
- found_subdir_objects = False
+ automake_options = set()
+ if self.config['destdir']:
+ pattern = re.compile(r'^.*AM_INIT_AUTOMAKE\([\[ ]*([^\]\)]*).*$', re.MULTILINE)
+ with open(self.config['configure_ac'], encoding='utf-8') as file:
+ data = file.read()
+ configure_ac_automake_options = pattern.findall(data)
+ if configure_ac_automake_options:
+ automake_options = { x
+ for y in configure_ac_automake_options
+ for x in y.split() }
+ found_subdir_objects = 'subdir-objects' in automake_options
if self.config['destdir']:
base = self.config['destdir']
else:
base = '.'
- if isfile(joinpath(base, 'Makefile.am')):
+ if not found_subdir_objects and isfile(joinpath(base, 'Makefile.am')):
pattern = re.compile(r'^AUTOMAKE_OPTIONS[\t ]*=(.*)$', re.MULTILINE)
with open(joinpath(base, 'Makefile.am'), encoding='utf-8') as file:
data = file.read()