X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=aclocal.in;h=e4465a8bde22e64ec89afe91d3d7b922c5f7559c;hb=636c8076580a538799f07966b9bd18c7f157db32;hp=941c141245524e3b934c4b1e1a5c036b0f8036b5;hpb=447ca35b63bc0eb89a69f228c21868ecca6cb50e;p=platform%2Fupstream%2Fautomake.git diff --git a/aclocal.in b/aclocal.in index 941c141..e4465a8 100644 --- a/aclocal.in +++ b/aclocal.in @@ -2,11 +2,13 @@ # -*- perl -*- # @configure_input@ -eval 'exec @PERL@ -S $0 ${1+"$@"}' +eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' if 0; # aclocal - create aclocal.m4 by scanning configure.ac -# Copyright 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +# Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -23,47 +25,58 @@ eval 'exec @PERL@ -S $0 ${1+"$@"}' # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. -# Written by Tom Tromey . +# Written by Tom Tromey . BEGIN { - my $prefix = "@prefix@"; - my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@-@VERSION@"; - unshift @INC, "$perllibdir"; + my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@'; + unshift @INC, (split ':', $perllibdir); } +use Automake::Config; use Automake::General; +use Automake::Configure_ac; use Automake::XFile; +use Automake::FileUtils; +use File::stat; -# Some constants. -$VERSION = "@VERSION@"; -$PACKAGE = "@PACKAGE@"; -$prefix = "@prefix@"; # Note that this isn't pkgdatadir, but a separate directory. # Note also that the versioned directory is handled later. -$acdir = "@datadir@/aclocal"; +$acdir = '@datadir@/aclocal'; $default_acdir = $acdir; +# contains a list of directories, one per line, to be added +# to the dirlist in addition to $acdir, as if -I had been +# added to the command line. If acdir has been redirected, +# we will also check the specified acdir (this is done later). +$default_dirlist = "$default_acdir/dirlist"; # Some globals. +# configure.ac or configure.in. +my $configure_ac = require_configure_ac; + # Exit status. $exit_status = 0; -# Name of the top autoconf input: `configure.ac' or `configure.in'. -$configure_ac = find_configure_ac; - -# Text to output. -$output = ''; - # Output file name. $output_file = 'aclocal.m4'; +# Modification time of the youngest dependency. +$greatest_mtime = 0; + +# Option --force. +$force_output = 0; + # Which macros have been seen. %macro_seen = (); # Which files have been seen. %file_seen = (); +# Remember the order into which we scanned the files. +# It's important to output the contents of aclocal.m4 in the opposite order. +@file_order = (); + # Map macro names to file names. %map = (); @@ -73,50 +86,17 @@ $output_file = 'aclocal.m4'; # How much to say. $verbose = 0; -# Map from obsolete macros to hints for new macros. -# If you change this, change the corresponding list in automake.in. -# FIXME: should just put this into a single file. -my %obsolete_macros = - ( - 'AC_FEATURE_CTYPE' => "use `AC_HEADER_STDC'", - 'AC_FEATURE_ERRNO' => "add `strerror' to `AC_REPLACE_FUNCS(...)'", - 'AC_FEATURE_EXIT' => '', - 'AC_SYSTEM_HEADER' => '', - - # Note that we do not handle this one, because it is still run - # from AM_CONFIG_HEADER. So we deal with it specially in - # &scan_autoconf_files. - # 'AC_CONFIG_HEADER' => "use `AM_CONFIG_HEADER'", - - 'fp_C_PROTOTYPES' => "use `AM_C_PROTOTYPES'", - 'fp_PROG_CC_STDC' => "use `AM_PROG_CC_STDC'", - 'fp_PROG_INSTALL' => "use `AC_PROG_INSTALL'", - 'fp_WITH_DMALLOC' => "use `AM_WITH_DMALLOC'", - 'fp_WITH_REGEX' => "use `AM_WITH_REGEX'", - 'gm_PROG_LIBTOOL' => "use `AM_PROG_LIBTOOL'", - 'jm_MAINTAINER_MODE' => "use `AM_MAINTAINER_MODE'", - 'md_TYPE_PTRDIFF_T' => "add `ptrdiff_t' to `AC_CHECK_TYPES(...)'", - 'ud_PATH_LISPDIR' => "use `AM_PATH_LISPDIR'", - 'ud_GNU_GETTEXT' => "use `AM_GNU_GETTEXT'", - - # Now part of autoconf proper, under a different name. - 'fp_FUNC_FNMATCH' => "use `AC_FUNC_FNMATCH'", - 'AM_SANITY_CHECK_CC' => "automatically done by `AC_PROG_CC'", - 'AM_PROG_INSTALL' => "use `AC_PROG_INSTALL'", - 'AM_EXEEXT' => "automatically done by `AC_PROG_(CC|CXX|F77)'", - 'AM_CYGWIN32' => "use `AC_CYGWIN'", - 'AM_MINGW32' => "use `AC_MINGW32'", - 'AM_FUNC_MKTIME' => "use `AC_FUNC_MKTIME'", - ); - -# Regexp to match the above macros. -$obsolete_rx = '\b(' . join ('|', keys %obsolete_macros) . ')\b'; - # Matches a macro definition. -$ac_defun_rx = "AC_DEFUN\\(\\[?([^],)\n]+)\\]?"; +# AC_DEFUN([macroname], ...) +# or +# AC_DEFUN(macroname, ...) +# When macroname is `['-quoted , we accept any character in the name, +# except `]'. Otherwise macroname stops on the first `]', `,', `)', +# or `\n' encountered. +$ac_defun_rx = "A[CU]_DEFUN\\((?:\\[([^]]+)\\]|([^],)\n]+))"; # Matches an AC_REQUIRE line. -$ac_require_rx = "AC_REQUIRE\\(\\[?([^])]*)\\]?\\)"; +$ac_require_rx = "AC_REQUIRE\\((?:\\[([^]]+)\\]|([^],)\n]+))\\)"; @@ -124,9 +104,10 @@ local (@dirlist) = &parse_arguments (@ARGV); &scan_m4_files (@dirlist); &scan_configure; if (! $exit_status) -{ - &write_aclocal; -} + { + my %macro_traced = &trace_used_macros; + &write_aclocal ($output_file, keys %macro_traced); + } &check_acinclude; exit $exit_status; @@ -134,7 +115,7 @@ exit $exit_status; ################################################################ # Print usage and exit. -sub usage +sub usage ($) { local ($status) = @_; @@ -145,6 +126,7 @@ Generate `aclocal.m4' by scanning `configure.ac' or `configure.in' --acdir=DIR directory holding config files --help print this help, then exit -I DIR add directory to search list for .m4 files + --force always update output file --output=FILE put output in FILE (default aclocal.m4) --print-ac-dir print name of directory holding m4 files --verbose don't be silent @@ -156,7 +138,7 @@ Report bugs to .\n"; } # Parse command line. -sub parse_arguments +sub parse_arguments (@) { local (@arglist) = @_; local (@dirlist); @@ -181,6 +163,10 @@ sub parse_arguments { $print_and_exit = 1; } + elsif ($arglist[0] eq '--force') + { + $force_output = 1; + } elsif ($arglist[0] eq '--verbose') { ++$verbose; @@ -188,10 +174,10 @@ sub parse_arguments elsif ($arglist[0] eq '--version') { print "aclocal (GNU $PACKAGE) $VERSION\n\n"; - print "Copyright 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.\n"; + print "Copyright (C) 2003 Free Software Foundation, Inc.\n"; print "This is free software; see the source for copying conditions. There is NO\n"; print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"; - print "Written by Tom Tromey \n"; + print "Written by Tom Tromey \n"; exit 0; } elsif ($arglist[0] eq '--help') @@ -200,7 +186,8 @@ sub parse_arguments } else { - die "aclocal: unrecognized option -- `$arglist[0]'\nTry `aclocal --help' for more information.\n"; + print STDERR "aclocal: unrecognized option -- `$arglist[0]'\nTry `aclocal --help' for more information.\n"; + exit 1; } shift (@arglist); @@ -212,10 +199,13 @@ sub parse_arguments exit 0; } + $default_dirlist="$acdir/dirlist" + if $acdir ne $default_acdir; + # Search the versioned directory near the end, and then the # unversioned directory last. Only do this if the user didn't # override acdir. - push (@dirlist, "$acdir-$VERSION") + push (@dirlist, "$acdir-$APIVERSION") if $acdir eq $default_acdir; # By default $(datadir)/aclocal doesn't exist. We don't want to @@ -224,62 +214,71 @@ sub parse_arguments push (@dirlist, $acdir) unless $acdir eq $default_acdir && ! -d $acdir; + # Finally, adds any directory listed in the `dirlist' file. + if (open (DEFAULT_DIRLIST, $default_dirlist)) + { + while () + { + # Ignore '#' lines. + next if /^#/; + # strip off newlines and end-of-line comments + s/\s*\#.*$//; + chomp ($contents=$_); + if (-d $contents ) + { + push (@dirlist, $contents); + } + } + close (DEFAULT_DIRLIST); + } + return @dirlist; } ################################################################ -sub scan_configure +sub scan_configure () { - die "aclocal: `configure.ac' or `configure.in' is required\n" - if !$configure_ac; + if (! open (CONFIGURE, $configure_ac)) + { + print STDERR "aclocal: couldn't open `$configure_ac': $!\n"; + exit 1; + } - open (CONFIGURE, $configure_ac) - || die "aclocal: couldn't open `$configure_ac': $!\n"; + my $mtime = mtime $configure_ac; + $greatest_mtime = $mtime if $greatest_mtime < $mtime; - # Make sure we include acinclude.m4 if it exists. - if (-f 'acinclude.m4') + # Make sure we include acinclude.m4 if it exists. + if (-f 'acinclude.m4') { - &add_file ('acinclude.m4'); + &add_file ('acinclude.m4'); } - while () + while () { - # Remove comments from current line. - s/\bdnl\b.*$//; - s/\#.*$//; - - if (/$obsolete_rx/o) + # Remove comments from current line. + s/\bdnl\b.*$//; + s/\#.*$//; + + # Search for things we know about. The "search" sub is + # constructed dynamically by scan_m4_files. The last + # parenthetical match makes sure we don't match things that + # look like macro assignments or AC_SUBSTs. + if (! &search && /(^|\s+)(AM_[A-Z0-9_]+)($|[^\]\)=A-Z0-9_])/) { - local ($hint) = ''; - if ($obsolete_macros{$1} ne '') - { - $hint = '; ' . $obsolete_macros{$1}; - } - warn "aclocal: $configure_ac: $.: `$1' is obsolete$hint\n"; - $exit_status = 1; - next; - } - - # Search for things we know about. The "search" sub is - # constructed dynamically by scan_m4_files. The last - # parenthethical match makes sure we don't match things that - # look like macro assignments or AC_SUBSTs. - if (! &search && /(^|\s+)(AM_[A-Z0-9_]+)($|[^\]\)=A-Z0-9_])/) - { - # Macro not found, but AM_ prefix found. - warn "aclocal: $configure_ac: $.: macro `$2' not found in library\n"; - $exit_status = 1; + # Macro not found, but AM_ prefix found. + warn "aclocal: $configure_ac: $.: macro `$2' not found in library\n"; + $exit_status = 1; } } - close (CONFIGURE); + close (CONFIGURE); } ################################################################ # Check macros in acinclude.m4. If one is not used, warn. -sub check_acinclude +sub check_acinclude () { local ($key); @@ -297,7 +296,7 @@ sub check_acinclude ################################################################ # Scan all the installed m4 files and construct a map. -sub scan_m4_files +sub scan_m4_files (@) { local (@dirlist) = @_; @@ -310,10 +309,16 @@ sub scan_m4_files local ($m4dir); foreach $m4dir (@dirlist) { - opendir (DIR, $m4dir) - || die "aclocal: couldn't open directory `$m4dir': $!\n"; + if (! opendir (DIR, $m4dir)) + { + print STDERR "aclocal: couldn't open directory `$m4dir': $!\n"; + exit 1; + } + local ($file, $fullfile); - foreach $file (sort grep (! /^\./, readdir (DIR))) + # We reverse the directory contents so that foo2.m4 gets + # used in preference to foo1.m4. + foreach $file (reverse sort grep (! /^\./, readdir (DIR))) { # Only examine .m4 files. next unless $file =~ /\.m4$/; @@ -328,15 +333,13 @@ sub scan_m4_files } # Construct a new function that does the searching. We use a - # function (instead of just evalling $search in the loop) so that + # function (instead of just evaluating $search in the loop) so that # "die" is correctly and easily propagated if run. my $search = "sub search {\nmy \$found = 0;\n"; foreach my $key (reverse sort keys %map) { - # EXPR is a regexp matching the name of the macro. - (my $expr = $key) =~ s/(\W)/\\$1/g; - $search .= ('if (/\b' . $key . '\b/) { & add_macro (' . $key - . '); $found = 1; }' . "\n"); + $search .= ('if (/\b\Q' . $key . '\E(?!\w)/) { & add_macro ("' . $key + . '"); $found = 1; }' . "\n"); } $search .= "return \$found;\n};\n"; eval $search; @@ -346,7 +349,7 @@ sub scan_m4_files ################################################################ # Add a macro to the output. -sub add_macro +sub add_macro ($) { local ($macro) = @_; @@ -368,96 +371,184 @@ sub add_macro } # Add a file to output. -sub add_file +sub add_file ($) { - local ($file) = @_; + local ($file) = @_; + + # Only add a file once. + return if ($file_seen{$file}); + $file_seen{$file} = 1; - # Only add a file once. - return if ($file_seen{$file}); - $file_seen{$file} = 1; + my $mtime = mtime $file; + $greatest_mtime = $mtime if $greatest_mtime < $mtime; - $output .= $file_contents{$file} . "\n"; - local ($a, @rlist); - foreach (split ("\n", $file_contents{$file})) + # If the file to add looks like path outside the project, + # copy it to the output. + # The regex catches filenames starting with things like + # / \ c:\ ../ ./../ etc. + if ($file =~ m,^(?:(?:\w:)?[\\/]|(?:\.[\\/]+)*\.\.[\\/]),) + { + $output .= $file_contents{$file} . "\n"; + } + else + { + # Otherwise, simply include the file. + $output .= "m4_include([$file])\n"; + } + my (@rlist); + foreach (split ("\n", $file_contents{$file})) { - # This is a hack for Perl 4. - $a = $_; - if ($a =~ /$ac_require_rx/g) + # Remove comments from current line. + s/\bdnl\b.*$//; + s/\#.*$//; + + if (/$ac_require_rx/g) { - push (@rlist, $1); + push (@rlist, $1 || $2); } - # Remove comments from current line. - s/\bdnl\b.*$//; - s/\#.*$//; - - # The search function is constructed dynamically by - # scan_m4_files. The last parenthethical match makes sure we - # don't match things that look like macro assignments or - # AC_SUBSTs. - if (! &search && /(^|\s+)(AM_[A-Z0-9_]+)($|[^\]\)=A-Z0-9_])/) + # The search function is constructed dynamically by + # scan_m4_files. The last parenthetical match makes sure we + # don't match things that look like macro assignments or + # AC_SUBSTs. + if (! &search && /(^|\s+)(AM_[A-Z0-9_]+)($|[^\]\)=A-Z0-9_])/) { - # Macro not found, but AM_ prefix found. - warn "aclocal: $configure_ac: $.: macro `$2' not found in library\n"; - $exit_status = 1; + # Macro not found, but AM_ prefix found. + warn "aclocal: $configure_ac: $.: macro `$2' not found in library\n"; + $exit_status = 1; } } - local ($macro); - foreach $macro (@rlist) + local ($macro); + foreach $macro (@rlist) { - &add_macro ($macro); + &add_macro ($macro); } } +# Point to the documentation for underquoted AC_DEFUN only once. +my $underquoted_manual_once = 0; + # Scan a single M4 file. Return contents. -sub scan_file +sub scan_file ($) { - local ($file) = @_; + local ($file) = @_; - my $fh = new Automake::XFile $file; - my $contents = ''; - while ($_ = $fh->getline) + unshift @file_order, $file; + + my $fh = new Automake::XFile $file; + my $contents = ''; + while ($_ = $fh->getline) { - # Ignore `##' lines. - next if /^##/; + # Ignore `##' lines. + next if /^##/; - $contents .= $_; + $contents .= $_; - if (/$ac_defun_rx/) + if (/$ac_defun_rx/) { - if (! defined $map{$1}) + if (! defined $1) { - $map{$1} = $file; + print STDERR "$file:$.: underquoted definition of $2\n"; + print STDERR "$file:$.: run info '(automake)Extending aclocal'\n" + . "or see http://sources.redhat.com/automake/" + . "automake.html#Extending%20aclocal\n" + unless $underquoted_manual_once; + $underquoted_manual_once = 1; + } + if (! defined $map{$1 || $2}) + { + print STDERR "aclocal: found macro $1 in $file: $.\n" + if $verbose; + $map{$1 || $2} = $file; + } + else + { + # Note: we used to give an error here if we saw a + # duplicated macro. However, this turns out to be + # extremely unpopular. It causes actual problems which + # are hard to work around, especially when you must + # mix-and-match tool versions. + print STDERR "aclocal: ignoring macro $1 in $file: $.\n" + if $verbose; } - - # Note: we used to give an error here if we saw a - # duplicated macro. However, this turns out to be - # extremely unpopular. It causes actual problems which - # are hard to work around, especially when you must - # mix-and-match tool versions. - - print STDERR "aclocal: found macro $1 in $file: $.\n" if $verbose; } } - return $contents; + return $contents; +} + +sub trace_used_macros ($) +{ + my ($filename) = @_; + + my %files = map { $map{$_} => 1 } keys %macro_seen; + + my $traces = ($ENV{AUTOM4TE} || 'autom4te'); + $traces .= " --language Autoconf-without-aclocal-m4 $filename "; + # All candidate files. + $traces .= join (' ', grep { exists $files{$_} } @file_order) . " "; + # All candidate macros. + $traces .= join (' ', map { "--trace='$_:\$n'" } (keys %macro_seen)); + + print STDERR "aclocal: running $traces $configure_ac\n" if $verbose; + + my $tracefh = new Automake::XFile ("$traces $configure_ac |"); + + my %traced = (); + + while ($_ = $tracefh->getline) + { + chomp; + $traced{$_} = 1 if $macro_seen{$_}; + } + return %traced; } ################################################################ # Write output. -sub write_aclocal +sub write_aclocal ($@) { - return if ! length ($output); + my ($output_file, @macros) = @_; + my $output = ''; - print STDERR "aclocal: writing $output_file\n" if $verbose; + my %files = map { $map{$_} => 1 } @macros; + $files{'acinclude.m4'} = 1 if -f 'acinclude.m4'; - my $out = new Automake::XFile "> $output_file"; - print $out -"# $output_file generated automatically by aclocal $VERSION -*- Autoconf -*- + for $file (grep { exists $files{$_} } @file_order) + { + my $mtime = mtime $file; + $greatest_mtime = $mtime if $greatest_mtime < $mtime; + + # If the file to add looks like path outside the project, + # copy it to the output. + # The regex catches filenames starting with things like + # / \ c:\ ../ ./../ etc. + if ($file =~ m,^(?:(?:\w:)?[\\/]|(?:\.[\\/]+)*\.\.[\\/]),) + { + $output .= $file_contents{$file} . "\n"; + } + else + { + # Otherwise, simply include the file. + $output .= "m4_include([$file])\n"; + } + } -# Copyright 1996, 1997, 1998, 1999, 2000, 2001 + # Nothing to output?! + # FIXME: Shouldn't we diagnose this? + return if ! length ($output); + + # We used to print `# $output_file generated automatically etc.' But + # this creates spurious differences when using autoreconf. Autoreconf + # creates aclocal.m4t and then rename it to aclocal.m4, but the + # rebuild rules generated by Automake create aclocal.m4 directly -- + # this would gives two ways to get the same file, with a different + # name in the header. + $output = "# generated automatically by aclocal $VERSION -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -469,4 +560,46 @@ sub write_aclocal # PARTICULAR PURPOSE. $output"; + + # We try not to update $output_file unless necessary, because + # doing so invalidate Autom4te's cache and therefore slows down + # tools called after aclocal. + # + # We need to overwrite $output_file in the following situations. + # * The --force option is in use. + # * One of the dependencies is younger. + # (Not updating $output_file in this situation would cause + # make to call aclocal in loop.) + # * The contents of the current file are different from what + # we have computed. + if (!$force_output + && $greatest_mtime < mtime ($output_file) + && $output eq contents ($output_file)) + { + print STDERR "aclocal: $output_file unchanged\n" if $verbose; + return; + } + + print STDERR "aclocal: writing $output_file\n" if $verbose; + + my $out = new Automake::XFile "> $output_file"; + print $out $output; + return; } + +### Setup "GNU" style for perl-mode and cperl-mode. +## Local Variables: +## perl-indent-level: 2 +## perl-continued-statement-offset: 2 +## perl-continued-brace-offset: 0 +## perl-brace-offset: 0 +## perl-brace-imaginary-offset: 0 +## perl-label-offset: -2 +## cperl-indent-level: 2 +## cperl-brace-offset: 0 +## cperl-continued-brace-offset: 0 +## cperl-label-offset: -2 +## cperl-extra-newline-before-brace: t +## cperl-merge-trailing-else: nil +## cperl-continued-statement-offset: 2 +## End: