m4dir = $(datadir)/aclocal
m4_DATA = gob2.m4
-gob2.m4: $(top_srcdir)/common/m4/gob2.m4
- $(AM_V_GEN) $(SED) 's/DX_PROG_GOB2/GOB2_CHECK/g' \
- $(top_srcdir)/common/m4/gob2.m4 >$@.tmp
+gob2.m4: $(DX_BASEDIR)/m4/gob2.m4 $(DX_BASEDIR)/m4/basename.m4
+ $(AM_V_GEN) :; { \
+ $(SED) -e 's/DX_PROG_GOB2/GOB2_CHECK/g' \
+ -e 's/DX_BASENAME/GOB2_BASENAME/g' \
+ $(DX_BASEDIR)/m4/gob2.m4 && echo && \
+ $(SED) -e 's/DX_/GOB2_/g' -e 's/dx_fn_/gob2_fn_/g' \
+ $(DX_BASEDIR)/m4/basename.m4; \
+ } >$@.tmp
$(AM_V_at) mv -f $@.tmp $@
DISTCLEANFILES += gob2.m4
-EXTRA_DIST += common/m4/gob2.m4
+EXTRA_DIST += $(DX_BASEDIR)/m4/gob2.m4 $(DX_BASEDIR)/m4/basename.m4
git_changelog_start = 2cd951c678998b2b0230c8eb25717ecf0f1dd2db
dist-hook: generate-changelog
$PERL common/scripts/fix-gnulib.pl -o lib/gnulib.mk -i lib/gnulib.mk.in ||
die "Failed to fixup Gnulib makefile fragment."
+# Rewrite if ! ... construts produced by gnulib conditional dependencies
+# as these fail in heirloom-sh.
+sed 's/if ! *\(.*gnulib_enabled[^;]*\); then/if \1; then :; else/' \
+ m4/gnulib-comp.m4 >m4/gnulib-comp.m4.new || exit
+mv -f m4/gnulib-comp.m4.new m4/gnulib-comp.m4 || exit
+
# Punt some automake-generated files so that Gentoo's wrapper script
# doesn't try to detect the automake version in use.
rm -f Makefile.in aclocal.m4
-Subproject commit 1688bad1e5dc89cacf33bc426c92a4abf2bc0647
+Subproject commit aa6ab453c6ff523a4d8538554c068117f2de3aca
cat >configure.ac <<EOF
[m4@&t@_include([$builddir/gob2.m4])]
[m4@&t@_pattern_forbid([^GOB2_])]
+[m4@&t@_pattern_forbid([^DX_])]
[AC_INIT([gob2_check], [0])]
[GOB2_CHECK(]m4_dquote(m4_defn([MYVER]))[)]
GOB2=\`command -v \$GOB2\`