mirror of
git://git.sv.gnu.org/autoconf
synced 2025-03-19 14:40:24 +08:00
* autoscan.pl (&find_configure_ac): New.
This commit is contained in:
parent
a70d38879b
commit
3fd60be7b0
@ -1,3 +1,7 @@
|
||||
2001-02-21 Akim Demaille <akim@epita.fr>
|
||||
|
||||
* autoscan.pl (&find_configure_ac): New.
|
||||
|
||||
2001-02-20 Paul Martinolich <martinol@datasync.com>
|
||||
|
||||
* autoscan.pl (check_configure_ac): Pretty missing macro warnings
|
||||
|
46
autoscan.in
46
autoscan.in
@ -75,11 +75,11 @@ sub find_autoconf
|
||||
# We test "$dir/autoconf" in case we are in the build tree, in which case
|
||||
# the names are not transformed yet.
|
||||
foreach my $file ($ENV{"AUTOCONF"} || '',
|
||||
"$dir/@autoconf-name@",
|
||||
"$dir/autoconf",
|
||||
"@bindir@/@autoconf-name@")
|
||||
"$dir/@autoconf-name@",
|
||||
"$dir/autoconf",
|
||||
"@bindir@/@autoconf-name@")
|
||||
{
|
||||
if (-f $file)
|
||||
if (-x $file)
|
||||
{
|
||||
$autoconf = $file;
|
||||
last;
|
||||
@ -88,6 +88,28 @@ sub find_autoconf
|
||||
}
|
||||
|
||||
|
||||
# $CONFIGURE_AC
|
||||
# &find_configure_ac ()
|
||||
# ---------------------
|
||||
sub find_configure_ac ()
|
||||
{
|
||||
if (-f 'configure.ac')
|
||||
{
|
||||
if (-f 'configure.in')
|
||||
{
|
||||
warn "warning: `configure.ac' and `configure.in' both present.\n";
|
||||
warn "warning: proceeding with `configure.ac'.\n";
|
||||
}
|
||||
return 'configure.ac';
|
||||
}
|
||||
elsif (-f 'configure.in')
|
||||
{
|
||||
return 'configure.in';
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
# print_usage ()
|
||||
# --------------
|
||||
# Display usage (--help).
|
||||
@ -632,25 +654,15 @@ sub check_configure_ac ($)
|
||||
|
||||
# Find the lib files and autoconf.
|
||||
find_autoconf;
|
||||
|
||||
my $configure_ac = find_configure_ac;
|
||||
parse_args;
|
||||
init_tables;
|
||||
find ('.');
|
||||
scan_files;
|
||||
output ('configure.scan');
|
||||
|
||||
if (-f 'configure.ac')
|
||||
if ($configure_ac)
|
||||
{
|
||||
if (-f 'configure.in')
|
||||
{
|
||||
warn "warning: `configure.ac' and `configure.in' both present.\n";
|
||||
warn "warning: proceeding with `configure.ac'.\n";
|
||||
}
|
||||
check_configure_ac ('configure.ac');
|
||||
}
|
||||
elsif (-f 'configure.in')
|
||||
{
|
||||
check_configure_ac ('configure.in');
|
||||
check_configure_ac ($configure_ac);
|
||||
}
|
||||
|
||||
exit 0;
|
||||
|
46
autoscan.pl
46
autoscan.pl
@ -75,11 +75,11 @@ sub find_autoconf
|
||||
# We test "$dir/autoconf" in case we are in the build tree, in which case
|
||||
# the names are not transformed yet.
|
||||
foreach my $file ($ENV{"AUTOCONF"} || '',
|
||||
"$dir/@autoconf-name@",
|
||||
"$dir/autoconf",
|
||||
"@bindir@/@autoconf-name@")
|
||||
"$dir/@autoconf-name@",
|
||||
"$dir/autoconf",
|
||||
"@bindir@/@autoconf-name@")
|
||||
{
|
||||
if (-f $file)
|
||||
if (-x $file)
|
||||
{
|
||||
$autoconf = $file;
|
||||
last;
|
||||
@ -88,6 +88,28 @@ sub find_autoconf
|
||||
}
|
||||
|
||||
|
||||
# $CONFIGURE_AC
|
||||
# &find_configure_ac ()
|
||||
# ---------------------
|
||||
sub find_configure_ac ()
|
||||
{
|
||||
if (-f 'configure.ac')
|
||||
{
|
||||
if (-f 'configure.in')
|
||||
{
|
||||
warn "warning: `configure.ac' and `configure.in' both present.\n";
|
||||
warn "warning: proceeding with `configure.ac'.\n";
|
||||
}
|
||||
return 'configure.ac';
|
||||
}
|
||||
elsif (-f 'configure.in')
|
||||
{
|
||||
return 'configure.in';
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
# print_usage ()
|
||||
# --------------
|
||||
# Display usage (--help).
|
||||
@ -632,25 +654,15 @@ sub check_configure_ac ($)
|
||||
|
||||
# Find the lib files and autoconf.
|
||||
find_autoconf;
|
||||
|
||||
my $configure_ac = find_configure_ac;
|
||||
parse_args;
|
||||
init_tables;
|
||||
find ('.');
|
||||
scan_files;
|
||||
output ('configure.scan');
|
||||
|
||||
if (-f 'configure.ac')
|
||||
if ($configure_ac)
|
||||
{
|
||||
if (-f 'configure.in')
|
||||
{
|
||||
warn "warning: `configure.ac' and `configure.in' both present.\n";
|
||||
warn "warning: proceeding with `configure.ac'.\n";
|
||||
}
|
||||
check_configure_ac ('configure.ac');
|
||||
}
|
||||
elsif (-f 'configure.in')
|
||||
{
|
||||
check_configure_ac ('configure.in');
|
||||
check_configure_ac ($configure_ac);
|
||||
}
|
||||
|
||||
exit 0;
|
||||
|
@ -75,11 +75,11 @@ sub find_autoconf
|
||||
# We test "$dir/autoconf" in case we are in the build tree, in which case
|
||||
# the names are not transformed yet.
|
||||
foreach my $file ($ENV{"AUTOCONF"} || '',
|
||||
"$dir/@autoconf-name@",
|
||||
"$dir/autoconf",
|
||||
"@bindir@/@autoconf-name@")
|
||||
"$dir/@autoconf-name@",
|
||||
"$dir/autoconf",
|
||||
"@bindir@/@autoconf-name@")
|
||||
{
|
||||
if (-f $file)
|
||||
if (-x $file)
|
||||
{
|
||||
$autoconf = $file;
|
||||
last;
|
||||
@ -88,6 +88,28 @@ sub find_autoconf
|
||||
}
|
||||
|
||||
|
||||
# $CONFIGURE_AC
|
||||
# &find_configure_ac ()
|
||||
# ---------------------
|
||||
sub find_configure_ac ()
|
||||
{
|
||||
if (-f 'configure.ac')
|
||||
{
|
||||
if (-f 'configure.in')
|
||||
{
|
||||
warn "warning: `configure.ac' and `configure.in' both present.\n";
|
||||
warn "warning: proceeding with `configure.ac'.\n";
|
||||
}
|
||||
return 'configure.ac';
|
||||
}
|
||||
elsif (-f 'configure.in')
|
||||
{
|
||||
return 'configure.in';
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
# print_usage ()
|
||||
# --------------
|
||||
# Display usage (--help).
|
||||
@ -632,25 +654,15 @@ sub check_configure_ac ($)
|
||||
|
||||
# Find the lib files and autoconf.
|
||||
find_autoconf;
|
||||
|
||||
my $configure_ac = find_configure_ac;
|
||||
parse_args;
|
||||
init_tables;
|
||||
find ('.');
|
||||
scan_files;
|
||||
output ('configure.scan');
|
||||
|
||||
if (-f 'configure.ac')
|
||||
if ($configure_ac)
|
||||
{
|
||||
if (-f 'configure.in')
|
||||
{
|
||||
warn "warning: `configure.ac' and `configure.in' both present.\n";
|
||||
warn "warning: proceeding with `configure.ac'.\n";
|
||||
}
|
||||
check_configure_ac ('configure.ac');
|
||||
}
|
||||
elsif (-f 'configure.in')
|
||||
{
|
||||
check_configure_ac ('configure.in');
|
||||
check_configure_ac ($configure_ac);
|
||||
}
|
||||
|
||||
exit 0;
|
||||
|
Loading…
x
Reference in New Issue
Block a user