metaconfig unit linting.

p4raw-id: //depot/perl@16525

diff --git a/reentr.pl b/reentr.pl
index 13c0c2e..5494f78 100644 (file)
--- a/reentr.pl
+++ b/reentr.pl
@@ -170,6 +170,13 @@ while (<DATA>) {
        $prereqsh = "\$$prereqs $prereqh";
     }
     if ($opts{U}) {
+       my @prereq = qw(Inlibc Protochk Hasproto i_systypes usethreads);
+       push @prereq, $prereqs;
+        my $hdrs = "\$i_systypes sys/types.h define stdio.h $prereqsh";
+        if ($h eq 'time') {
+           $hdrs .= " \$i_systime sys/time.h";
+           push @prereq, 'i_systime';
+       }
        print <<EOF;
 ?RCS: \$Id: d_${f}_r.U,v $
 ?RCS:
@@ -180,7 +187,7 @@ while (<DATA>) {
 ?RCS:
 ?RCS: Generated by the reentr.pl from the Perl 5.8 distribution.
 ?RCS:
-?MAKE:d_${f}_r ${f}_r_proto: Inlibc Protochk Hasproto i_systypes i_systime $prereqs usethreads i_pthread
+?MAKE:d_${f}_r ${f}_r_proto: @prereq
 ?MAKE: -pick add \$@ %<
 ?S:d_${f}_r:
 ?S:    This variable conditionally defines the HAS_${F}_R symbol,
@@ -209,10 +216,6 @@ eval \$inlibc
 case "\$d_${f}_r" in
 "\$define")
 EOF
-        my $hdrs = "\$i_systypes sys/types.h define stdio.h $prereqsh";
-        if ($h eq 'time') {
-           $hdrs .= " \$i_systime sys/time.h";
-       }
        print <<EOF;
        hdrs="$hdrs"
        case "\$d_${f}_r_proto:\$usethreads" in