lex fixes from alexandre oliva

diff --git a/ChangeLog b/ChangeLog
index 5241b90..2eb634f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sun Apr  5 13:58:24 1998  Tom Tromey  <tromey@cygnus.com>
+
+       * m4/lex.m4: Allow AM_PROG_LEX to be called with no arguments.
+
+Sun Apr  5 13:54:25 1998  Alexandre Oliva <oliva@dcc.unicamp.br>
+
+       * automake.in (scan_one_configure_file): Only warn about
+       AC_DECL_YYTEXT and AC_PROG_LEXX.
+       (am_conf_line_warning): New function.
+
 Fri Apr  3 15:43:46 1998  Doug Evans  <devans@seba.cygnus.com>
 
        * automake.in (handle_configure): Fix setting of colon_infile

diff --git a/TODO b/TODO
index edb20d6..cebe98f 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,6 +1,13 @@
 * give user more control over -I flags
   in particular document a way to override the defaults
 
+* Reimplement maintainer mode to use conditionals
+  Also add a conditional for dependency tracking
+
+* Allow for multiple translations of a texinfo file:
+       LL_info_TEXINFOS = ...
+  will put info files for language LL into $(infodir)/LL.
+
 * something like this fails:
 
        foo = q \

diff --git a/automake.in b/automake.in
index d3a2a9b..7a7e87a 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -4240,13 +4240,13 @@ sub scan_one_configure_file
        }
        if (/AC_DECL_YYTEXT/ && $filename =~ /configure\.in$/)
        {
-           &am_conf_line_error ($filename, $.,
-                                "\`AC_DECL_YYTEXT' is obsolete; use \`AM_PROG_LEX'");
+           &am_conf_line_warning ($filename, $.,
+                                  "\`AC_DECL_YYTEXT' is obsolete; use \`AM_PROG_LEX'");
        }
        if (/AC_PROG_LEX/ && $filename =~ /configure\.in$/)
        {
-           &am_conf_line_error ($filename, $.,
-                                "\`AC_PROG_LEX' is obsolete; use \`AM_PROG_LEX'");
+           &am_conf_line_warning ($filename, $.,
+                                  "\`AC_PROG_LEX' is obsolete; use \`AM_PROG_LEX'");
        }
 
        if (/AC_PROG_(YACC|RANLIB|CC|CXXCPP|CXX|LEX|AWK|CPP|LN_S)/)
@@ -6365,6 +6365,15 @@ sub am_conf_line_error
     }
 }
 
+# Warning message with line number referring to configure.in.
+# Does not affect exit_status
+sub am_conf_line_warning
+{
+    local ($saved_exit_status) = $exit_status;
+    am_conf_line_error @_;
+    $exit_status = $save_exit_status;
+}
+
 # Tell user where our aclocal.m4 is, but only once.
 sub keyed_aclocal_warning
 {

diff --git a/m4/lex.m4 b/m4/lex.m4
index 7812aa5..bb49045 100644 (file)
--- a/m4/lex.m4
+++ b/m4/lex.m4
@@ -4,6 +4,7 @@
 dnl AM_PROG_LEX
 dnl Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
 AC_DEFUN(AM_PROG_LEX,
-[AC_CHECK_PROGS(LEX, flex lex, "$1/missing flex")
+[missing_dir=ifelse([$1],,`cd $ac_aux_dir && pwd`,$1)
+AC_CHECK_PROGS(LEX, flex lex, "$missing_dir/missing flex")
 AC_PROG_LEX
 AC_DECL_YYTEXT])