aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog9
-rw-r--r--Makefile.am22
-rw-r--r--Makefile.in39
-rw-r--r--aclocal.m41
-rw-r--r--awklib/Makefile.in5
-rwxr-xr-xconfigure98
-rw-r--r--configure.ac4
-rw-r--r--doc/Makefile.in5
-rw-r--r--extension/ChangeLog6
-rw-r--r--extension/Makefile.am4
-rw-r--r--extension/Makefile.in26
-rw-r--r--extension/aclocal.m41
-rwxr-xr-xextension/configure657
-rw-r--r--extension/configure.ac5
-rw-r--r--extras/Makefile.in5
-rw-r--r--m4/ChangeLog4
-rw-r--r--m4/triplet-transformation.m4121
-rw-r--r--pc/Makefile.tst51
-rw-r--r--support/ChangeLog4
-rw-r--r--support/Makefile.am4
-rw-r--r--support/Makefile.in10
-rw-r--r--test/Makefile.in5
22 files changed, 872 insertions, 214 deletions
diff --git a/ChangeLog b/ChangeLog
index 659f0ffa..13ed0607 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2020-03-06 Jannick <thirdedition@gmx.net>
+
+ * Makefile.am: Replace AM_MAKEFLAGS with AM_CFLAGS and AM_LDFLAGS.
+ Put pc/Makefile.tst into BUILT_SOURCES, instead of in dist-hook.
+ Add $(srcdir) to rules for the yacc files. Use AM_LDFLAGS in
+ the efence rule.
+ * configure.ac: Use GAWK_CANONICAL_HOST instead of AC_CANONICAL_HOST;
+ this supplies MSYS2 support. Remove use of EXEEXT.
+
2020-03-04 Arnold D. Robbins <arnold@skeeve.com>
* NEWS: Updated.
diff --git a/Makefile.am b/Makefile.am
index 3b55ff3b..71177ffa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,8 +27,8 @@
# correctly after changing configure.ac
ACLOCAL_AMFLAGS = -I m4
-# This insures that make flags get passed down to child makes.
-AM_MAKEFLAGS = 'CFLAGS=$(CFLAGS)' 'LDFLAGS=$(LDFLAGS)'
+AM_CFLAGS = @CFLAGS@
+AM_LDFLAGS = @LDFLAGS@
# Stuff to include in the dist that doesn't need it's own
# Makefile.am files
@@ -77,6 +77,7 @@ SUBDIRS += extras doc awklib po test
# what to make and install
bin_PROGRAMS = gawk
include_HEADERS = gawkapi.h
+BUILT_SOURCES = $(srcdir)/pc/Makefile.tst
# sources for both gawk and dgawk
base_sources = \
@@ -170,8 +171,7 @@ uninstall-recursive: uninstall-links
check-local: gawk$(EXEEXT)
# A little extra clean up when making distributions.
-# And additional set up for the pc directory.
-dist-hook: pc/Makefile.tst
+dist-hook:
cd "$(distdir)"/extension ; rm -f *.o *.so
cd "$(srcdir)"/pc ; \
chmod u+w config.h ; \
@@ -185,22 +185,22 @@ dist-hook: pc/Makefile.tst
# Special rules for individual files
-awkgram.c: awkgram.y
+$(srcdir)/awkgram.c: awkgram.y
$(YACC) -o $@ $(AM_YFLAGS) $(YFLAGS) $<
sed 's/parse error/syntax error/g' < $@ > $@.tmp && mv $@.tmp $@
-command.c: command.y
+$(srcdir)/command.c: command.y
$(YACC) -o $@ -p zz $<
sed 's/parse error/syntax error/g' < $@ > $@.tmp && mv $@.tmp $@
-pc/Makefile.tst: test/Makefile.in
- test -d pc || mkdir pc
- cat "$(top_srcdir)"/pc/Makefile.tst.prologue > pc/Makefile.tst
- awk -f "$(top_srcdir)"/pc/GenMakefileTst.awk "$(top_srcdir)"/test/Makefile.in >> pc/Makefile.tst
+$(srcdir)/pc/Makefile.tst: test/Makefile.in pc/Makefile.tst.prologue pc/GenMakefileTst.awk
+ $(AM_V_GEN)$(MKDIR_P) "$(srcdir)"/pc && \
+ cat "$(srcdir)"/pc/Makefile.tst.prologue > "$(srcdir)"/pc/Makefile.tst && \
+ $(AWK) -f "$(srcdir)"/pc/GenMakefileTst.awk "$(srcdir)"/test/Makefile.in >> "$(srcdir)"/pc/Makefile.tst
# This is for my development & testing.
efence: gawk
- $(CC) $(LDFLAGS) -o gawk $$(ls *.o | grep -v '_p.o$$') $(LDADD) $(LIBS) -lefence
+ $(CC) $(AM_LDFLAGS) -o gawk $$(ls *.o | grep -v '_p.o$$') $(LDADD) $(LIBS) -lefence
diffout valgrind-scan:
@cd test && $(MAKE) $(AM_MAKEFLAGS) $@
diff --git a/Makefile.in b/Makefile.in
index 61f37a2d..6071f70b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -128,8 +128,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \
$(top_srcdir)/m4/mpfr.m4 $(top_srcdir)/m4/nls.m4 \
$(top_srcdir)/m4/noreturn.m4 $(top_srcdir)/m4/po.m4 \
$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
- $(top_srcdir)/m4/socket.m4 $(top_srcdir)/m4/ulonglong.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/socket.m4 \
+ $(top_srcdir)/m4/triplet-transformation.m4 \
+ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
@@ -459,9 +460,8 @@ top_srcdir = @top_srcdir@
# This variable insures that aclocal runs
# correctly after changing configure.ac
ACLOCAL_AMFLAGS = -I m4
-
-# This insures that make flags get passed down to child makes.
-AM_MAKEFLAGS = 'CFLAGS=$(CFLAGS)' 'LDFLAGS=$(LDFLAGS)'
+AM_CFLAGS = @CFLAGS@
+AM_LDFLAGS = @LDFLAGS@
# Stuff to include in the dist that doesn't need it's own
# Makefile.am files
@@ -500,6 +500,7 @@ EXTRA_DIST = \
# sample files if doc/gawk.texi changed.
SUBDIRS = support . $(am__append_1) extras doc awklib po test
include_HEADERS = gawkapi.h
+BUILT_SOURCES = $(srcdir)/pc/Makefile.tst
# sources for both gawk and dgawk
base_sources = \
@@ -560,7 +561,7 @@ LN = ln
# For some make's, e.g. OpenBSD, that don't define this
RM = rm -f
-all: config.h
+all: $(BUILT_SOURCES) config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
@@ -1035,14 +1036,16 @@ distcleancheck: distclean
exit 1; } >&2
check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) check-local
-check: check-recursive
+check: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) check-recursive
all-am: Makefile $(PROGRAMS) $(HEADERS) config.h
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
-install: install-recursive
+install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
uninstall: uninstall-recursive
@@ -1075,6 +1078,7 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild."
-rm -f awkgram.c
-rm -f command.c
+ -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
clean: clean-recursive
clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
@@ -1194,7 +1198,7 @@ ps-am:
uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS
-.MAKE: $(am__recursive_targets) all check-am install-am \
+.MAKE: $(am__recursive_targets) all check check-am install install-am \
install-exec-am install-strip
.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
@@ -1247,8 +1251,7 @@ uninstall-recursive: uninstall-links
check-local: gawk$(EXEEXT)
# A little extra clean up when making distributions.
-# And additional set up for the pc directory.
-dist-hook: pc/Makefile.tst
+dist-hook:
cd "$(distdir)"/extension ; rm -f *.o *.so
cd "$(srcdir)"/pc ; \
chmod u+w config.h ; \
@@ -1262,22 +1265,22 @@ dist-hook: pc/Makefile.tst
# Special rules for individual files
-awkgram.c: awkgram.y
+$(srcdir)/awkgram.c: awkgram.y
$(YACC) -o $@ $(AM_YFLAGS) $(YFLAGS) $<
sed 's/parse error/syntax error/g' < $@ > $@.tmp && mv $@.tmp $@
-command.c: command.y
+$(srcdir)/command.c: command.y
$(YACC) -o $@ -p zz $<
sed 's/parse error/syntax error/g' < $@ > $@.tmp && mv $@.tmp $@
-pc/Makefile.tst: test/Makefile.in
- test -d pc || mkdir pc
- cat "$(top_srcdir)"/pc/Makefile.tst.prologue > pc/Makefile.tst
- awk -f "$(top_srcdir)"/pc/GenMakefileTst.awk "$(top_srcdir)"/test/Makefile.in >> pc/Makefile.tst
+$(srcdir)/pc/Makefile.tst: test/Makefile.in pc/Makefile.tst.prologue pc/GenMakefileTst.awk
+ $(AM_V_GEN)$(MKDIR_P) "$(srcdir)"/pc && \
+ cat "$(srcdir)"/pc/Makefile.tst.prologue > "$(srcdir)"/pc/Makefile.tst && \
+ $(AWK) -f "$(srcdir)"/pc/GenMakefileTst.awk "$(srcdir)"/test/Makefile.in >> "$(srcdir)"/pc/Makefile.tst
# This is for my development & testing.
efence: gawk
- $(CC) $(LDFLAGS) -o gawk $$(ls *.o | grep -v '_p.o$$') $(LDADD) $(LIBS) -lefence
+ $(CC) $(AM_LDFLAGS) -o gawk $$(ls *.o | grep -v '_p.o$$') $(LDADD) $(LIBS) -lefence
diffout valgrind-scan:
@cd test && $(MAKE) $(AM_MAKEFLAGS) $@
diff --git a/aclocal.m4 b/aclocal.m4
index f5474e4d..b0441c51 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1151,4 +1151,5 @@ m4_include([m4/po.m4])
m4_include([m4/progtest.m4])
m4_include([m4/readline.m4])
m4_include([m4/socket.m4])
+m4_include([m4/triplet-transformation.m4])
m4_include([m4/ulonglong.m4])
diff --git a/awklib/Makefile.in b/awklib/Makefile.in
index 449a5bf7..aba8e26b 100644
--- a/awklib/Makefile.in
+++ b/awklib/Makefile.in
@@ -121,8 +121,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \
$(top_srcdir)/m4/mpfr.m4 $(top_srcdir)/m4/nls.m4 \
$(top_srcdir)/m4/noreturn.m4 $(top_srcdir)/m4/po.m4 \
$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
- $(top_srcdir)/m4/socket.m4 $(top_srcdir)/m4/ulonglong.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/socket.m4 \
+ $(top_srcdir)/m4/triplet-transformation.m4 \
+ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
diff --git a/configure b/configure
index e41ee237..fa674929 100755
--- a/configure
+++ b/configure
@@ -3339,6 +3339,98 @@ IFS=$ac_save_IFS
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+ax_tt_header_is_printed=:
+case x$ax_disable_triplet_transform/`uname` in #(
+ x/MSYS*) :
+
+if test x$ac_cv_build != x; then
+ ax_tt_var=`echo $ac_cv_build | sed 's|-msys$|-cygwin|'`
+ if test x$ax_tt_var = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: sed script: build triplet conversion \`$ac_cv_build' with sed script \`s|-msys$|-cygwin|'failed." >&5
+$as_echo "$as_me: sed script: build triplet conversion \`$ac_cv_build' with sed script \`s|-msys$|-cygwin|'failed." >&6;}
+ elif test x$ax_tt_var != x`$SHELL "$ac_aux_dir/config.sub" $ax_tt_var`; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: \`config.sub' test: build triplet conversion of \`$ac_cv_build' produced invalid triplet \`$ax_tt_var'." >&5
+$as_echo "$as_me: \`config.sub' test: build triplet conversion of \`$ac_cv_build' produced invalid triplet \`$ax_tt_var'." >&6;}
+ elif test x$ax_tt_var != x$ac_cv_build; then
+ if test x$ax_tt_header_is_printed != xyes; then
+ ax_tt_header_is_printed=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Triplet conversion on MSYS platform:" >&5
+$as_echo "$as_me: Triplet conversion on MSYS platform:" >&6;}
+ fi
+ gawk_cv_build_orig=$ac_cv_build
+ ac_cv_build=$ax_tt_var
+ { $as_echo "$as_me:${as_lineno-$LINENO}: build: replacing $gawk_cv_build_orig -> $ac_cv_build" >&5
+$as_echo "$as_me: build: replacing $gawk_cv_build_orig -> $ac_cv_build" >&6;}
+ ax_tt_var=
+ case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+ fi
+ ax_tt_var=
+fi
+
+
+if test x$ac_cv_host != x; then
+ ax_tt_var=`echo $ac_cv_host | sed 's|-msys$|-cygwin|'`
+ if test x$ax_tt_var = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: sed script: host triplet conversion \`$ac_cv_host' with sed script \`s|-msys$|-cygwin|'failed." >&5
+$as_echo "$as_me: sed script: host triplet conversion \`$ac_cv_host' with sed script \`s|-msys$|-cygwin|'failed." >&6;}
+ elif test x$ax_tt_var != x`$SHELL "$ac_aux_dir/config.sub" $ax_tt_var`; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: \`config.sub' test: host triplet conversion of \`$ac_cv_host' produced invalid triplet \`$ax_tt_var'." >&5
+$as_echo "$as_me: \`config.sub' test: host triplet conversion of \`$ac_cv_host' produced invalid triplet \`$ax_tt_var'." >&6;}
+ elif test x$ax_tt_var != x$ac_cv_host; then
+ if test x$ax_tt_header_is_printed != xyes; then
+ ax_tt_header_is_printed=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Triplet conversion on MSYS platform:" >&5
+$as_echo "$as_me: Triplet conversion on MSYS platform:" >&6;}
+ fi
+ gawk_cv_host_orig=$ac_cv_host
+ ac_cv_host=$ax_tt_var
+ { $as_echo "$as_me:${as_lineno-$LINENO}: host: replacing $gawk_cv_host_orig -> $ac_cv_host" >&5
+$as_echo "$as_me: host: replacing $gawk_cv_host_orig -> $ac_cv_host" >&6;}
+ ax_tt_var=
+ case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+ fi
+ ax_tt_var=
+fi
+
+
+ ;; #(
+ *) :
+ ;;
+esac
+
+
DEPDIR="${am__leading_dot}deps"
ac_config_commands="$ac_config_commands depfiles"
@@ -11057,17 +11149,11 @@ ac_config_headers="$ac_config_headers config.h:configh.in"
-if test "x$EXEEXT" = x.exe; then :
- GAWKLIBEXT=dll
-else
-
case $acl_shlibext in
dylib) GAWKLIBEXT=so ;; # MacOS uses .dylib for shared libraries, but libtool uses .so for modules
*) GAWKLIBEXT=$acl_shlibext ;;
esac
-fi
-
ac_config_files="$ac_config_files Makefile support/Makefile awklib/Makefile doc/Makefile extras/Makefile po/Makefile.in test/Makefile"
diff --git a/configure.ac b/configure.ac
index db535963..ce25d031 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,7 +88,7 @@ AC_ARG_ENABLE([versioned-extension-dir],
# set default shared library location
AC_SUBST([pkgextensiondir], ['${pkglibdir}'${EXTENSIONDIR}])
-AC_CANONICAL_HOST
+GAWK_CANONICAL_HOST
AC_USE_SYSTEM_EXTENSIONS
dnl checks for programs
@@ -458,12 +458,10 @@ AH_BOTTOM([#include "custom.h"])
dnl Crude but small hack to make plug-ins work on Mac OS X
dnl We should really use the libtool value for shrext_cmds, but that
dnl is not available here, since we do not use libtool at the top level.
-AS_VAR_IF([EXEEXT],[.exe],[GAWKLIBEXT=dll],[
case $acl_shlibext in
dylib) GAWKLIBEXT=so ;; # MacOS uses .dylib for shared libraries, but libtool uses .so for modules
*) GAWKLIBEXT=$acl_shlibext ;;
esac
-])
AC_SUBST(GAWKLIBEXT)
AC_CONFIG_FILES(Makefile
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 9bce117d..5c2d2edb 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -122,8 +122,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \
$(top_srcdir)/m4/mpfr.m4 $(top_srcdir)/m4/nls.m4 \
$(top_srcdir)/m4/noreturn.m4 $(top_srcdir)/m4/po.m4 \
$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
- $(top_srcdir)/m4/socket.m4 $(top_srcdir)/m4/ulonglong.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/socket.m4 \
+ $(top_srcdir)/m4/triplet-transformation.m4 \
+ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
diff --git a/extension/ChangeLog b/extension/ChangeLog
index f6dd4a4d..56b7da34 100644
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@ -1,3 +1,9 @@
+2020-03-06 Jannick <thirdedition@gmx.net>
+
+ * Makefile.am: Remove trailing spaces.
+ * configure.ac: Use GAWK_CANONICAL_HOST instead of AC_CANONICAL_HOST.
+ Update call to LT_INIT.
+
2019-11-21 Arnold D. Robbins <arnold@skeeve.com>
* time.3am: Document that this extension is now obsolete.
diff --git a/extension/Makefile.am b/extension/Makefile.am
index f8be8d2b..0f113dc8 100644
--- a/extension/Makefile.am
+++ b/extension/Makefile.am
@@ -53,7 +53,7 @@ noinst_LTLIBRARIES = \
testext.la
MY_MODULE_FLAGS = -module -avoid-version -no-undefined
-# On Cygwin, gettext requires that we link with -lintl
+# On Cygwin, gettext requires that we link with -lintl
MY_LIBS = $(LTLIBINTL)
filefuncs_la_SOURCES = filefuncs.c stack.h stack.c gawkfts.h \
@@ -151,7 +151,7 @@ dist_man_MANS = \
revtwoway.3am rwarray.3am time.3am
# gettext requires this
-SUBDIRS = po
+SUBDIRS = po
distclean-local:
rm -fr .deps
diff --git a/extension/Makefile.in b/extension/Makefile.in
index 13d8ffd6..9ef426a4 100644
--- a/extension/Makefile.in
+++ b/extension/Makefile.in
@@ -114,16 +114,17 @@ host_triplet = @host@
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../m4/arch.m4 \
- $(top_srcdir)/../m4/mpfr.m4 $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/dirfd.m4 $(top_srcdir)/m4/gettext.m4 \
- $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
- $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
- $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
- $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
- $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/../m4/mpfr.m4 \
+ $(top_srcdir)/../m4/triplet-transformation.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/dirfd.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \
+ $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lcmessage.m4 \
+ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
@@ -416,6 +417,7 @@ ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AR = @AR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -575,7 +577,7 @@ noinst_LTLIBRARIES = \
testext.la
MY_MODULE_FLAGS = -module -avoid-version -no-undefined
-# On Cygwin, gettext requires that we link with -lintl
+# On Cygwin, gettext requires that we link with -lintl
MY_LIBS = $(LTLIBINTL)
filefuncs_la_SOURCES = filefuncs.c stack.h stack.c gawkfts.h \
gawkfts.c gawkdirfd.h
@@ -649,7 +651,7 @@ dist_man_MANS = \
# gettext requires this
-SUBDIRS = po
+SUBDIRS = po
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/extension/aclocal.m4 b/extension/aclocal.m4
index 582a4adb..b04b6a45 100644
--- a/extension/aclocal.m4
+++ b/extension/aclocal.m4
@@ -1195,6 +1195,7 @@ AC_SUBST([am__untar])
m4_include([../m4/arch.m4])
m4_include([../m4/mpfr.m4])
+m4_include([../m4/triplet-transformation.m4])
m4_include([m4/codeset.m4])
m4_include([m4/dirfd.m4])
m4_include([m4/gettext.m4])
diff --git a/extension/configure b/extension/configure
index 23999393..9b0c80b1 100755
--- a/extension/configure
+++ b/extension/configure
@@ -646,8 +646,6 @@ NMEDIT
DSYMUTIL
MANIFEST_TOOL
RANLIB
-DLLTOOL
-OBJDUMP
LN_S
NM
ac_ct_DUMPBIN
@@ -655,6 +653,9 @@ DUMPBIN
LD
FGREP
LIBTOOL
+OBJDUMP
+DLLTOOL
+AS
ac_ct_AR
AR
POSUB
@@ -664,14 +665,6 @@ INTLLIBS
LTLIBICONV
LIBICONV
INTL_MACOSX_LIBS
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
XGETTEXT_EXTRA_OPTIONS
MSGMERGE
XGETTEXT_015
@@ -702,6 +695,14 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
AM_BACKSLASH
AM_DEFAULT_VERBOSITY
AM_DEFAULT_V
@@ -2966,6 +2967,168 @@ END
fi
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if ${ac_cv_build+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if ${ac_cv_host+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test "x$host_alias" = x; then
+ ac_cv_host=$ac_cv_build
+else
+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+ax_tt_header_is_printed=:
+case x$ax_disable_triplet_transform/`uname` in #(
+ x/MSYS*) :
+
+if test x$ac_cv_build != x; then
+ ax_tt_var=`echo $ac_cv_build | sed 's|-msys$|-cygwin|'`
+ if test x$ax_tt_var = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: sed script: build triplet conversion \`$ac_cv_build' with sed script \`s|-msys$|-cygwin|'failed." >&5
+$as_echo "$as_me: sed script: build triplet conversion \`$ac_cv_build' with sed script \`s|-msys$|-cygwin|'failed." >&6;}
+ elif test x$ax_tt_var != x`$SHELL "$ac_aux_dir/config.sub" $ax_tt_var`; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: \`config.sub' test: build triplet conversion of \`$ac_cv_build' produced invalid triplet \`$ax_tt_var'." >&5
+$as_echo "$as_me: \`config.sub' test: build triplet conversion of \`$ac_cv_build' produced invalid triplet \`$ax_tt_var'." >&6;}
+ elif test x$ax_tt_var != x$ac_cv_build; then
+ if test x$ax_tt_header_is_printed != xyes; then
+ ax_tt_header_is_printed=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Triplet conversion on MSYS platform:" >&5
+$as_echo "$as_me: Triplet conversion on MSYS platform:" >&6;}
+ fi
+ gawk_extensions_cv_build_orig=$ac_cv_build
+ ac_cv_build=$ax_tt_var
+ { $as_echo "$as_me:${as_lineno-$LINENO}: build: replacing $gawk_extensions_cv_build_orig -> $ac_cv_build" >&5
+$as_echo "$as_me: build: replacing $gawk_extensions_cv_build_orig -> $ac_cv_build" >&6;}
+ ax_tt_var=
+ case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+ fi
+ ax_tt_var=
+fi
+
+
+if test x$ac_cv_host != x; then
+ ax_tt_var=`echo $ac_cv_host | sed 's|-msys$|-cygwin|'`
+ if test x$ax_tt_var = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: sed script: host triplet conversion \`$ac_cv_host' with sed script \`s|-msys$|-cygwin|'failed." >&5
+$as_echo "$as_me: sed script: host triplet conversion \`$ac_cv_host' with sed script \`s|-msys$|-cygwin|'failed." >&6;}
+ elif test x$ax_tt_var != x`$SHELL "$ac_aux_dir/config.sub" $ax_tt_var`; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: \`config.sub' test: host triplet conversion of \`$ac_cv_host' produced invalid triplet \`$ax_tt_var'." >&5
+$as_echo "$as_me: \`config.sub' test: host triplet conversion of \`$ac_cv_host' produced invalid triplet \`$ax_tt_var'." >&6;}
+ elif test x$ax_tt_var != x$ac_cv_host; then
+ if test x$ax_tt_header_is_printed != xyes; then
+ ax_tt_header_is_printed=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Triplet conversion on MSYS platform:" >&5
+$as_echo "$as_me: Triplet conversion on MSYS platform:" >&6;}
+ fi
+ gawk_extensions_cv_host_orig=$ac_cv_host
+ ac_cv_host=$ax_tt_var
+ { $as_echo "$as_me:${as_lineno-$LINENO}: host: replacing $gawk_extensions_cv_host_orig -> $ac_cv_host" >&5
+$as_echo "$as_me: host: replacing $gawk_extensions_cv_host_orig -> $ac_cv_host" >&6;}
+ ax_tt_var=
+ case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+ fi
+ ax_tt_var=
+fi
+
+
+ ;; #(
+ *) :
+ ;;
+esac
+
DEPDIR="${am__leading_dot}deps"
@@ -4962,77 +5125,6 @@ fi
eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
prefix="$acl_save_prefix"
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
- ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
- as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test "x$host_alias" = x; then
- ac_cv_host=$ac_cv_build
-else
- ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
# Check whether --with-gnu-ld was given.
@@ -7243,37 +7335,6 @@ rm -rf conftest*
fi
-# Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then :
- enableval=$enable_static; p=${PACKAGE-default}
- case $enableval in
- yes) enable_static=yes ;;
- no) enable_static=no ;;
- *)
- enable_static=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
- for pkg in $enableval; do
- IFS=$lt_save_ifs
- if test "X$pkg" = "X$p"; then
- enable_static=yes
- fi
- done
- IFS=$lt_save_ifs
- ;;
- esac
-else
- enable_static=no
-fi
-
-
-
-
-
-
-
-
-
case `pwd` in
*\ * | *\ *)
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
@@ -8257,9 +8318,6 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
-
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
$as_echo_n "checking how to recognize dependent libraries... " >&6; }
if ${lt_cv_deplibs_check_method+:} false; then :
@@ -8602,9 +8660,6 @@ test -z "$DLLTOOL" && DLLTOOL=dlltool
-
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
@@ -10579,13 +10634,340 @@ done
# Set options
+enable_win32_dll=yes
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
+set dummy ${ac_tool_prefix}as; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AS+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$AS"; then
+ ac_cv_prog_AS="$AS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_AS="${ac_tool_prefix}as"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+fi
+fi
+AS=$ac_cv_prog_AS
+if test -n "$AS"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
+$as_echo "$AS" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
- enable_dlopen=no
+fi
+if test -z "$ac_cv_prog_AS"; then
+ ac_ct_AS=$AS
+ # Extract the first word of "as", so it can be a program name with args.
+set dummy as; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AS+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_AS"; then
+ ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_AS="as"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AS=$ac_cv_prog_ac_ct_AS
+if test -n "$ac_ct_AS"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
+$as_echo "$ac_ct_AS" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_AS" = x; then
+ AS="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ AS=$ac_ct_AS
+ fi
+else
+ AS="$ac_cv_prog_AS"
+fi
+
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DLLTOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$DLLTOOL"; then
+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+ ac_ct_DLLTOOL=$DLLTOOL
+ # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_DLLTOOL"; then
+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_DLLTOOL" = x; then
+ DLLTOOL="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ DLLTOOL=$ac_ct_DLLTOOL
+ fi
+else
+ DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OBJDUMP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$OBJDUMP"; then
+ ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+ ac_ct_OBJDUMP=$OBJDUMP
+ # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_OBJDUMP"; then
+ ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_OBJDUMP="objdump"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_OBJDUMP" = x; then
+ OBJDUMP="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ OBJDUMP=$ac_ct_OBJDUMP
+ fi
+else
+ OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+ ;;
+esac
+
+test -z "$AS" && AS=as
+
+
+
+
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+
+
+
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+
+
+
+# Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then :
+ enableval=$enable_static; p=${PACKAGE-default}
+ case $enableval in
+ yes) enable_static=yes ;;
+ no) enable_static=no ;;
+ *)
+ enable_static=no
+ # Look at the argument we got. We use all the common list separators.
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+ for pkg in $enableval; do
+ IFS=$lt_save_ifs
+ if test "X$pkg" = "X$p"; then
+ enable_static=yes
+ fi
+ done
+ IFS=$lt_save_ifs
+ ;;
+ esac
+else
+ enable_static=no
+fi
+
+
+
+
+
+
+
+
+
+
+ enable_dlopen=no
- enable_win32_dll=no
# Check whether --enable-shared was given.
@@ -16147,9 +16529,12 @@ AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
sed_quote_subst='$sed_quote_subst'
double_quote_subst='$double_quote_subst'
delay_variable_subst='$delay_variable_subst'
-enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
@@ -16181,12 +16566,10 @@ lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_q
lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
-DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
@@ -16296,7 +16679,10 @@ _LTECHO_EOF'
}
# Quote evaled strings.
-for var in SHELL \
+for var in AS \
+DLLTOOL \
+OBJDUMP \
+SHELL \
ECHO \
PATH_SEPARATOR \
SED \
@@ -16309,12 +16695,10 @@ LN_S \
lt_SP2NL \
lt_NL2SP \
reload_flag \
-OBJDUMP \
deplibs_check_method \
file_magic_cmd \
file_magic_glob \
want_nocaseglob \
-DLLTOOL \
sharedlib_from_linklib_cmd \
AR \
AR_FLAGS \
@@ -17291,13 +17675,22 @@ available_tags=''
# ### BEGIN LIBTOOL CONFIG
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
# Which release of libtool.m4 was used?
macro_version=$macro_version
macro_revision=$macro_revision
+# Assembler program.
+AS=$lt_AS
+
+# DLL creation program.
+DLLTOOL=$lt_DLLTOOL
+
+# Object dumper program.
+OBJDUMP=$lt_OBJDUMP
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
# Whether or not to build shared libraries.
build_libtool_libs=$enable_shared
@@ -17374,9 +17767,6 @@ to_host_file_cmd=$lt_cv_to_host_file_cmd
# convert \$build files to toolchain format.
to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-# An object symbol dumper.
-OBJDUMP=$lt_OBJDUMP
-
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -17389,9 +17779,6 @@ file_magic_glob=$lt_file_magic_glob
# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
want_nocaseglob=$lt_want_nocaseglob
-# DLL creation program.
-DLLTOOL=$lt_DLLTOOL
-
# Command to associate shared and link libraries.
sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
diff --git a/extension/configure.ac b/extension/configure.ac
index 71528269..9826a1bd 100644
--- a/extension/configure.ac
+++ b/extension/configure.ac
@@ -32,7 +32,7 @@ AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([1.15 -Wall -Werror])
-
+GAWK_CANONICAL_HOST
AC_USE_SYSTEM_EXTENSIONS
AC_ZOS_USS
@@ -64,8 +64,7 @@ AC_CHECK_MEMBERS([struct stat.st_blksize])
AM_PROG_AR
AC_SYS_LARGEFILE
-AC_DISABLE_STATIC
-LT_INIT
+LT_INIT([win32-dll disable-static])
dnl AC_PROG_INSTALL
dnl use the same definition as the main configure script.
diff --git a/extras/Makefile.in b/extras/Makefile.in
index 705cca5b..8fbcb2e5 100644
--- a/extras/Makefile.in
+++ b/extras/Makefile.in
@@ -122,8 +122,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \
$(top_srcdir)/m4/mpfr.m4 $(top_srcdir)/m4/nls.m4 \
$(top_srcdir)/m4/noreturn.m4 $(top_srcdir)/m4/po.m4 \
$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
- $(top_srcdir)/m4/socket.m4 $(top_srcdir)/m4/ulonglong.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/socket.m4 \
+ $(top_srcdir)/m4/triplet-transformation.m4 \
+ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
diff --git a/m4/ChangeLog b/m4/ChangeLog
index 3ed357db..c8e6355e 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,7 @@
+2020-03-06 Jannick <thirdedition@gmx.net>
+
+ * triplet-transformation.m4: New file.
+
2019-11-09 Alexey Pawlow <alexey.pawlow@gmail.com>
* threadlib.m4: Add check for MSYS.
diff --git a/m4/triplet-transformation.m4 b/m4/triplet-transformation.m4
new file mode 100644
index 00000000..fa9655a3
--- /dev/null
+++ b/m4/triplet-transformation.m4
@@ -0,0 +1,121 @@
+dnl
+dnl _AX_TRIPLET_TRANSFORMATION(SYSTEM-TYPE, SED-SCRIPT [, HEADER])
+dnl with
+dnl SYSTEM-TYPE : `build', `host' or `target'
+dnl SED-SCRIPT : valid sed script transforming the triplet in
+dnl variable `ac_cv_<SYSTEM-TYPE>'
+dnl HEADER : message header printed when triplet conversion
+dnl is applied
+dnl
+dnl Read the triplet from the cache variable `ac_cv_<SYSTEM-TYPE>',
+dnl try to transform it using the sed script SED-SCRIPT. If the
+dnl transformation results in a change
+dnl - backup the original triplet in the cache variable
+dnl `<PROGRAM>_cv_<SYSTEM-TYPE>_orig'
+dnl - save the transformed one in `ac_cv_<SYSTEM-TYPE>'
+dnl - update the variables `<SYSTEM-TYPE>-(os|cpu|vendor)' (which is the
+dnl ultimate goal of this macro).
+dnl
+AC_DEFUN([_AX_TRIPLET_TRANSFORMATION],
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+AC_REQUIRE_AUX_FILE([config.sub])dnl
+dnl This part should appear in the configure script AFTER the block
+dnl handling the original sytem-type variables build/host/target.
+AS_VAR_PUSHDEF([ax_triplet_orig],[]AC_PACKAGE_TARNAME[_cv_$1_orig])
+dnl The real configure variable `ac_cv_target' might be void.
+if test x$ac_cv_$1 != x; then
+dnl here the transformation happens.
+ ax_tt_var=`echo $ac_cv_$1 | sed '$2'`
+ if test x$ax_tt_var = x; then
+ AC_MSG_NOTICE([sed script: $1 triplet conversion `$ac_cv_$1' with sed script `$2'failed.])
+dnl test if transformed triplet is known to config.sub, hence probably to most of the autotools.
+ elif test x$ax_tt_var != x`$SHELL "$ac_aux_dir/config.sub" $ax_tt_var`; then
+ AC_MSG_NOTICE([`config.sub' test: $1 triplet conversion of `$ac_cv_$1' produced invalid triplet `$ax_tt_var'.])
+dnl did anything change at all?
+ elif test x$ax_tt_var != x$ac_cv_$1; then
+dnl print the header just once in one configure script
+ m4_ifnblank([$3],[dnl
+ if test x$ax_tt_header_is_printed != xyes; then
+ ax_tt_header_is_printed=yes
+ AC_MSG_NOTICE([$3])
+ fi])
+ ax_triplet_orig=$ac_cv_$1
+ ac_cv_$1=$ax_tt_var
+ AC_MSG_NOTICE([$1: replacing $ax_triplet_orig -> $ac_cv_$1])
+dnl Better neutralize ax_tt_var because we call another macro whic might use this
+dnl variable, too.
+ ax_tt_var=
+dnl use of autoconf internal: rerun the triplet split cpu/vendor/host
+ _AC_CANONICAL_SPLIT([$1])
+ fi
+ ax_tt_var=
+fi
+AS_VAR_POPDEF([ax_triplet_orig])dnl
+])dnl _AX_TRIPLET_TRANSFORMATION
+
+dnl
+dnl AX_CANONICAL_HOST(PLATFORM-PATTERN, SED-SCRIPT [, TITLE])
+dnl
+dnl If UNAME matches PLATFORM-PATTERN convert the build and/or host triplets
+dnl using SED-SCRIPT. Have configure emit a message if a transformation
+dnl occurs.
+dnl
+dnl This macro works __inside__ configure as if it was called like so on the
+dnl command line:
+dnl
+dnl #! /usr/bin/bash
+dnl case $(uname) in
+dnl <PLATFORM-PATTERN>)
+dnl test -z $mytriplet && mytriplet=$(./config.sub $(./config.guess))
+dnl ./configure --host=$(echo $mytriplet | sed '<SED-SCRIPT>')
+dnl ;;
+dnl *) ./configure
+dnl esac
+dnl
+dnl The macro calls implicitly AC_CANONICAL_HOST.
+dnl
+dnl To bypass the macro call such that it should not have any effect
+dnl on the configure run pass the NON-VOID variable `ax_disable_triplet_transform'
+dnl to configure. E.g.,
+dnl
+dnl ./configure ax_disable_triplet_transform=yes
+dnl
+dnl In this case it defaults to calling `AC_CANONICAL_HOST'.
+dnl
+AC_DEFUN_ONCE([AX_CANONICAL_HOST],
+[AC_BEFORE([$0],[AC_CANONICAL_BUILD])dnl
+AC_BEFORE([$0],[AC_CANONICAL_HOST])dnl
+ax_tt_header_is_printed=:
+dnl skip case statement if ax_disable_triplet_transform is set to
+dnl any non-void string or UNNAME does not match .
+AS_CASE([x$ax_disable_triplet_transform/`uname`],[x/$1],
+ [_AX_TRIPLET_TRANSFORMATION([build],[$2],[$3])
+ _AX_TRIPLET_TRANSFORMATION([host],[$2],[$3])
+ AC_CANONICAL_HOST
+])])dnl AX_CANONICAL_HOST
+
+dnl
+dnl GAWK_CANONICAL_HOST
+dnl
+dnl This hackery shall fool LIBTOOL and make it believe under MSYS
+dnl platforms that for build and/or host triplets with vendor `msys'
+dnl we are on CYGWIN where LIBTOOL(2.4.6/Jan 2020) can handle well
+dnl shared module libraries.
+dnl
+dnl Call `GAWK_CANONICAL_HOST' instead of `AC_CANONICAL_HOST' high up
+dnl in configure.ac.
+dnl
+dnl Bypass the transformation procedure and simply call AC_CANONICAL_HOST instead
+dnl with
+dnl
+dnl ./configure ax_disable_triplet_transform=yes
+dnl
+dnl Note that with this macro every setting for CYGWIN will be applied to MSYS.
+dnl It is tested for the predominant use of generating shared module libraries
+dnl on MSYS.
+dnl
+dnl TODO remove when MSYS is supported by LIBTOOL.
+dnl
+AC_DEFUN_ONCE([GAWK_CANONICAL_HOST],
+[AX_CANONICAL_HOST([MSYS*],[s|-msys$|-cygwin|],[Triplet conversion on MSYS platform:])
+])dnl GAWK_CANONICAL_HOST
diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index e5978c9e..5dcb08bd 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -209,13 +209,15 @@ GAWK_EXT_TESTS = \
nsbad nsbad_cmd nsforloop nsfuncrecurse nsindirect1 nsindirect2 nsprof1 nsprof2 \
patsplit posix printfbad1 printfbad2 printfbad3 printfbad4 printhuge \
procinfs profile0 profile1 profile2 profile3 profile4 profile5 profile6 \
- profile7 profile8 profile9 profile10 profile11 profile12 pty1 pty2 \
+ profile7 profile8 profile9 profile10 profile11 profile12 profile13 pty1 pty2 \
rebuf regnul1 regnul2 regx8bit reginttrad reint reint2 rsgetline rsglstdin \
rsstart1 rsstart2 rsstart3 rstest6 \
sandbox1 shadow shadowbuiltin sortfor sortfor2 sortu \
sourcesplit split_after_fpat \
- splitarg4 strftfld strftime strtonum strtonum1 switch2 symtab1 symtab2 \
- symtab3 symtab4 symtab5 symtab6 symtab7 symtab8 symtab9 symtab10 \
+ splitarg4 strftfld strftime strtonum strtonum1 \
+ stupid1 stupid2 stupid3 stupid4 \
+ switch2 symtab1 symtab2 symtab3 symtab4 symtab5 symtab6 symtab7 \
+ symtab8 symtab9 symtab10 symtab11 \
timeout typedregex1 typedregex2 typedregex3 typedregex4 \
typedregex5 typedregex6 \
typeof1 typeof2 typeof3 typeof4 typeof5 \
@@ -268,7 +270,7 @@ NEED_POSIX = escapebrace printf0 posix2008sub paramasfunc1 paramasfunc2 muldimpo
# List of tests that need --pretty-print
NEED_PRETTY = nsprof1 nsprof2 \
- profile4 profile5 profile8 profile9 profile10 profile11
+ profile4 profile5 profile8 profile9 profile10 profile11 profile13
# List of tests that need --re-interval
@@ -824,6 +826,12 @@ profile3:
@sed 1,2d < ap-$@.out > _$@; rm ap-$@.out
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+profile5:
+ @echo $@
+ @$(AWK) --pretty=_$@ -f "$(srcdir)"/$@.awk 2> _$@.err
+ @cat _$@.err >> _$@ ; rm -f _$@.err
+ @-$(TESTOUTCMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
profile6:
@echo $@
@$(AWK) --profile=ap-$@.out -f "$(srcdir)"/$@.awk > /dev/null
@@ -3026,11 +3034,6 @@ profile4:
@AWKPATH="$(srcdir)" $(AWK) -f $@.awk --pretty-print=_$@ >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-profile5:
- @echo $@ $(ZOS_FAIL)
- @AWKPATH="$(srcdir)" $(AWK) -f $@.awk --pretty-print=_$@ >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- @-$(TESTOUTCMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-
profile8:
@echo $@
@AWKPATH="$(srcdir)" $(AWK) -f $@.awk --pretty-print=_$@ >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -3051,6 +3054,11 @@ profile11:
@AWKPATH="$(srcdir)" $(AWK) -f $@.awk --pretty-print=_$@ >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+profile13:
+ @echo $@
+ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk --pretty-print=_$@ >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
regnul1:
@echo $@
@AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -3153,6 +3161,26 @@ strtonum1:
@AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+stupid1:
+ @echo $@
+ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+stupid2:
+ @echo $@
+ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+stupid3:
+ @echo $@
+ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+stupid4:
+ @echo $@
+ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
switch2:
@echo $@
@AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -3193,6 +3221,11 @@ symtab10:
@AWKPATH="$(srcdir)" $(AWK) -f $@.awk --debug < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+symtab11:
+ @echo $@
+ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
timeout:
@echo Expect $@ to fail with DJGPP and MinGW.
@echo $@ $(ZOS_FAIL)
diff --git a/support/ChangeLog b/support/ChangeLog
index 96da5cb4..f387fc3c 100644
--- a/support/ChangeLog
+++ b/support/ChangeLog
@@ -1,3 +1,7 @@
+2020-03-06 Jannick <thirdedition@gmx.net>
+
+ * Makefile.am: Replace AM_MAKEFLAGS with AM_CFLAGS and AM_LDFLAGS.
+
2020-02-01 John E. Malmberg <wb8tyw@qsl.net>
* dfa.c: Remove OpenVMS specific code. OpenVMS build
diff --git a/support/Makefile.am b/support/Makefile.am
index 3a72c15e..4dcce36f 100644
--- a/support/Makefile.am
+++ b/support/Makefile.am
@@ -23,8 +23,8 @@
## process this file with automake to produce Makefile.in
-# This insures that make flags get passed down to child makes.
-AM_MAKEFLAGS = 'CFLAGS=$(CFLAGS)' 'LDFLAGS=$(LDFLAGS)'
+AM_CFLAGS = @CFLAGS@
+AM_LDFLAGS = @LDFLAGS@
# Stuff to include in the dist that doesn't need it's own
# Makefile.am files
diff --git a/support/Makefile.in b/support/Makefile.in
index ac697798..38ae9d47 100644
--- a/support/Makefile.in
+++ b/support/Makefile.in
@@ -122,8 +122,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \
$(top_srcdir)/m4/mpfr.m4 $(top_srcdir)/m4/nls.m4 \
$(top_srcdir)/m4/noreturn.m4 $(top_srcdir)/m4/po.m4 \
$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
- $(top_srcdir)/m4/socket.m4 $(top_srcdir)/m4/ulonglong.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/socket.m4 \
+ $(top_srcdir)/m4/triplet-transformation.m4 \
+ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -333,9 +334,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-
-# This insures that make flags get passed down to child makes.
-AM_MAKEFLAGS = 'CFLAGS=$(CFLAGS)' 'LDFLAGS=$(LDFLAGS)'
+AM_CFLAGS = @CFLAGS@
+AM_LDFLAGS = @LDFLAGS@
# Stuff to include in the dist that doesn't need it's own
# Makefile.am files
diff --git a/test/Makefile.in b/test/Makefile.in
index 29bb9bcc..284b6997 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -121,8 +121,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \
$(top_srcdir)/m4/mpfr.m4 $(top_srcdir)/m4/nls.m4 \
$(top_srcdir)/m4/noreturn.m4 $(top_srcdir)/m4/po.m4 \
$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
- $(top_srcdir)/m4/socket.m4 $(top_srcdir)/m4/ulonglong.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/socket.m4 \
+ $(top_srcdir)/m4/triplet-transformation.m4 \
+ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-04 20:24:50 +0000