Update support for building with MSVC. Automake does not install ar-lib.
diff --git a/ChangeLog b/ChangeLog
index 14a59d3..10c919f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2019-01-27 Bruno Haible <bruno@clisp.org>
+
+ Update support for building with MSVC. Automake does not install ar-lib.
+ * autogen.sh: Fetch build-aux/ar-lib here.
+ * Makefile.devel (srclib/Makefile.in): Don't fetch build-aux/ar-lib
+ here.
+ * Makefile.in (AUTOMAKE_IMPORTED_FILES): Remove build-aux/ar-lib.
+ (IMPORTED_FILES): Add build-aux/ar-lib.
+
2019-01-06 Bruno Haible <bruno@clisp.org>
Revisit handling of file descriptors closed by the parent process.
diff --git a/Makefile.devel b/Makefile.devel
index 6d534ac..c23cde9 100644
--- a/Makefile.devel
+++ b/Makefile.devel
@@ -72,11 +72,10 @@
srclib/Makefile.in : srclib/Makefile.am srclib/Makefile.gnulib aclocal.m4
if test -n "$$GNULIB_TOOL"; then \
- $$GNULIB_TOOL --copy-file build-aux/ar-lib; \
$$GNULIB_TOOL --copy-file build-aux/compile; \
fi
# Make sure we get new versions of files brought in by automake.
- (cd build-aux && rm -f ar-lib compile depcomp install-sh mdate-sh missing test-driver)
+ (cd build-aux && rm -f compile depcomp install-sh mdate-sh missing test-driver)
$(AUTOMAKE) --gnits --add-missing --copy srclib/Makefile && rm -rf autom4te.cache
gnulib-imported-files : force
diff --git a/Makefile.in b/Makefile.in
index b486848..a59627d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -184,7 +184,6 @@
AUTOMAKE_OLD_IMPORTED_FILES = \
build-aux/mkinstalldirs
AUTOMAKE_IMPORTED_FILES = \
- build-aux/ar-lib \
build-aux/compile \
build-aux/install-sh \
build-aux/missing
@@ -203,6 +202,7 @@
IMPORTED_FILES = \
COPYING COPYING.LIB \
ABOUT-NLS INSTALL.generic \
+ build-aux/ar-lib \
$(LIBTOOL_IMPORTED_FILES) $(AUTOMAKE_OLD_IMPORTED_FILES) $(AUTOMAKE_IMPORTED_FILES) $(GNULIB_IMPORTED_FILES)
# List of distributed files generated by autotools or Makefile.devel.
GENERATED_FILES = \
diff --git a/autogen.sh b/autogen.sh
index 5f3dcd9..e1844c7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -60,6 +60,8 @@
fi
# Skip the gnulib-tool step if gnulib-tool was not found.
if test -n "$GNULIB_TOOL"; then
+ $GNULIB_TOOL --copy-file build-aux/ar-lib || exit $?
+ chmod a+x build-aux/ar-lib || exit $?
make -f Makefile.devel \
gnulib-clean srclib/Makefile.gnulib gnulib-imported-files \
GNULIB_TOOL="$GNULIB_TOOL"
