From 84874b00a705703d4b1554d54b422872a2a2a833 Mon Sep 17 00:00:00 2001
From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Fri, 14 May 2004 20:13:53 +0000
Subject: [PATCH] * lib/am/libs.am (AR, ARFLAGS): Move these definition ... *
 automake.in (handle_libraries): ... here, so that they are output even for
 EXTRA_LIBRARIES. * tests/ar2.test: New file. * tests/Makefile.am (TESTS): Add
 it. Report from Kevin Ryde.

---
 ChangeLog         |  9 +++++++++
 automake.in       |  3 +++
 lib/am/libs.am    | 11 -----------
 tests/Makefile.am |  1 +
 tests/Makefile.in |  1 +
 tests/ar2.test    | 42 ++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 56 insertions(+), 11 deletions(-)
 create mode 100755 tests/ar2.test

diff --git a/ChangeLog b/ChangeLog
index e34141e82..0f64dab25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-05-14  Alexandre Duret-Lutz  <adl@gnu.org>
+
+	* lib/am/libs.am (AR, ARFLAGS): Move these definition ...
+	* automake.in (handle_libraries): ... here, so that they are
+	output even for EXTRA_LIBRARIES.
+	* tests/ar2.test: New file.
+	* tests/Makefile.am (TESTS): Add it.
+	Report from Kevin Ryde.
+
 2004-05-13  Alexandre Duret-Lutz  <adl@gnu.org>
 
 	* automake.in (generate_makefile): Do not output Makefile.in on
diff --git a/automake.in b/automake.in
index 929ab677e..e4f2fedde 100755
--- a/automake.in
+++ b/automake.in
@@ -2348,6 +2348,9 @@ sub handle_libraries
       $var->requires_variables ('library used', 'RANLIB');
     }
 
+  &define_variable ('AR', 'ar', INTERNAL);
+  &define_variable ('ARFLAGS', 'cru', INTERNAL);
+
   foreach my $pair (@liblist)
     {
       my ($where, $onelib) = @$pair;
diff --git a/lib/am/libs.am b/lib/am/libs.am
index a51b037ef..63e941de8 100644
--- a/lib/am/libs.am
+++ b/lib/am/libs.am
@@ -21,17 +21,6 @@ if %?INSTALL%
 include inst-vars.am
 endif %?INSTALL%
 
-## ----------- ##
-## Variables.  ##
-## ----------- ##
-
-if %?FIRST%
-AR = ar
-ARFLAGS = cru
-## For now this is detected when we see AC_PROG_RANLIB
-## RANLIB = @RANLIB@
-endif %?FIRST%
-
 ## ------------ ##
 ## Installing.  ##
 ## ------------ ##
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d9d419109..760bca1c4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -46,6 +46,7 @@ ansi8.test \
 ansi9.test \
 ansi10.test \
 ar.test \
+ar2.test \
 asm.test \
 autohdr.test \
 autohdr2.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 6a73928f9..bb3a32c61 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -163,6 +163,7 @@ ansi8.test \
 ansi9.test \
 ansi10.test \
 ar.test \
+ar2.test \
 asm.test \
 autohdr.test \
 autohdr2.test \
diff --git a/tests/ar2.test b/tests/ar2.test
new file mode 100755
index 000000000..926d265f5
--- /dev/null
+++ b/tests/ar2.test
@@ -0,0 +1,42 @@
+#! /bin/sh
+# Copyright (C) 2004  Free Software Foundation, Inc.
+#
+# This file is part of GNU Automake.
+#
+# GNU Automake is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# GNU Automake is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Automake; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# Make sure AR and ARFLAGS are defined for EXTRA_LIBRARIES.
+# Report from Kevin Ryde.
+
+. ./defs || exit 1
+
+set -e
+
+cat >> configure.in << 'END'
+AC_PROG_CC
+AC_PROG_RANLIB
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+EXTRA_LIBRARIES = libfoo.a
+libfoo_a_SOURCES = foo.c
+END
+
+$ACLOCAL
+$AUTOMAKE
+grep 'ARFLAGS =' Makefile.in
+grep 'AR =' Makefile.in
-- 
2.47.2