* bin/autom4te.in, lib/autom4te.in, bin/autoconf.in:

s/--set/--language/.

diff --git a/ChangeLog b/ChangeLog
index a244139b940dab5f7bca8c27285116a0e5253387..b11a15e77584d96a4f6cacf424511fdf4bb00136 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-29  Akim Demaille  <akim@epita.fr>
+
+       * bin/autom4te.in, lib/autom4te.in, bin/autoconf.in:
+       s/--set/--language/.
+
 2001-08-29  Akim Demaille  <akim@epita.fr>
 
        * doc/autoconf.texi: Strip the @nodes.

diff --git a/bin/autoconf.in b/bin/autoconf.in
index 00f5df57157eda6ab05d0a58ffc2cd79386bfbfa..08c0025703137d049a82eaaee4fc277bf583871d 100644 (file)
--- a/bin/autoconf.in
+++ b/bin/autoconf.in
@@ -233,7 +233,7 @@ run_autom4te="$autom4te "\
 `$verbose "--verbose "`\
 `$debug && echo "--debug "`\
 `$force && echo "--force "`\
-"--set=autoconf "\
+"--language=autoconf "\
 "--include=$localdir "\
 `test -n "$warnings" && echo "--warning=$warnings "`\
 "--output=$outfile "\

diff --git a/bin/autom4te.in b/bin/autom4te.in
index 91cb04ed89148e2d1f97d8a2c56da593475067f1..cef7428d1afeb828588053272748988b88223da7 100644 (file)
--- a/bin/autom4te.in
+++ b/bin/autom4te.in
@@ -240,9 +240,9 @@ use strict;
 my $datadir = $ENV{'AC_MACRODIR'} || '@datadir@';
 my $autom4te_cfg = $ENV{'AUTOM4TE_CFG'} || "$datadir/autom4te.cfg";
 
-# $SET{$SET} is the list of automatic options for $SET.
-my %set;
-my $set;
+# $LANGUAGE{$LANGUAGE} is the list of automatic options for $LANGUAGE.
+my %language;
+my $language;
 
 my $output = '-';
 
@@ -409,11 +409,11 @@ Operation modes:
       --normalize          smash successive empty lines
   -f, --force              don\'t rely on cached values
   -W, --warnings=CATEGORY  report the warnings falling in CATEGORY
-  -s, --set=SET            specify the set of M4 macros to use
+  -s, --language=LANG      specify the set of M4 macros to use
   -m, --mode=OCTAL         change the non trace output file mode (0666)
   -M, --melt               don\'t use M4 frozen files
 
-Sets include:
+Languages include:
   \`Autoconf\'   create Autoconf configure scripts
   \`Autotest\'   create Autotest test suites
   \`M4sh\'       create M4sh shell scripts
@@ -470,7 +470,7 @@ sub load_configuration ()
 
   my $cfg = new IO::File ($autom4te_cfg)
     or die "$me: cannot read $autom4te_cfg: $!\n";
-  my $set;
+  my $lang;
   while ($_ = $cfg->getline)
     {
       chomp;
@@ -480,18 +480,18 @@ sub load_configuration ()
 
       my @words = shellwords ($_);
       my $type = shift @words;
-      if ($type eq 'begin-set:')
+      if ($type eq 'begin-language:')
        {
-         $set = lc $words[0];
+         $lang = lc $words[0];
        }
-      elsif ($type eq 'end-set:')
+      elsif ($type eq 'end-language:')
        {
-         die "$me: $autom4te_cfg:$.: end-set mismatch: $set\n"
-           if $set ne lc $words[0];
+         die "$me: $autom4te_cfg:$.: end-language mismatch: $lang\n"
+           if $lang ne lc $words[0];
        }
       elsif ($type eq 'args:')
        {
-         push @{$set{$set}}, @words;
+         push @{$language{$lang}}, @words;
        }
       else
        {
@@ -515,14 +515,14 @@ sub parse_args ()
              "h|help"     => \&print_usage,
              "V|version"  => \&print_version,
 
-             "s|set=s"    => \$set,
-             "v|verbose"  => \$verbose,
-             "d|debug"    => \$debug,
+             "s|language=s" => \$language,
+             "v|verbose"    => \$verbose,
+             "d|debug"      => \$debug,
             )
     or exit 1;
   Getopt::Long::Configure ("defaults");
-  unshift @ARGV, @{$set{$set}}
-    if $set;
+  unshift @ARGV, @{$language{$language}}
+    if $language;
 
   verbose "arguments: @ARGV\n"
     if $debug;

diff --git a/lib/autom4te.in b/lib/autom4te.in
index a373d57996893517dd9e3d2b268237009acbfae7..f82d21aa4a254646f6fe73b35680b1ab36f11ad6 100644 (file)
--- a/lib/autom4te.in
+++ b/lib/autom4te.in
@@ -23,7 +23,7 @@
 ## Autoconf.  ##
 ## ---------- ##
 
-begin-set: "Autoconf"
+begin-language: "Autoconf"
 # patterns: "*.ac"
 # patterns: "configure.in"
 args: --include @datadir@
@@ -98,39 +98,39 @@ args: --preselect AC_TYPE_PID_T
 args: --preselect AC_TYPE_SIGNAL
 args: --preselect AC_TYPE_SIZE_T
 args: --preselect AC_TYPE_UID_T
-end-set: "Autoconf"
+end-language: "Autoconf"
 
 ## -------- ##
 ## Autotest ##
 ## -------- ##
 
-begin-set: "Autotest"
+begin-language: "Autotest"
 # patterns: *.at
 args: --include @datadir@
 args: autotest/autotest.m4
 args: --mode 777
 args: --warning syntax
-end-set: "Autotest"
+end-language: "Autotest"
 
 ## ---- ##
 ## M4sh ##
 ## ---- ##
 
-begin-set: "M4sh"
+begin-language: "M4sh"
 # patterns: *.as
 args: --include @datadir@
 args: m4sugar/m4sh.m4
 args: --mode 777
 args: --warning syntax
-end-set: "M4sh"
+end-language: "M4sh"
 
 ## ------- ##
 ## M4sugar ##
 ## ------- ##
 
-begin-set: "M4sugar"
+begin-language: "M4sugar"
 # patterns: *.msh
 args: --include @datadir@
 args: m4sugar/m4sugar.m4
 args: --warning syntax
-end-set: "M4sugar"
+end-language: "M4sugar"

diff --git a/man/autom4te.1 b/man/autom4te.1
index 6872f93e055521a0f47f3330c614c307dbe06181..02e91c7aee5a9ec7c3352bdfe15a953298a24837 100644 (file)
--- a/man/autom4te.1
+++ b/man/autom4te.1
@@ -35,7 +35,7 @@ don't rely on cached values
 \fB\-W\fR, \fB\-\-warnings\fR=\fICATEGORY\fR
 report the warnings falling in CATEGORY
 .TP
-\fB\-s\fR, \fB\-\-set\fR=\fISET\fR
+\fB\-s\fR, \fB\-\-language\fR=\fILANG\fR
 specify the set of M4 macros to use
 .TP
 \fB\-m\fR, \fB\-\-mode\fR=\fIOCTAL\fR
@@ -43,7 +43,7 @@ change the non trace output file mode (0666)
 .TP
 \fB\-M\fR, \fB\-\-melt\fR
 don't use M4 frozen files
-.SS "Sets include:"
+.SS "Languages include:"
 .TP
 `Autoconf'
 create Autoconf configure scripts

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 42d85f1a3366a4e3506ef91d7a48950c6c5485fc..9dfbd90859c4138400101666a9cfbca9c09cc3f8 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -54,7 +54,7 @@ testsuite: $(top_srcdir)/lib/m4sugar/m4sugar.m4 \
            $(top_srcdir)/lib/autotest/general.m4 \
           atspecific.m4 \
            $(SUITE)
-       $(AUTOM4TE) --set=autotest -I $(srcdir) -I $(top_srcdir)/lib \
+       $(AUTOM4TE) --language=autotest -I $(srcdir) -I $(top_srcdir)/lib \
          suite.at -o $@.tmp
        mv $@.tmp $@
 

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 07d08e74a5d8bc44fa8811efa6784391b5ab9730..ca37612a1b825ff23d2076ffcfde3e3cee813931 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -245,7 +245,7 @@ testsuite: $(top_srcdir)/lib/m4sugar/m4sugar.m4 \
            $(top_srcdir)/lib/autotest/general.m4 \
           atspecific.m4 \
            $(SUITE)
-       $(AUTOM4TE) --set=autotest -I $(srcdir) -I $(top_srcdir)/lib \
+       $(AUTOM4TE) --language=autotest -I $(srcdir) -I $(top_srcdir)/lib \
          suite.at -o $@.tmp
        mv $@.tmp $@