View | Details | Raw Unified
Collapse All | Expand All

(-)a/autoconf/bin/autoreconf.in (-2 / +27 lines)
 Lines 58-64   use strict; Link Here 
58
$help = "Usage: $0 [OPTION] ... [CONFIGURE-AC or DIRECTORY] ...
58
$help = "Usage: $0 [OPTION] ... [CONFIGURE-AC or DIRECTORY] ...
59
59
60
Run `autoconf' (and `autoheader', `aclocal', `automake', `autopoint'
60
Run `autoconf' (and `autoheader', `aclocal', `automake', `autopoint'
61
(formerly `gettextize'), and `libtoolize' where appropriate)
61
(formerly `gettextize'), `libtoolize', and `intltoolize' where appropriate)
62
repeatedly to remake the GNU Build System files in the DIRECTORIES or
62
repeatedly to remake the GNU Build System files in the DIRECTORIES or
63
the directory trees driven by CONFIGURE-AC (defaulting to `.').
63
the directory trees driven by CONFIGURE-AC (defaulting to `.').
64
64
 Lines 110-115   my $automake = $ENV{'AUTOMAKE'} || 'automake'; Link Here 
110
my $aclocal    = $ENV{'ACLOCAL'}    || 'aclocal';
110
my $aclocal    = $ENV{'ACLOCAL'}    || 'aclocal';
111
my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize';
111
my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize';
112
my $autopoint  = $ENV{'AUTOPOINT'}  || 'autopoint';
112
my $autopoint  = $ENV{'AUTOPOINT'}  || 'autopoint';
113
my $intltoolize = $ENV{'INTLTOOLIZE'} || 'intltoolize';
113
114
114
# --install -- as --add-missing in other tools.
115
# --install -- as --add-missing in other tools.
115
my $install = 0;
116
my $install = 0;
 Lines 164-170   sub parse_args () Link Here 
164
      for my $prog ($autoconf, $autoheader,
165
      for my $prog ($autoconf, $autoheader,
165
		    $automake, $aclocal,
166
		    $automake, $aclocal,
166
		    $autopoint,
167
		    $autopoint,
167
		    $libtoolize)
168
		    $libtoolize, $intltoolize)
168
	{
169
	{
169
	  xsystem ("$prog --version | sed 1q >&2");
170
	  xsystem ("$prog --version | sed 1q >&2");
170
	  print STDERR "\n";
171
	  print STDERR "\n";
 Lines 186-191   sub parse_args () Link Here 
186
      $automake   .= ' --add-missing';
187
      $automake   .= ' --add-missing';
187
      $automake   .= ' --copy' unless $symlink;
188
      $automake   .= ' --copy' unless $symlink;
188
      $libtoolize .= ' --copy' unless $symlink;
189
      $libtoolize .= ' --copy' unless $symlink;
190
      $intltoolize .= ' --copy' unless $symlink;
189
    }
191
    }
190
  # --force;
192
  # --force;
191
  if ($force)
193
  if ($force)
 Lines 197-202   sub parse_args () Link Here 
197
      $automake   .= ' --force-missing';
199
      $automake   .= ' --force-missing';
198
      $autopoint  .= ' --force';
200
      $autopoint  .= ' --force';
199
      $libtoolize .= ' --force';
201
      $libtoolize .= ' --force';
202
      $intltoolize .= ' --force';
200
    }
203
    }
201
  else
204
  else
202
    {
205
    {
 Lines 215-220   sub parse_args () Link Here 
215
      $automake   .= ' --verbose';
218
      $automake   .= ' --verbose';
216
      $aclocal    .= ' --verbose';
219
      $aclocal    .= ' --verbose';
217
      $libtoolize .= ' --debug';
220
      $libtoolize .= ' --debug';
221
      $intltoolize .= ' --debug';
218
    }
222
    }
219
  # --warnings;
223
  # --warnings;
220
  if (@warning)
224
  if (@warning)
 Lines 427-432   sub autoreconf_current_directory () Link Here 
427
  my $uses_gettext_via_traces;
431
  my $uses_gettext_via_traces;
428
  my $uses_libtool;
432
  my $uses_libtool;
429
  my $uses_autoheader;
433
  my $uses_autoheader;
434
  my $uses_intltool;
430
  my @subdir;
435
  my @subdir;
431
  verb "$configure_ac: tracing";
436
  verb "$configure_ac: tracing";
432
  my $traces = new Autom4te::XFile
437
  my $traces = new Autom4te::XFile
 Lines 440-445   sub autoreconf_current_directory () Link Here 
440
	     'AC_INIT',
445
	     'AC_INIT',
441
	     'AC_PROG_LIBTOOL',
446
	     'AC_PROG_LIBTOOL',
442
	     'AM_GNU_GETTEXT',
447
	     'AM_GNU_GETTEXT',
448
	     'IT_PROG_INTLTOOL',
443
	    )
449
	    )
444
     . ' |');
450
     . ' |');
445
  while ($_ = $traces->getline)
451
  while ($_ = $traces->getline)
 Lines 449-454   sub autoreconf_current_directory () Link Here 
449
      $uses_gettext_via_traces = 1  if /AM_GNU_GETTEXT/;
455
      $uses_gettext_via_traces = 1  if /AM_GNU_GETTEXT/;
450
      $uses_libtool = 1             if /AC_PROG_LIBTOOL/;
456
      $uses_libtool = 1             if /AC_PROG_LIBTOOL/;
451
      $uses_autoheader = 1          if /AC_CONFIG_HEADERS/;
457
      $uses_autoheader = 1          if /AC_CONFIG_HEADERS/;
458
      $uses_intltool = 1            if /IT_PROG_INTLTOOL/;
452
      push @subdir, split (' ', $1) if /AC_CONFIG_SUBDIRS:(.*)/;
459
      push @subdir, split (' ', $1) if /AC_CONFIG_SUBDIRS:(.*)/;
453
    }
460
    }
454
461
 Lines 509-514   sub autoreconf_current_directory () Link Here 
509
      verb "$configure_ac: not running libtoolize: --install not given";
516
      verb "$configure_ac: not running libtoolize: --install not given";
510
    }
517
    }
511
518
519
  # -------------------- #
520
  # Running intltoolize.  #
521
  # -------------------- #
522
523
  if (!$uses_intltool)
524
    {
525
      verb "$configure_ac: not using Intltool";
526
    }
527
  elsif ($install)
528
    {
529
      xsystem ($intltoolize);
530
      $rerun_aclocal = 1;
531
    }
532
  else
533
    {
534
      verb "$configure_ac: not running intltoolize: --install not given";
535
    }
536
512
537
513
538
514
  # ------------------- #
539
  # ------------------- #