* autoscan.pl (&find_configure_ac): New.

This commit is contained in:
Akim Demaille 2001-02-21 08:47:16 +00:00
parent a70d38879b
commit 3fd60be7b0
4 changed files with 91 additions and 51 deletions

View File

@ -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

View File

@ -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;

View File

@ -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;

View File

@ -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;