Regenerate for:

        * configure.in, acinclude.m4 (GMP_PROG_LEX): Remove this in favour of
        AM_PROG_LEX, now ok when lex is missing.

27 files changed, 84 insertions, 20 deletions

diff --git a/Makefile.in b/Makefile.in
index e6673ae07..6308ed98c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -142,6 +142,8 @@ HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_STACK_T_01 = @HAVE_STACK_T_01@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBGMP_DLL = @LIBGMP_DLL@
 LIBM = @LIBM@
 LIBM_FOR_BUILD = @LIBM_FOR_BUILD@
diff --git a/aclocal.m4 b/aclocal.m4
index 21dcdacb9..5c4c7d0a4 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -226,23 +226,6 @@ fi
 ])
 
 
-dnl  GMP_PROG_LEX
-dnl  ------------
-dnl  AC_PROG_LEX bombs if $LEX is set to ${am_missing_run}flex by
-dnl  AM_PROG_LEX.  It needs to see LEX=: if lex is missing.  Avoid this by
-dnl  running AC_PROG_LEX first and then using "missing".
-dnl
-dnl  FIXME: This can be removed and just AM_PROG_LEX used, one that macro
-dnl  works properly.
-
-AC_DEFUN(GMP_PROG_LEX,
-[AC_REQUIRE([AC_PROG_LEX])
-if test "$LEX" = :; then
-  LEX=${am_missing_run}flex
-fi
-])
-
-
 dnl  GMP_PROG_M4
 dnl  -----------
 dnl  Find a working m4, either in $PATH or likely locations, and setup $M4
@@ -9223,3 +9206,36 @@ case "x$am_cv_prog_cc_stdc" in
 esac
 ])
 
+
+# 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 3
+
+AC_PREREQ(2.50)
+
+# AM_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_REQUIRE([AC_PROG_LEX])dnl
+if test "$LEX" = :; then
+  LEX=${am_missing_run}flex
+fi])
+
diff --git a/configure b/configure
index b2d19956a..5ac19e6d2 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.451 .
+# From configure.in Revision: 1.452 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.53.
 #
@@ -23842,12 +23842,10 @@ _ACEOF
 fi
 
 fi
-
 if test "$LEX" = :; then
   LEX=${am_missing_run}flex
 fi
 
-
 # Configs for demos/expr directory
 ac_config_files="$ac_config_files demos/expr/expr-config.h:demos/expr/expr-config-h.in"
 
diff --git a/cxx/Makefile.in b/cxx/Makefile.in
index 3d409ef9e..babe320f6 100644
--- a/cxx/Makefile.in
+++ b/cxx/Makefile.in
@@ -112,6 +112,8 @@ HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_STACK_T_01 = @HAVE_STACK_T_01@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBGMP_DLL = @LIBGMP_DLL@
 LIBM = @LIBM@
 LIBM_FOR_BUILD = @LIBM_FOR_BUILD@
diff --git a/demos/Makefile.in b/demos/Makefile.in
index b8dd3114a..072187aac 100644
--- a/demos/Makefile.in
+++ b/demos/Makefile.in
@@ -112,6 +112,8 @@ HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_STACK_T_01 = @HAVE_STACK_T_01@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBGMP_DLL = @LIBGMP_DLL@
 LIBM = @LIBM@
 LIBM_FOR_BUILD = @LIBM_FOR_BUILD@
diff --git a/demos/calc/Makefile.in b/demos/calc/Makefile.in
index c3aaa4097..8c0f37e4c 100644
--- a/demos/calc/Makefile.in
+++ b/demos/calc/Makefile.in
@@ -112,6 +112,8 @@ HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_STACK_T_01 = @HAVE_STACK_T_01@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBGMP_DLL = @LIBGMP_DLL@
 LIBM = @LIBM@
 LIBM_FOR_BUILD = @LIBM_FOR_BUILD@
diff --git a/demos/expr/Makefile.in b/demos/expr/Makefile.in
index 7dbefb069..723b20fdb 100644
--- a/demos/expr/Makefile.in
+++ b/demos/expr/Makefile.in
@@ -112,6 +112,8 @@ HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_STACK_T_01 = @HAVE_STACK_T_01@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBGMP_DLL = @LIBGMP_DLL@
 LIBM = @LIBM@
 LIBM_FOR_BUILD = @LIBM_FOR_BUILD@
diff --git a/mpbsd/Makefile.in b/mpbsd/Makefile.in
index 591bbdc0c..d49a339a7 100644
--- a/mpbsd/Makefile.in
+++ b/mpbsd/Makefile.in
@@ -112,6 +112,8 @@ HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_STACK_T_01 = @HAVE_STACK_T_01@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBGMP_DLL = @LIBGMP_DLL@
 LIBM = @LIBM@
 LIBM_FOR_BUILD = @LIBM_FOR_BUILD@
diff --git a/mpf/Makefile.in b/mpf/Makefile.in
index dbdbcf4b2..71bb66004 100644
--- a/mpf/Makefile.in
+++ b/mpf/Makefile.in
@@ -112,6 +112,8 @@ HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_STACK_T_01 = @HAVE_STACK_T_01@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBGMP_DLL = @LIBGMP_DLL@
 LIBM = @LIBM@
 LIBM_FOR_BUILD = @LIBM_FOR_BUILD@
diff --git a/mpfr/Makefile.in b/mpfr/Makefile.in
index 1eccb0533..aa8486637 100644
--- a/mpfr/Makefile.in
+++ b/mpfr/Makefile.in
@@ -117,6 +117,8 @@ HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_STACK_T_01 = @HAVE_STACK_T_01@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBGMP_DLL = @LIBGMP_DLL@
 LIBM = @LIBM@
 LIBM_FOR_BUILD = @LIBM_FOR_BUILD@
diff --git a/mpfr/tests/Makefile.in b/mpfr/tests/Makefile.in
index 89f87f2c4..d0354fb0c 100644
--- a/mpfr/tests/Makefile.in
+++ b/mpfr/tests/Makefile.in
@@ -112,6 +112,8 @@ HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_STACK_T_01 = @HAVE_STACK_T_01@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBGMP_DLL = @LIBGMP_DLL@
 LIBM = @LIBM@
 LIBM_FOR_BUILD = @LIBM_FOR_BUILD@
diff --git a/mpn/Makefile.in b/mpn/Makefile.in
index 1ea7bb258..953743fc8 100644
--- a/mpn/Makefile.in
+++ b/mpn/Makefile.in
@@ -132,6 +132,8 @@ HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_STACK_T_01 = @HAVE_STACK_T_01@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBGMP_DLL = @LIBGMP_DLL@
 LIBM = @LIBM@
 LIBM_FOR_BUILD = @LIBM_FOR_BUILD@
diff --git a/mpq/Makefile.in b/mpq/Makefile.in
index c2954427b..3eec82a1e 100644
--- a/mpq/Makefile.in
+++ b/mpq/Makefile.in
@@ -112,6 +112,8 @@ HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_STACK_T_01 = @HAVE_STACK_T_01@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBGMP_DLL = @LIBGMP_DLL@
 LIBM = @LIBM@
 LIBM_FOR_BUILD = @LIBM_FOR_BUILD@
diff --git a/mpz/Makefile.in b/mpz/Makefile.in
index 1baffb2cf..296d75735 100644
--- a/mpz/Makefile.in
+++ b/mpz/Makefile.in
@@ -113,6 +113,8 @@ HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_STACK_T_01 = @HAVE_STACK_T_01@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBGMP_DLL = @LIBGMP_DLL@
 LIBM = @LIBM@
 LIBM_FOR_BUILD = @LIBM_FOR_BUILD@
diff --git a/printf/Makefile.in b/printf/Makefile.in
index 22c97d0f0..66a97aa76 100644
--- a/printf/Makefile.in
+++ b/printf/Makefile.in
@@ -112,6 +112,8 @@ HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_STACK_T_01 = @HAVE_STACK_T_01@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBGMP_DLL = @LIBGMP_DLL@
 LIBM = @LIBM@
 LIBM_FOR_BUILD = @LIBM_FOR_BUILD@
diff --git a/scanf/Makefile.in b/scanf/Makefile.in
index 3cf134673..e595c98fb 100644
--- a/scanf/Makefile.in
+++ b/scanf/Makefile.in
@@ -112,6 +112,8 @@ HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_STACK_T_01 = @HAVE_STACK_T_01@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBGMP_DLL = @LIBGMP_DLL@
 LIBM = @LIBM@
 LIBM_FOR_BUILD = @LIBM_FOR_BUILD@
diff --git a/tests/Makefile.in b/tests/Makefile.in
index c9f380528..1e780119c 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -131,6 +131,8 @@ HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_STACK_T_01 = @HAVE_STACK_T_01@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBGMP_DLL = @LIBGMP_DLL@
 LIBM = @LIBM@
 LIBM_FOR_BUILD = @LIBM_FOR_BUILD@
diff --git a/tests/cxx/Makefile.in b/tests/cxx/Makefile.in
index 1092397f3..6c32e0719 100644
--- a/tests/cxx/Makefile.in
+++ b/tests/cxx/Makefile.in
@@ -112,6 +112,8 @@ HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_STACK_T_01 = @HAVE_STACK_T_01@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBGMP_DLL = @LIBGMP_DLL@
 LIBM = @LIBM@
 LIBM_FOR_BUILD = @LIBM_FOR_BUILD@
diff --git a/tests/devel/Makefile.in b/tests/devel/Makefile.in
index 041708de7..5a96854ac 100644
--- a/tests/devel/Makefile.in
+++ b/tests/devel/Makefile.in
@@ -112,6 +112,8 @@ HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_STACK_T_01 = @HAVE_STACK_T_01@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBGMP_DLL = @LIBGMP_DLL@
 LIBM = @LIBM@
 LIBM_FOR_BUILD = @LIBM_FOR_BUILD@
diff --git a/tests/misc/Makefile.in b/tests/misc/Makefile.in
index 59faf1414..7f4730ec4 100644
--- a/tests/misc/Makefile.in
+++ b/tests/misc/Makefile.in
@@ -112,6 +112,8 @@ HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_STACK_T_01 = @HAVE_STACK_T_01@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBGMP_DLL = @LIBGMP_DLL@
 LIBM = @LIBM@
 LIBM_FOR_BUILD = @LIBM_FOR_BUILD@
diff --git a/tests/mpbsd/Makefile.in b/tests/mpbsd/Makefile.in
index 57e537989..f39cb48f8 100644
--- a/tests/mpbsd/Makefile.in
+++ b/tests/mpbsd/Makefile.in
@@ -112,6 +112,8 @@ HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_STACK_T_01 = @HAVE_STACK_T_01@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBGMP_DLL = @LIBGMP_DLL@
 LIBM = @LIBM@
 LIBM_FOR_BUILD = @LIBM_FOR_BUILD@
diff --git a/tests/mpf/Makefile.in b/tests/mpf/Makefile.in
index cc84de224..796ab8f92 100644
--- a/tests/mpf/Makefile.in
+++ b/tests/mpf/Makefile.in
@@ -112,6 +112,8 @@ HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_STACK_T_01 = @HAVE_STACK_T_01@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBGMP_DLL = @LIBGMP_DLL@
 LIBM = @LIBM@
 LIBM_FOR_BUILD = @LIBM_FOR_BUILD@
diff --git a/tests/mpn/Makefile.in b/tests/mpn/Makefile.in
index 43b49933a..a0df586d8 100644
--- a/tests/mpn/Makefile.in
+++ b/tests/mpn/Makefile.in
@@ -112,6 +112,8 @@ HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_STACK_T_01 = @HAVE_STACK_T_01@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBGMP_DLL = @LIBGMP_DLL@
 LIBM = @LIBM@
 LIBM_FOR_BUILD = @LIBM_FOR_BUILD@
diff --git a/tests/mpq/Makefile.in b/tests/mpq/Makefile.in
index aaebb7e41..a3c085b79 100644
--- a/tests/mpq/Makefile.in
+++ b/tests/mpq/Makefile.in
@@ -112,6 +112,8 @@ HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_STACK_T_01 = @HAVE_STACK_T_01@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBGMP_DLL = @LIBGMP_DLL@
 LIBM = @LIBM@
 LIBM_FOR_BUILD = @LIBM_FOR_BUILD@
diff --git a/tests/mpz/Makefile.in b/tests/mpz/Makefile.in
index 076a43d08..1bbbc03e9 100644
--- a/tests/mpz/Makefile.in
+++ b/tests/mpz/Makefile.in
@@ -113,6 +113,8 @@ HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_STACK_T_01 = @HAVE_STACK_T_01@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBGMP_DLL = @LIBGMP_DLL@
 LIBM = @LIBM@
 LIBM_FOR_BUILD = @LIBM_FOR_BUILD@
diff --git a/tests/rand/Makefile.in b/tests/rand/Makefile.in
index 86435444c..f497d4feb 100644
--- a/tests/rand/Makefile.in
+++ b/tests/rand/Makefile.in
@@ -112,6 +112,8 @@ HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_STACK_T_01 = @HAVE_STACK_T_01@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBGMP_DLL = @LIBGMP_DLL@
 LIBM = @LIBM@
 LIBM_FOR_BUILD = @LIBM_FOR_BUILD@
diff --git a/tune/Makefile.in b/tune/Makefile.in
index 00e925a85..dc4d7f1fb 100644
--- a/tune/Makefile.in
+++ b/tune/Makefile.in
@@ -131,6 +131,8 @@ HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_STACK_T_01 = @HAVE_STACK_T_01@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBGMP_DLL = @LIBGMP_DLL@
 LIBM = @LIBM@
 LIBM_FOR_BUILD = @LIBM_FOR_BUILD@