Skip to content

Commit 40d3b02

Browse files
committed
Update support for building with MSVC. Automake does not install ar-lib.
1 parent 40da0a7 commit 40d3b02

File tree

4 files changed

+13
-3
lines changed

4 files changed

+13
-3
lines changed

ChangeLog

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
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+
110
2019-01-06 Bruno Haible <bruno@clisp.org>
211

312
Revisit handling of file descriptors closed by the parent process.

Makefile.devel

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,10 @@ srclib/Makefile.gnulib :
7272

7373
srclib/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

8281
gnulib-imported-files : force

Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@ LIBTOOL_IMPORTED_FILES = \
184184
AUTOMAKE_OLD_IMPORTED_FILES = \
185185
build-aux/mkinstalldirs
186186
AUTOMAKE_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 = \
203202
IMPORTED_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.
208208
GENERATED_FILES = \

autogen.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff 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"

0 commit comments

Comments
 (0)