From: Bruno Haible Date: Wed, 15 Dec 2021 20:49:41 +0000 (+0100) Subject: automake-subdir support: Look for 'subdir-objects' also in configure.ac. X-Git-Tag: v1.0~2520 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=b8124d982f454b8526b5e11934a2f71faac2b600;p=gnulib.git 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. --- diff --git a/ChangeLog b/ChangeLog index 5048863fa7..dafd27b663 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2021-12-15 Bruno Haible + + 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. + 2021-12-15 Bruno Haible Add simple examples. diff --git a/gnulib-tool b/gnulib-tool index 70ea17a4cb..0d2b7e6353 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -1594,7 +1594,6 @@ func_determine_path_separator # "autoconf --trace=AC_PREREQ" fails with an error message like this: # m4: aclocal.m4:851: Cannot open m4/absolute-header.m4: No such file or directory # autom4te: m4 failed with exit status: 1 - prereqs= my_sed_traces=' s,#.*$,, s,^dnl .*$,, @@ -1621,10 +1620,25 @@ func_determine_path_separator # Determine whether --automake-subdir is supported. if $automake_subdir; then found_subdir_objects=false + if test -n "$configure_ac"; then + my_sed_traces=' + s,#.*$,, + s,^dnl .*$,, + s, dnl .*$,, + /AM_INIT_AUTOMAKE/ { + s,^.*AM_INIT_AUTOMAKE([[ ]*\([^])]*\).*$,\1,p + }' + automake_options=`sed -n -e "$my_sed_traces" < "$configure_ac"` + for option in $automake_options; do + case "$option" in + subdir-objects ) found_subdir_objects=true ;; + esac + done + fi if test -f "${destdir:-.}"/Makefile.am; then automake_options=`sed -n -e 's/^AUTOMAKE_OPTIONS[ ]*=\(.*\)$/\1/p' "${destdir:-.}"/Makefile.am` - for arg in $automake_options; do - case "$arg" in + for option in $automake_options; do + case "$option" in subdir-objects ) found_subdir_objects=true ;; esac done