From: Pavel Roskin Date: Mon, 2 Oct 2000 12:47:13 +0000 (+0000) Subject: * acspecific.m4 (AC_PROG_LEX): Use AC_DEFUN_ONCE. X-Git-Tag: autoconf-2.50~596 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff690f003f247db5aa3d15df86f8f7da2f48eae5;p=thirdparty%2Fautoconf.git * 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 7ea00d071..85ac838bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2000-10-02 Pavel Roskin + + * 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 * tests/Makefile.am: Macros defined by AC_DEFUN_ONCE should diff --git a/acspecific.m4 b/acspecific.m4 index c9c31c0d4..26353e2c8 100644 --- 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 c9c31c0d4..26353e2c8 100644 --- 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