Fix build break for MSVC.
Introduce AROUT to control whether there is space between ARFLAGS and
$@. This regression was introduced by
ad505e0ec622883fbb0650763ea8b54f64a770c9.
Reported by Mike Hommey.
diff --git a/Makefile.in b/Makefile.in
index 478becb..5909416 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -56,7 +56,7 @@
LDTARGET = @LDTARGET@
MKLIB = @MKLIB@
AR = @AR@
-ARFLAGS = crus
+ARFLAGS = @ARFLAGS@
CC_MM = @CC_MM@
ifeq (macho, $(ABI))
@@ -187,7 +187,7 @@
$(STATIC_LIBS):
@mkdir -p $(@D)
- $(AR) $(ARFLAGS) $@ $+
+ $(AR) $(ARFLAGS)@AROUT@ $+
$(objroot)test/bitmap$(EXE): $(objroot)src/bitmap.$(O)
diff --git a/configure.ac b/configure.ac
index f4b4c21..73d3f94 100644
--- a/configure.ac
+++ b/configure.ac
@@ -226,6 +226,8 @@
CTARGET='-o $@'
LDTARGET='-o $@'
EXTRA_LDFLAGS=
+ARFLAGS='crus'
+AROUT=' $@'
CC_MM=1
AN_MAKEVAR([AR], [AC_PROG_AR])
@@ -316,6 +318,7 @@
LDTARGET='-Fe$@'
AR='lib'
ARFLAGS='-nologo -out:'
+ AROUT='$@'
CC_MM=
else
importlib="${so}"
@@ -348,6 +351,8 @@
AC_SUBST([CTARGET])
AC_SUBST([LDTARGET])
AC_SUBST([MKLIB])
+AC_SUBST([ARFLAGS])
+AC_SUBST([AROUT])
AC_SUBST([CC_MM])
if test "x$abi" != "xpecoff"; then