From 150798c5ac7953c0fd56cffd3b3720015528d820 Mon Sep 17 00:00:00 2001
From: Ulrich Mueller <ulm@gentoo.org>
Date: Fri, 5 Oct 2012 20:42:28 -0400
Subject: [PATCH] Let configure set ar and associated flags

* lwlib/Makefile.in (AR, ARFLAGS):
* oldXMenu/Makefile.in (AR, ARFLAGS): Get values from configure.

Fixes: debbugs:12549
---
 lwlib/ChangeLog      | 4 ++++
 lwlib/Makefile.in    | 5 +++--
 oldXMenu/ChangeLog   | 4 ++++
 oldXMenu/Makefile.in | 6 +++---
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index 7d49d9b531..80d29bc5d8 100644
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-06  Ulrich Müller  <ulm@gentoo.org>
+
+	* Makefile.in (AR, ARFLAGS): Get values from configure.
+
 2012-08-16  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Use ASCII tests for character types.
diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in
index 2e70e0a4b6..85a76f7a1c 100644
--- a/lwlib/Makefile.in
+++ b/lwlib/Makefile.in
@@ -37,7 +37,8 @@ CFLAGS=@CFLAGS@
 CPPFLAGS=@CPPFLAGS@
 RANLIB=@RANLIB@
 
-AR = ar cq
+AR = @AR@
+ARFLAGS = @ARFLAGS@
 
 LUCID_OBJS = lwlib-Xlw.o xlwmenu.o lwlib-Xaw.o
 MOTIF_OBJS = lwlib-Xm.o
@@ -65,7 +66,7 @@ all:: liblw.a
 
 liblw.a: $(OBJS)
 	rm -f $@
-	$(AR) $@ $(OBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)
 	$(RANLIB) $@
 
 ## Generated files in ../src, non-generated in $(srcdir)/../src.
diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog
index 09859d0d63..133b18b4e3 100644
--- a/oldXMenu/ChangeLog
+++ b/oldXMenu/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-06  Ulrich Müller  <ulm@gentoo.org>
+
+	* Makefile.in (AR, ARFLAGS): Get values from configure.
+
 2012-06-26  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* Makefile.in (ALL_CFLAGS): Add -I../lib -I${srcdir}/../lib.
diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in
index 00b3d8e3c6..ee78325f0d 100644
--- a/oldXMenu/Makefile.in
+++ b/oldXMenu/Makefile.in
@@ -57,8 +57,8 @@ CFLAGS=@CFLAGS@
 TAGS = etags
 RM = rm -f
 RANLIB = @RANLIB@
-# Solaris 2.1 ar doesn't accept the 'l' option.
-AR = ar cq
+AR = @AR@
+ARFLAGS = @ARFLAGS@
 
 OBJS =  Activate.o \
 	AddPane.o \
@@ -98,7 +98,7 @@ ALL_CFLAGS=$(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \
 
 libXMenu11.a: $(OBJS) $(EXTRA)
 	$(RM) $@
-	$(AR) $@ $(OBJS) $(EXTRA)
+	$(AR) $(ARFLAGS) $@ $(OBJS) $(EXTRA)
 	$(RANLIB) $@
 
 Activate.o: Activate.c XMenuInt.h XMenu.h X10.h
-- 
2.20.1