Patch: nolink.test fix

[Tom Tromey]

I'm checking this in.  This fixes nolink.test in the way I suggested
in earlier email.

Tom

Index: ChangeLog
from  Tom Tromey  <address@hidden>

        Fix for nolink.test:
        * tests/Makefile.am (XFAIL_TESTS): Removed nolink.test.
        * lib/am/program.am (%PROGRAM%%EXEEXT%): Use %EXEEXT%.
        * automake.in (am_install_var): Only rewrite PROGRAMS if
        $seen_exeext.
        (make_paragraphs): Always define %EXEEXT%.

Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1147
diff -u -r1.1147 automake.in
--- automake.in 2001/07/04 18:58:33 1.1147
+++ automake.in 2001/07/05 01:16:59
@@ -6802,6 +6802,8 @@
                     'HOST'     => $seen_canonical,
                     'TARGET'   => $seen_canonical == $AC_CANONICAL_SYSTEM,
 
+                    'EXEEXT'   => ($seen_exeext ? '$(EXEEXT)' : ''),
+
                     'LIBTOOL'      => defined $configure_vars{'LIBTOOL'})
          # We don't need more than two consecutive new-lines.
          . 's/\n{3,}/\n\n/g';
@@ -7257,9 +7259,12 @@
            push (@result, $rcurs);
          }
 
-       # A blatant hack: we rewrite each _PROGRAMS primary to
-       # include EXEEXT when in Cygwin32 mode.
-       if ($primary eq 'PROGRAMS')
+       # A blatant hack: we rewrite each _PROGRAMS primary to include
+       # EXEEXT when in Cygwin32 mode.  You might think we could
+       # simply always use $(EXEEXT), since we define it as empty
+       # when it isn't available.  However, it isn't that simple.
+       # See nolink.test.
+       if ($seen_exeext && $primary eq 'PROGRAMS')
          {
            my @conds = &variable_conditions ($one_name);
 
Index: lib/am/program.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/program.am,v
retrieving revision 1.21
diff -u -r1.21 program.am
--- lib/am/program.am 2001/03/28 07:31:05 1.21
+++ lib/am/program.am 2001/07/05 01:16:59
@@ -15,11 +15,11 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
-%PROGRAM%$(EXEEXT): $(%XPROGRAM%_OBJECTS) $(%XPROGRAM%_DEPENDENCIES)
+%PROGRAM%%EXEEXT%: $(%XPROGRAM%_OBJECTS) $(%XPROGRAM%_DEPENDENCIES)
 ## Remove program before linking.  Otherwise the link will fail if the
 ## program is running somewhere.  FIXME: this could be a loss if
 ## you're using an incremental linker.  Maybe we should think twice?
 ## Or maybe not... sadly, incremental linkers are rarer than losing
 ## systems.
-       @rm -f %PROGRAM%$(EXEEXT)
+       @rm -f %PROGRAM%%EXEEXT%
        $(%XLINK%) $(%XPROGRAM%_LDFLAGS) $(%XPROGRAM%_OBJECTS) 
$(%XPROGRAM%_LDADD) $(LIBS)
Index: tests/Makefile.am
===================================================================
RCS file: /cvs/automake/automake/tests/Makefile.am,v
retrieving revision 1.320
diff -u -r1.320 Makefile.am
--- tests/Makefile.am 2001/07/05 00:26:43 1.320
+++ tests/Makefile.am 2001/07/05 01:16:59
@@ -1,6 +1,6 @@
 ## Process this file with automake to create Makefile.in
 
-XFAIL_TESTS = nolink.test subdir5.test
+XFAIL_TESTS = subdir5.test
 
 TESTS =        \
 acinclude.test \