* automake.in (define_configure_variable): Define a user macro,

	not an automake macro.
	* tests/Makefile.am (TESTS): Added ar.test.
	* tests/ar.test: New file.

diff --git a/ChangeLog b/ChangeLog
index 133f3382027a11fb3c047abd0933d17a0a30e376..0a3fc9184be190fb711f10dcf79a05730d57a915 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2001-12-30  Tom Tromey  <tromey@redhat.com>
 
+       * automake.in (define_configure_variable): Define a user macro,
+       not an automake macro.
+       * tests/Makefile.am (TESTS): Added ar.test.
+       * tests/ar.test: New file.
+
        For PR automake/211:
        * automake.in (object_compilation_map): New global.
        (initialize_per_input): Initialize it.

diff --git a/automake.in b/automake.in
index 725e871c8867296a472b3a4694e330eef2b20f56..2ece1281963f887dc90a860f529aff483538b44b 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -6624,7 +6624,13 @@ sub define_variable ($$)
 sub define_configure_variable ($)
 {
     my ($var) = @_;
-    define_variable ($var, subst $var);
+    if (! variable_defined ($var, 'TRUE'))
+    {
+       # A macro defined via configure is a `user' macro -- we should not
+       # override it.
+       macro_define ($var, 0, '', 'TRUE', subst $var, undef);
+       variable_pretty_output ($var, 'TRUE');
+    }
 }
 
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6472ffe16a5e315e367cf6fbab228d8a28f4503a..4263cf1333e52de67470af93bf33f469b8f6dea5 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -24,6 +24,7 @@ ansi2.test \
 ansi3.test \
 ansi4.test \
 ansi5.test \
+ar.test \
 asm.test \
 auxdir.test \
 auxdir2.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 6e69068f8cfbe4a011d2bc22f9decebaaa7064dc..23e9de9ed6a2c2e9ca0c08dbdab4194c26d19daf 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -97,6 +97,7 @@ ansi2.test \
 ansi3.test \
 ansi4.test \
 ansi5.test \
+ar.test \
 asm.test \
 auxdir.test \
 auxdir2.test \

diff --git a/tests/ar.test b/tests/ar.test
new file mode 100755 (executable)
index 0000000..60c1f47
--- /dev/null
+++ b/tests/ar.test
@@ -0,0 +1,25 @@
+#! /bin/sh
+
+# Test for setting AR in configure.in.
+
+. $srcdir/defs || exit 1
+
+cat > configure.in << 'END'
+AC_INIT
+AM_INIT_AUTOMAKE($me, 1.0)
+AC_PROG_CC
+AC_PROG_RANLIB
+AC_PATH_PROG(AR, arppc)
+AC_CONFIG_FILES(Makefile)
+END
+
+cat > Makefile.am << 'END'
+lib_LIBRARIES = libfoo.a
+libfoo_a_SOURCES = maude.c
+END
+
+$ACLOCAL || exit 1
+$AUTOMAKE || exit 1
+
+grep 'AR = ar' Makefile.in && exit 1
+exit 0