File tree Expand file tree Collapse file tree 4 files changed +13
-3
lines changed Expand file tree Collapse file tree 4 files changed +13
-3
lines changed Original file line number Diff line number Diff line change 1+ 2019-01-27 Bruno Haible <bruno@clisp.org>
2+
3+ Update support for building with MSVC. Automake does not install ar-lib.
4+ * autogen.sh: Fetch build-aux/ar-lib here.
5+ * Makefile.devel (srclib/Makefile.in): Don't fetch build-aux/ar-lib
6+ here.
7+ * Makefile.in (AUTOMAKE_IMPORTED_FILES): Remove build-aux/ar-lib.
8+ (IMPORTED_FILES): Add build-aux/ar-lib.
9+
1102019-01-06 Bruno Haible <bruno@clisp.org>
211
312 Revisit handling of file descriptors closed by the parent process.
Original file line number Diff line number Diff line change @@ -72,11 +72,10 @@ srclib/Makefile.gnulib :
7272
7373srclib/Makefile.in : srclib/Makefile.am srclib/Makefile.gnulib aclocal.m4
7474 if test -n " $$ GNULIB_TOOL" ; then \
75- $$ GNULIB_TOOL --copy-file build-aux/ar-lib; \
7675 $$ GNULIB_TOOL --copy-file build-aux/compile; \
7776 fi
7877# Make sure we get new versions of files brought in by automake.
79- (cd build-aux && rm -f ar-lib compile depcomp install-sh mdate-sh missing test-driver)
78+ (cd build-aux && rm -f compile depcomp install-sh mdate-sh missing test-driver)
8079 $(AUTOMAKE) --gnits --add-missing --copy srclib/Makefile && rm -rf autom4te.cache
8180
8281gnulib-imported-files : force
Original file line number Diff line number Diff line change @@ -184,7 +184,6 @@ LIBTOOL_IMPORTED_FILES = \
184184AUTOMAKE_OLD_IMPORTED_FILES = \
185185 build-aux/mkinstalldirs
186186AUTOMAKE_IMPORTED_FILES = \
187- build-aux/ar-lib \
188187 build-aux/compile \
189188 build-aux/install-sh \
190189 build-aux/missing
@@ -203,6 +202,7 @@ GNULIB_IMPORTED_FILES = \
203202IMPORTED_FILES = \
204203 COPYING COPYING.LIB \
205204 ABOUT-NLS INSTALL.generic \
205+ build-aux/ar-lib \
206206 $(LIBTOOL_IMPORTED_FILES ) $(AUTOMAKE_OLD_IMPORTED_FILES ) $(AUTOMAKE_IMPORTED_FILES ) $(GNULIB_IMPORTED_FILES )
207207# List of distributed files generated by autotools or Makefile.devel.
208208GENERATED_FILES = \
Original file line number Diff line number Diff line change @@ -60,6 +60,8 @@ if test $skip_gnulib = false; then
6060 fi
6161 # Skip the gnulib-tool step if gnulib-tool was not found.
6262 if test -n " $GNULIB_TOOL " ; then
63+ $GNULIB_TOOL --copy-file build-aux/ar-lib || exit $?
64+ chmod a+x build-aux/ar-lib || exit $?
6365 make -f Makefile.devel \
6466 gnulib-clean srclib/Makefile.gnulib gnulib-imported-files \
6567 GNULIB_TOOL=" $GNULIB_TOOL "
You can’t perform that action at this time.
0 commit comments