checked in fix for aclocal --output bug

diff --git a/ChangeLog b/ChangeLog
index c3a832cc178142a94b6ef597c2cf063ffa89e041..47e62fb217ffb26f48001db463c291a9b32b4b50 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Feb 11 17:30:01 1998  Tom Tromey  <tromey@cygnus.com>
+
+       * aclocal.in (write_aclocal): Write to $output_file, not
+       aclocal.m4.  From Alexandre Oliva.
+
 Thu Feb  5 13:38:55 1998  Tom Tromey  <tromey@cygnus.com>
 
        * automake.in (scan_one_configure_file): Put CXCPP before CXX in

diff --git a/aclocal.in b/aclocal.in
index 0f51197025e0def9839024c44b888833673c5c21..3117cb861a818b6cbbc0f23614e9ee995e84eebd 100644 (file)
--- a/aclocal.in
+++ b/aclocal.in
@@ -385,8 +385,8 @@ sub write_aclocal
 
     print STDERR "Writing aclocal.m4\n" if $verbosity;
 
-    open (ACLOCAL, "> aclocal.m4")
-       || die "aclocal: couldn't open \`aclocal.m4' for writing: $!\n";
+    open (ACLOCAL, "> " . $output_file)
+       || die "aclocal: couldn't open \`$output_file' for writing: $!\n";
     print ACLOCAL "dnl aclocal.m4 generated automatically by aclocal $VERSION\n";
     print ACLOCAL "\
 dnl Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 66176adfd35a65a9a1c99e3bfbd3d8e4c8192179..e80a87003a144ca18dfd8ec91909cf0d7a5f3cd7 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+Wed Feb 11 17:28:30 1998  Tom Tromey  <tromey@cygnus.com>
+
+       * aclocal.test: New file.
+
 Thu Feb  5 13:22:17 1998  Tom Tromey  <tromey@cygnus.com>
 
        * cxxcpp.test: New file.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8144e9a4e8fb283c6032d8bb97de3d51fcf1a203..3eb85c5186036e79f83c89c2072a63e208eff7e6 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -27,7 +27,7 @@ yaccpp.test texinfo3.test texinfo4.test tagsub.test cxxlibobj.test \
 seenc.test cygwin32.test lisp.test stamph.test ldadd.test \
 version2.test conf2.test cond.test cond2.test xsource.test \
 libobj6.test depend3.test output5.test ammissing.test install.test \
-libobj7.test objc.test cond3.test cxxcpp.test
+libobj7.test objc.test cond3.test cxxcpp.test aclocal.test
 
 EXTRA_DIST = defs $(TESTS)
 

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 3839bb26227126510ebb69e5d25fd449ca60d9bf..f01473f834f68a5401e654e6af4a1a02f59bf53b 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -88,7 +88,7 @@ yaccpp.test texinfo3.test texinfo4.test tagsub.test cxxlibobj.test \
 seenc.test cygwin32.test lisp.test stamph.test ldadd.test \
 version2.test conf2.test cond.test cond2.test xsource.test \
 libobj6.test depend3.test output5.test ammissing.test install.test \
-libobj7.test objc.test cond3.test cxxcpp.test
+libobj7.test objc.test cond3.test cxxcpp.test aclocal.test
 
 EXTRA_DIST = defs $(TESTS)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

diff --git a/tests/aclocal.test b/tests/aclocal.test
new file mode 100755 (executable)
index 0000000..3b423b6
--- /dev/null
+++ b/tests/aclocal.test
@@ -0,0 +1,8 @@
+#! /bin/sh
+
+# Test to make sure that aclocal --output works.  Report from
+# Alexandre Oliva.
+. $srcdir/defs || exit 1
+
+$ACLOCAL --output=fred || exit 1
+test -f fred