* acspecific.m4 (AC_PROG_LEX): Don't assume that lex exists.

Don't run _AC_DECL_YYTEXT if it doesn't. Always check libl and
libfl regardless of the $LEX value.

diff --git a/ChangeLog b/ChangeLog
index a6cb9db4037fae7b28136ab725e62a2e88b3241d..cf43e01bedd7a1e27247b20005a4a3bf61d1c9ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-12  Pavel Roskin  <proski@gnu.org>
+
+       * acspecific.m4 (AC_PROG_LEX): Don't assume that lex exists.
+       Don't run _AC_DECL_YYTEXT if it doesn't. Always check libl and
+       libfl regardless of the $LEX value.
+
 2000-10-12  Morten Eriksen <mortene@sim.no>
 
        * acgeneral.m4 (AC_CONFIG_SUBDIRS): Fixed nasty typo.

diff --git a/acspecific.m4 b/acspecific.m4
index dc3587d42c737ac526106e35439318e08c82118d..568daa2d01839a0e167eacf8949bcccb8aa3ae93 100644 (file)
--- a/acspecific.m4
+++ b/acspecific.m4
@@ -129,19 +129,16 @@ 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_ONCE([AC_PROG_LEX],
-[AH_CHECK_LIB(fl)dnl
-AH_CHECK_LIB(l)dnl
-AC_CHECK_PROG(LEX, flex, flex, lex)
+[AC_CHECK_PROGS(LEX, flex lex, :)
 if test -z "$LEXLIB"
 then
-  case $LEX in
-  flex*) ac_lib=fl ;;
-  *) ac_lib=l ;;
-  esac
-  AC_CHECK_LIB($ac_lib, yywrap, LEXLIB="-l$ac_lib")
+  AC_CHECK_LIB(fl, yywrap, LEXLIB="-lfl",
+    [AC_CHECK_LIB(l, yywrap, LEXLIB="-ll")])
 fi
 AC_SUBST(LEXLIB)
-_AC_DECL_YYTEXT])
+if test "x$LEX" != "x:"; then
+  _AC_DECL_YYTEXT
+fi])
 
 
 # _AC_DECL_YYTEXT

diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4
index dc3587d42c737ac526106e35439318e08c82118d..568daa2d01839a0e167eacf8949bcccb8aa3ae93 100644 (file)
--- a/lib/autoconf/specific.m4
+++ b/lib/autoconf/specific.m4
@@ -129,19 +129,16 @@ 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_ONCE([AC_PROG_LEX],
-[AH_CHECK_LIB(fl)dnl
-AH_CHECK_LIB(l)dnl
-AC_CHECK_PROG(LEX, flex, flex, lex)
+[AC_CHECK_PROGS(LEX, flex lex, :)
 if test -z "$LEXLIB"
 then
-  case $LEX in
-  flex*) ac_lib=fl ;;
-  *) ac_lib=l ;;
-  esac
-  AC_CHECK_LIB($ac_lib, yywrap, LEXLIB="-l$ac_lib")
+  AC_CHECK_LIB(fl, yywrap, LEXLIB="-lfl",
+    [AC_CHECK_LIB(l, yywrap, LEXLIB="-ll")])
 fi
 AC_SUBST(LEXLIB)
-_AC_DECL_YYTEXT])
+if test "x$LEX" != "x:"; then
+  _AC_DECL_YYTEXT
+fi])
 
 
 # _AC_DECL_YYTEXT