Import GNU bc 1.05a.

1 files changed, 45 insertions, 27 deletions

diff --git a/contrib/bc/configure.in b/contrib/bc/configure.in
index 38a63e8..0068e31 100644
--- a/contrib/bc/configure.in
+++ b/contrib/bc/configure.in
@@ -1,15 +1,14 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(doc/bc.1)
-AM_INIT_AUTOMAKE(bc, 1.04)
+AM_INIT_AUTOMAKE(bc, 1.05)
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
 AC_MINIX
 dnl AC_ISC_POSIX
 
+AM_PROG_LEX
 AC_PROG_YACC
-AC_DECL_YYTEXT
-AC_PROG_LEX
 AC_PROG_INSTALL
 AC_PROG_RANLIB
 AC_PROG_MAKE_SET
@@ -21,30 +20,7 @@ AC_TYPE_SIZE_T
 AC_CHECK_TYPE(ptrdiff_t, size_t)
 
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(isgraph)
-
-
-AC_ARG_WITH(readline,[  --with-readline         support fancy command input editing], [
-if test "$with_readline" = "yes" ; then
- echo Using the readline library.
- AC_DEFINE(READLINE,1)
- LIBS="$LIBS -lreadline -ltermcap"
- bcrl=y
-else
- bcrl=n
-fi
-], [
-bcrl=n
-])
-
-if test "$LEX" = "flex" ; then
- LEX="flex -I8"
-else
- if test "$bcrl" = "y" ; then
-  AC_MSG_WARN(readline works only with flex.)
- fi
-fi
-
+AC_CHECK_FUNCS(isgraph setvbuf)
 
 SaveCFLAGS="$CFLAGS"
 CFLAGS="-g -O -I. -I$srcdir"
@@ -63,7 +39,49 @@ AC_DEFINE_UNQUOTED(BC_MATH_FILE,"${prefix}/lib/libmath.b")
 fi)
 CFLAGS="$SaveCFLAGS"
 
+echo $LIBS
+bcrl=nA
+AC_ARG_WITH(readline,[  --with-readline         support fancy command input editing], [
+   AC_CHECK_LIB(ncurses,tparm,TERMLIB=-lncurses,
+   AC_CHECK_LIB(termcap,tgetent,TERMLIB=-ltermcap))
+   saved_LIBS="$LIBS"
+   LIBS="$LIBS $TERMLIB"
+   AC_CHECK_LIB(readline,readline,
+      [AC_CHECK_HEADER(readline/readline.h,
+      LIBS="$saved_LIBS -lreadline $TERMLIB";bcrl=y)],
+      LIBS="$saved_LIBS")
+   if test "$bcrl" = "y" ; then
+     echo Using the readline library.
+     AC_DEFINE(READLINE,1)
+   fi
+])
+echo $LIBS
+
+dnl AC_ARG_WITH(readline,[  --with-readline         support fancy command input editing], [
+dnl if test "$with_readline" = "yes" ; then
+dnl  echo Using the readline library.
+dnl  AC_DEFINE(READLINE,1)
+dnl  LIBS="$LIBS -lreadline -ltermcap"
+dnl  bcrl=y
+dnl else
+dnl  bcrl=n
+dnl fi
+dnl ], [
+dnl bcrl=n
+dnl ])
 
+if test "$LEX" = "flex" ; then
+ LEX="flex -I8"
+else
+ if test "$bcrl" = "y" ; then
+  AC_MSG_WARN(readline works only with flex.)
+ fi
+fi
+
+if test "$LEX" = "lex" -a `uname -s` = "SunOS" ; then
+  LEXLIB=""
+  echo "SunOS using lex does not have a -ll."
+fi
 
 AC_ARG_PROGRAM
 AC_OUTPUT(Makefile bc/Makefile dc/Makefile doc/Makefile lib/Makefile)