_copy() and _remove(): Fixed checking on pattern matching multiple files.

[macros.git] / AutoGen.pm

diff --git a/AutoGen.pm b/AutoGen.pm
index 4d7428f..4bbb8fd 100644 (file)
--- a/AutoGen.pm
+++ b/AutoGen.pm
@@ -38,8 +38,9 @@ BEGIN {
                use File::chdir;        # $CWD
                use File::Touch;        # &touch
                use POSIX qw(WIFEXITED WEXITSTATUS WIFSIGNALED WTERMSIG WIFSTOPPED WSTOPSIG);
+               use File::Glob qw(:glob);       # &bsd_glob, &GLOB_*
 HERE
-               eval "$_\n; 1;" or push @missing,(/^\s*use\s+([^\s;]+)/)[0];
+               eval "$_\n; 1;" or push @missing,(/^\s*use\s+([^ ;]+)/)[0];
                }
        die "You are missing some modules - install them by:\n"
                                        ."\tperl -MCPAN -e 'install qw(".join(" ",@missing).")'\n"
@@ -120,6 +121,9 @@ my(@files)=@_;
 
        my $nocheck=shift @files if $files[0] eq "nocheck";
        my $dest=pop @files;
+       # expand pattern to properly match &copy resulting filenames count
+       @files=map({ bsd_glob $_,&GLOB_ERR|&GLOB_NOSORT; } @files);
+       confess "$!" if $File::Glob::GLOB_ERROR;
        @files==copy @files,$dest or $nocheck or confess "$!";
 }
 
@@ -130,6 +134,9 @@ my(@files)=@_;
 
        my $nocheck=shift @files if $files[0] eq "nocheck";
        my $flag=shift @files if ref $files[0];
+       # expand pattern to properly match &copy resulting filenames count
+       @files=map({ bsd_glob $_,&GLOB_ERR|&GLOB_NOSORT; } @files);
+       confess "$!" if $File::Glob::GLOB_ERROR;
        @files==remove((!$flag ? () : $flag),@files) or $nocheck or confess "$!";
 }
 
@@ -159,7 +166,7 @@ my($class,%args)=@_;
        $spec=~s/\\\n/ /gs;
        $class->run(%Options,
                        "ARGV"=>["--copy"],
-                       "configure_args"=>[split /\s+/,($spec=~/^%configure\s+(.*)$/m)[0]],
+                       "configure_args"=>[split /\s+/,($spec=~/^[%]configure\b[ \t]*(.*)$/m)[0]],
                        );
        _remove "ChangeLog";    # force its rebuild by Makefile/rcs2log
        _system "make dist $name.spec";
@@ -219,7 +226,7 @@ sub _cleanfiles
                                                ./stamp-h ./stamp-h.in ./stamp-h1
                                                ./install-sh
                                                ./aclocal.m4
-                                               ./autom4te-*.cache
+                                               ./autom4te.cache ./autom4te-*.cache
                                                ./m4
                                                ./missing
                                                ./mkinstalldirs
@@ -333,8 +340,10 @@ sub _expandclass
 my($patt)=@_;
 
        return $patt if $patt!~/\Q[\E(.*?)\Q]\E/;
-       my($pre,$post)=($`,$'); # FIXME: local($`,$') doesn't work - why?
-       return map({ _expandclass("$pre$_$post"); } split("",$1));
+       my($pre,$range,$post)=($`,$1,$');       # FIXME: local($`,$1,$') doesn't work - why?
+       1 while $range=~s#(.)-(.)# join("",map(chr,(ord($1)..ord($2))));
+                       #ge;
+       return map({ _expandclass("$pre$_$post"); } split("",$range));
 }
 
 sub run
@@ -429,7 +438,11 @@ my($class,%options)=@_;
                        _writefile $Makefile_in_in,$file;
                        }
                }
-       _system "glib-gettextize",@copy_arg if $Options{"want-glib-gettextize"};
+       if ($Options{"want-glib-gettextize"}) {
+               _system "glib-gettextize",@copy_arg;
+               # "po/ChangeLog" is somehow missing at this point
+               File::Touch->new("atime_only"=>1)->touch("po/ChangeLog");
+               }
        _system "aclocal",map((!$_ ? () : @$_),$Options{"aclocal_args"});
        _system qw(libtoolize),@copy_arg if $Options{"want-libtoolize"};
        _system qw(autoheader) if $Options{"want-autoheader"};