Initial import of bc 1.0.6

1 files changed, 41 insertions, 39 deletions

diff --git a/contrib/bc/configure.in b/contrib/bc/configure.in
index 0068e31..5f982d3 100644
--- a/contrib/bc/configure.in
+++ b/contrib/bc/configure.in
@@ -1,8 +1,14 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(doc/bc.1)
-AM_INIT_AUTOMAKE(bc, 1.05)
+AM_INIT_AUTOMAKE("bc", "1.06")
 AM_CONFIG_HEADER(config.h)
 
+AC_DEFINE(DC_VERSION,"1.3")
+AC_DEFINE_UNQUOTED(BC_COPYRIGHT, dnl
+ ["Copyright 1991-1994, 1997, 1998, 2000 Free Software Foundation, Inc."])
+AC_DEFINE_UNQUOTED(DC_COPYRIGHT, dnl
+ ["Copyright 1994, 1997, 1998, 2000 Free Software Foundation, Inc."])
+
 AC_PROG_CC
 AC_MINIX
 dnl AC_ISC_POSIX
@@ -13,7 +19,6 @@ AC_PROG_INSTALL
 AC_PROG_RANLIB
 AC_PROG_MAKE_SET
 
-
 AC_CHECK_HEADERS(stdarg.h stddef.h stdlib.h string.h limits.h unistd.h lib.h)
 AC_C_CONST
 AC_TYPE_SIZE_T
@@ -22,53 +27,45 @@ AC_CHECK_TYPE(ptrdiff_t, size_t)
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(isgraph setvbuf)
 
-SaveCFLAGS="$CFLAGS"
-CFLAGS="-g -O -I. -I$srcdir"
-AC_MSG_CHECKING(if long strings are accepted by the C compiler)
-AC_TRY_COMPILE([
-char libmath[] = 
-#include "bc/libmath.h"
-;
-],[],AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no)
-AC_MSG_WARN(libmath.b will not be preloaded into the executable)
-if test "${prefix}" = "NONE" ; then 
-AC_DEFINE_UNQUOTED(BC_MATH_FILE,"/usr/local/lib/libmath.b")
-else
-AC_DEFINE_UNQUOTED(BC_MATH_FILE,"${prefix}/lib/libmath.b")
-fi)
-CFLAGS="$SaveCFLAGS"
+AC_ARG_WITH(pkg,[  --with-pkg              use software installed in /usr/pkg tree], [
+   CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
+   LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
+   echo Using /usr/pkg/include and /usr/pkg/lib
+])
 
-echo $LIBS
-bcrl=nA
+bcle=n
+AC_ARG_WITH(libedit,[  --with-libedit          support fancy BSD command input 
+editing], [
+   AC_CHECK_LIB(termcap,tgetent,TERMLIB=-ltermcap)
+   LDSAVE=$LDFLAGS
+   LDFLAGS="$LDFLAGS $TERMLIB"
+   AC_CHECK_LIB(edit,el_gets,
+      [AC_CHECK_HEADER(histedit.h,
+      READLINELIB="-ledit $TERMLIB";bcle=y)],
+      READLINELIB="")
+   if test "$bcle" = "y"; then
+     echo Using the libedit library.
+     AC_DEFINE(LIBEDIT,1)
+   fi
+   LDFLAGS=$LDSAVE
+])
+ 
+bcrl=n
 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(termcap,tgetent,TERMLIB=-ltermcap))
+   LDSAVE=$LDFLAGS
+   LDFLAGS="$LDFLAGS $TERMLIB"
    AC_CHECK_LIB(readline,readline,
       [AC_CHECK_HEADER(readline/readline.h,
-      LIBS="$saved_LIBS -lreadline $TERMLIB";bcrl=y)],
-      LIBS="$saved_LIBS")
+      READLINELIB="-lreadline $TERMLIB";bcrl=y)],
+      READLINELIB="")
    if test "$bcrl" = "y" ; then
      echo Using the readline library.
      AC_DEFINE(READLINE,1)
    fi
+   LDFLAGS=$LDSAVE
 ])
-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"
@@ -78,10 +75,15 @@ else
  fi
 fi
 
+if test "$bcrl" = "y" -a "$bcle" = "y" ; then
+  AC_MSG_ERROR(Can not use both readline and libedit.  Aborting.)
+fi
+
 if test "$LEX" = "lex" -a `uname -s` = "SunOS" ; then
   LEXLIB=""
   echo "SunOS using lex does not have a -ll."
 fi
 
+AC_SUBST(READLINELIB)
 AC_ARG_PROGRAM
 AC_OUTPUT(Makefile bc/Makefile dc/Makefile doc/Makefile lib/Makefile)