diff options
Diffstat (limited to 'extension')
| -rw-r--r-- | extension/ChangeLog | 7 | ||||
| -rw-r--r-- | extension/Makefile.am | 3 | ||||
| -rw-r--r-- | extension/Makefile.in | 14 | ||||
| -rw-r--r-- | extension/aclocal.m4 | 13 | ||||
| -rwxr-xr-x | extension/configure | 7 |
5 files changed, 21 insertions, 23 deletions
diff --git a/extension/ChangeLog b/extension/ChangeLog index 986a8358..7614fd1f 100644 --- a/extension/ChangeLog +++ b/extension/ChangeLog @@ -1,3 +1,10 @@ +2021-05-05 Arnold D. Robbins <arnold@skeeve.com> + + Get `make distcheck' working again: + + * Makefile.am (EXTRA_DIST): Remove files that are now in build-aux. + * aclocal.m4: Regenerated. + 2021-03-30 Arnold D. Robbins <arnold@skeeve.com> * rwarray.c (write_value): Add support for writing boolean values. diff --git a/extension/Makefile.am b/extension/Makefile.am index 9e9cf9f5..c5f52bff 100644 --- a/extension/Makefile.am +++ b/extension/Makefile.am @@ -136,13 +136,12 @@ uninstall-so: uninstall-recursive: uninstall-so -EXTRA_DIST = build-aux/config.rpath \ +EXTRA_DIST = \ ChangeLog \ ChangeLog.0 \ ChangeLog.1 \ ext_custom.h \ fts.3 \ - m4 \ README.fts \ rwarray0.c diff --git a/extension/Makefile.in b/extension/Makefile.in index de4347c5..8bd3749d 100644 --- a/extension/Makefile.in +++ b/extension/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2020 Free Software Foundation, Inc. @@ -377,8 +377,9 @@ am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \ ../build-aux/config.guess ../build-aux/config.rpath \ ../build-aux/config.sub ../build-aux/depcomp \ ../build-aux/install-sh ../build-aux/ltmain.sh \ - ../build-aux/missing ../build-aux/ylwrap ABOUT-NLS AUTHORS \ - COPYING ChangeLog INSTALL NEWS README + ../build-aux/missing ../build-aux/texinfo.tex \ + ../build-aux/ylwrap ABOUT-NLS AUTHORS COPYING ChangeLog \ + INSTALL NEWS README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -417,6 +418,8 @@ am__relativize = \ DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best DIST_TARGETS = dist-gzip +# Exists only to be overridden by the user if desired. +AM_DISTCHECK_DVI_TARGET = dvi distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -643,13 +646,12 @@ testext_la_LIBADD = $(MY_LIBS) readdir_test_la_SOURCES = readdir_test.c readdir_test_la_LDFLAGS = $(MY_MODULE_FLAGS) -rpath /foo readdir_test_la_LIBADD = $(MY_LIBS) -EXTRA_DIST = build-aux/config.rpath \ +EXTRA_DIST = \ ChangeLog \ ChangeLog.0 \ ChangeLog.1 \ ext_custom.h \ fts.3 \ - m4 \ README.fts \ rwarray0.c @@ -1157,7 +1159,7 @@ distcheck: dist $(DISTCHECK_CONFIGURE_FLAGS) \ --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \ && $(MAKE) $(AM_MAKEFLAGS) check \ && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ diff --git a/extension/aclocal.m4 b/extension/aclocal.m4 index 17f62ff9..2e137e42 100644 --- a/extension/aclocal.m4 +++ b/extension/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.16.2 -*- Autoconf -*- +# generated automatically by aclocal 1.16.3 -*- Autoconf -*- # Copyright (C) 1996-2020 Free Software Foundation, Inc. @@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.16.2], [], +m4_if([$1], [1.16.3], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.16.2])dnl +[AM_AUTOMAKE_VERSION([1.16.3])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -763,12 +763,7 @@ AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then diff --git a/extension/configure b/extension/configure index 82ebf32b..06d030f1 100755 --- a/extension/configure +++ b/extension/configure @@ -2575,12 +2575,7 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then |