automake-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

FYI: patch from PR 297


From: Alexandre Duret-Lutz
Subject: FYI: patch from PR 297
Date: Tue, 05 Mar 2002 14:30:57 +0100
User-agent: Gnus/5.090006 (Oort Gnus v0.06) Emacs/21.1 (i386-debian-linux-gnu)

I'm checkin this in.

Index: ChangeLog
===================================================================
RCS file: /cvs/automake/automake/ChangeLog,v
retrieving revision 1.1770
diff -u -r1.1770 ChangeLog
--- ChangeLog   2002/02/25 11:00:28     1.1770
+++ ChangeLog   2002/03/05 13:21:27
@@ -1,3 +1,10 @@
+2002-03-05  Kevin Ryde  <address@hidden>
+
+       For PR automake/297:
+       * lex.m4 (AM_PROG_LEX): Don't set LEX=${am_missing_run}flex until
+       after AC_PROG_LEX, since it will try to run it and fail (in autoconf
+       2.52 at least).
+
 2002-02-25  Alexandre Duret-Lutz  <address@hidden>
 
        * automake.in (scan_one_autoconf_file): Declare
Index: m4/lex.m4
===================================================================
RCS file: /cvs/automake/automake/m4/lex.m4,v
retrieving revision 1.6
diff -u -r1.6 lex.m4
--- lex.m4      2001/10/21 18:04:16     1.6
+++ lex.m4      2002/03/05 13:21:27
@@ -1,7 +1,7 @@
 ## Replacement for AC_PROG_LEX.                       -*-  Autoconf -*-
 ## by Alexandre Oliva <address@hidden>
 
-# Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+# Copyright 1998, 1999, 2000, 2001, 2002 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
@@ -18,14 +18,17 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-# serial 2
+# serial 3
 
 AC_PREREQ(2.50)
 
 # AM_PROG_LEX
 # -----------
-# Look for flex, lex or missing, then run AC_PROG_LEX.
+# Autoconf leaves LEX=: if lex or flex can't be found.  Change that to a
+# "missing" invocation, for better error output.
 AC_DEFUN([AM_PROG_LEX],
 [AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
-AC_CHECK_PROGS(LEX, flex lex, [${am_missing_run}flex])
-AC_PROG_LEX])
+AC_REQUIRE([AC_PROG_LEX])dnl
+if test "$LEX" = :; then
+  LEX=${am_missing_run}flex
+fi])

-- 
Alexandre Duret-Lutz




reply via email to

[Prev in Thread] Current Thread [Next in Thread]