* acspecific.m4 (AC_PROG_LEX): Use AC_DEFUN_ONCE.

(AC_DECL_YYTEXT): Don't use AC_REQUIRE because autoupdate
would place it into configure.in but it's not allowed
outside AC_DEFUN.

diff --git a/ChangeLog b/ChangeLog
index 7ea00d07191f0b9950c4bb713bc5bb76614ae271..85ac838bd3407fa3a8c82cb0c9a111d218a2af1e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-10-02  Pavel Roskin  <proski@gnu.org>
+
+       * acspecific.m4 (AC_PROG_LEX): Use AC_DEFUN_ONCE.
+       (AC_DECL_YYTEXT): Don't use AC_REQUIRE because autoupdate
+       would place it into configure.in but it's not allowed
+       outside AC_DEFUN.
+
 2000-10-02  Pavel Roskin  <proski@gnu.org>
 
        * tests/Makefile.am: Macros defined by AC_DEFUN_ONCE should

diff --git a/acspecific.m4 b/acspecific.m4
index c9c31c0d47bbd87a681f8859a098bbc2a7ca5e30..26353e2c85a8f8c65db9aadfbdf9c9b5d060a2d4 100644 (file)
--- a/acspecific.m4
+++ b/acspecific.m4
@@ -128,7 +128,7 @@ AC_DEFUN([AC_PROG_YACC],
 # -----------
 # Look for flex or lex.  Set its associated library to LEXLIB.
 # Check if lex declares yytext as a char * by default, not a char[].
-AC_DEFUN([AC_PROG_LEX],
+AC_DEFUN_ONCE([AC_PROG_LEX],
 [AH_CHECK_LIB(fl)dnl
 AH_CHECK_LIB(l)dnl
 AC_CHECK_PROG(LEX, flex, flex, lex)
@@ -187,7 +187,7 @@ fi
 
 # Require AC_PROG_LEX in case some people were just calling this macro.
 AU_DEFUN([AC_DECL_YYTEXT],
-[AC_REQUIRE([AC_PROG_LEX])])
+[AC_PROG_LEX])
 
 
 # AC_PROG_INSTALL

diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4
index c9c31c0d47bbd87a681f8859a098bbc2a7ca5e30..26353e2c85a8f8c65db9aadfbdf9c9b5d060a2d4 100644 (file)
--- a/lib/autoconf/specific.m4
+++ b/lib/autoconf/specific.m4
@@ -128,7 +128,7 @@ AC_DEFUN([AC_PROG_YACC],
 # -----------
 # Look for flex or lex.  Set its associated library to LEXLIB.
 # Check if lex declares yytext as a char * by default, not a char[].
-AC_DEFUN([AC_PROG_LEX],
+AC_DEFUN_ONCE([AC_PROG_LEX],
 [AH_CHECK_LIB(fl)dnl
 AH_CHECK_LIB(l)dnl
 AC_CHECK_PROG(LEX, flex, flex, lex)
@@ -187,7 +187,7 @@ fi
 
 # Require AC_PROG_LEX in case some people were just calling this macro.
 AU_DEFUN([AC_DECL_YYTEXT],
-[AC_REQUIRE([AC_PROG_LEX])])
+[AC_PROG_LEX])
 
 
 # AC_PROG_INSTALL