Update to 1.3.8, since 1.3.7 is no longer available.

3 files changed, 1188 insertions, 14 deletions

diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile
index 62787dd8d6b..fbda4a62ab2 100644
--- a/devel/libslang/Makefile
+++ b/devel/libslang/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 1999/06/17 22:57:23 mjl Exp $
+# $NetBSD: Makefile,v 1.14 1999/07/22 07:01:20 mycroft Exp $
 # FreeBSD Id: Makefile,v 1.10 1997/07/17 15:12:41 max Exp 
 #
 
-DISTNAME=       slang-1.3.7
-PKGNAME=        libslang-1.3.7
+DISTNAME=       slang-1.3.8
+PKGNAME=        libslang-1.3.8
 CATEGORIES=	devel
 MASTER_SITES=   ftp://space.mit.edu/pub/davis/slang/v1.3/ \
 		http://gd.tuwien.ac.at/editors/davis/slang/v1.3/
diff --git a/devel/libslang/files/md5 b/devel/libslang/files/md5
index ca73063740f..7b4a3092f6c 100644
--- a/devel/libslang/files/md5
+++ b/devel/libslang/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 1999/06/17 22:57:24 mjl Exp $
+$NetBSD: md5,v 1.5 1999/07/22 07:01:21 mycroft Exp $
 
-MD5 (slang-1.3.7.tar.gz) = daea2a2b5f013ada6dc292273fc300b3
+MD5 (slang-1.3.8.tar.gz) = 78c8e6dddbee362e356eaf2bb16770b7
diff --git a/devel/libslang/patches/patch-ab b/devel/libslang/patches/patch-ab
index df9da734f2a..94583ff5f52 100644
--- a/devel/libslang/patches/patch-ab
+++ b/devel/libslang/patches/patch-ab
@@ -1,13 +1,1033 @@
-$NetBSD: patch-ab,v 1.5 1999/06/17 22:57:24 mjl Exp $
+$NetBSD: patch-ab,v 1.6 1999/07/22 07:01:21 mycroft Exp $
 
---- configure.orig	Mon Jun  7 01:34:53 1999
-+++ configure	Thu Jun 17 00:54:16 1999
-@@ -1840,17 +1840,6 @@
+--- configure.orig	Tue Jul 13 16:30:30 1999
++++ configure	Thu Jul 22 02:46:09 1999
+@@ -16,8 +16,6 @@
+ ac_default_prefix="/usr"
+ fi
  
- TERMCAP=-ltermcap
+-ac_help="$ac_help
+-  --enable-warnings       turn on GCC compiler warnings"
  
+ # Initialize some variables set by options.
+ # The variables have the same names as the options, with
+@@ -534,464 +532,8 @@
+ 
+ 
+ 
+-
+-#These variable are initialized by JD init function
+-CONFIG_DIR=`pwd`
+-cd $srcdir
+-if test "`pwd`" != "$CONFIG_DIR"
+-  then 
+-  { echo "configure: error: "This software does not support configuring from another directory.   See the INSTALL file"" 1>&2; exit 1; }
+-  fi
+-# Note: these will differ if one is a symbolic link
+-if test -f /usr/bin/dirname; then
+-  JD_Above_Dir=`dirname $CONFIG_DIR`
+-else
+-# system is a loser
+-  JD_Above_Dir=`cd ..;pwd`
+-fi
+-JD_Above_Dir2=`cd ..;pwd`
+-
+-
+-# Extract the first word of "gcc", so it can be a program name with args.
+-set dummy gcc; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:559: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  if test -n "$CC"; then
+-  ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_prog_CC="gcc"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-fi
+-fi
+-CC="$ac_cv_prog_CC"
+-if test -n "$CC"; then
+-  echo "$ac_t""$CC" 1>&6
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+-
+-if test -z "$CC"; then
+-  # Extract the first word of "cc", so it can be a program name with args.
+-set dummy cc; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:589: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  if test -n "$CC"; then
+-  ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_prog_rejected=no
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+-        ac_prog_rejected=yes
+-	continue
+-      fi
+-      ac_cv_prog_CC="cc"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-if test $ac_prog_rejected = yes; then
+-  # We found a bogon in the path, so make sure we never use it.
+-  set dummy $ac_cv_prog_CC
+-  shift
+-  if test $# -gt 0; then
+-    # We chose a different compiler from the bogus one.
+-    # However, it has the same basename, so the bogon will be chosen
+-    # first if we set CC to just the basename; use the full file name.
+-    shift
+-    set dummy "$ac_dir/$ac_word" "$@"
+-    shift
+-    ac_cv_prog_CC="$@"
+-  fi
+-fi
+-fi
+-fi
+-CC="$ac_cv_prog_CC"
+-if test -n "$CC"; then
+-  echo "$ac_t""$CC" 1>&6
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+-
+-  if test -z "$CC"; then
+-    case "`uname -s`" in
+-    *win32* | *WIN32*)
+-      # Extract the first word of "cl", so it can be a program name with args.
+-set dummy cl; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:640: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  if test -n "$CC"; then
+-  ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_prog_CC="cl"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-fi
+-fi
+-CC="$ac_cv_prog_CC"
+-if test -n "$CC"; then
+-  echo "$ac_t""$CC" 1>&6
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+- ;;
+-    esac
+-  fi
+-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+-fi
+-
+-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:672: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+-
+-ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
+-
+-cat > conftest.$ac_ext << EOF
+-
+-#line 683 "configure"
+-#include "confdefs.h"
+-
+-main(){return(0);}
+-EOF
+-if { (eval echo configure:688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  ac_cv_prog_cc_works=yes
+-  # If we can't run a trivial program, we are probably using a cross compiler.
+-  if (./conftest; exit) 2>/dev/null; then
+-    ac_cv_prog_cc_cross=no
+-  else
+-    ac_cv_prog_cc_cross=yes
+-  fi
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  ac_cv_prog_cc_works=no
+-fi
+-rm -fr conftest*
+-ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
+-
+-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
+-if test $ac_cv_prog_cc_works = no; then
+-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+-fi
+-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:714: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+-cross_compiling=$ac_cv_prog_cc_cross
+-
+-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+-echo "configure:719: checking whether we are using GNU C" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  cat > conftest.c <<EOF
+-#ifdef __GNUC__
+-  yes;
+-#endif
+-EOF
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:728: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+-  ac_cv_prog_gcc=yes
+-else
+-  ac_cv_prog_gcc=no
+-fi
+-fi
+-
+-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+-
+-if test $ac_cv_prog_gcc = yes; then
+-  GCC=yes
+-else
+-  GCC=
+-fi
+-
+-ac_test_CFLAGS="${CFLAGS+set}"
+-ac_save_CFLAGS="$CFLAGS"
+-CFLAGS=
+-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+-echo "configure:747: checking whether ${CC-cc} accepts -g" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  echo 'void f(){}' > conftest.c
+-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+-  ac_cv_prog_cc_g=yes
+-else
+-  ac_cv_prog_cc_g=no
+-fi
+-rm -f conftest*
+-
+-fi
+-
+-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+-if test "$ac_test_CFLAGS" = set; then
+-  CFLAGS="$ac_save_CFLAGS"
+-elif test $ac_cv_prog_cc_g = yes; then
+-  if test "$GCC" = yes; then
+-    CFLAGS="-g -O2"
+-  else
+-    CFLAGS="-g"
+-  fi
+-else
+-  if test "$GCC" = yes; then
+-    CFLAGS="-O2"
+-  else
+-    CFLAGS=
+-  fi
+-fi
+-
+-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+-echo "configure:779: checking how to run the C preprocessor" >&5
+-# On Suns, sometimes $CPP names a directory.
+-if test -n "$CPP" && test -d "$CPP"; then
+-  CPP=
+-fi
+-if test -z "$CPP"; then
+-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-    # This must be in double quotes, not single quotes, because CPP may get
+-  # substituted into the Makefile and "${CC-cc}" will confuse make.
+-  CPP="${CC-cc} -E"
+-  # On the NeXT, cc -E runs the code through the compiler's parser,
+-  # not just through cpp.
+-  cat > conftest.$ac_ext <<EOF
+-#line 794 "configure"
+-#include "confdefs.h"
+-#include <assert.h>
+-Syntax Error
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:800: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
+-  :
+-else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  CPP="${CC-cc} -E -traditional-cpp"
+-  cat > conftest.$ac_ext <<EOF
+-#line 811 "configure"
+-#include "confdefs.h"
+-#include <assert.h>
+-Syntax Error
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:817: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
+-  :
+-else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  CPP="${CC-cc} -nologo -E"
+-  cat > conftest.$ac_ext <<EOF
+-#line 828 "configure"
+-#include "confdefs.h"
+-#include <assert.h>
+-Syntax Error
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:834: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
+-  :
+-else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  CPP=/lib/cpp
+-fi
+-rm -f conftest*
+-fi
+-rm -f conftest*
+-fi
+-rm -f conftest*
+-  ac_cv_prog_CPP="$CPP"
+-fi
+-  CPP="$ac_cv_prog_CPP"
+-else
+-  ac_cv_prog_CPP="$CPP"
+-fi
+-echo "$ac_t""$CPP" 1>&6
+-
+-if test $ac_cv_prog_gcc = yes; then
+-    echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
+-echo "configure:860: checking whether ${CC-cc} needs -traditional" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-    ac_pattern="Autoconf.*'x'"
+-  cat > conftest.$ac_ext <<EOF
+-#line 866 "configure"
+-#include "confdefs.h"
+-#include <sgtty.h>
+-Autoconf TIOCGETP
+-EOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  egrep "$ac_pattern" >/dev/null 2>&1; then
+-  rm -rf conftest*
+-  ac_cv_prog_gcc_traditional=yes
+-else
+-  rm -rf conftest*
+-  ac_cv_prog_gcc_traditional=no
+-fi
+-rm -f conftest*
+-
+-
+-  if test $ac_cv_prog_gcc_traditional = no; then
+-    cat > conftest.$ac_ext <<EOF
+-#line 884 "configure"
+-#include "confdefs.h"
+-#include <termio.h>
+-Autoconf TCGETA
+-EOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  egrep "$ac_pattern" >/dev/null 2>&1; then
+-  rm -rf conftest*
+-  ac_cv_prog_gcc_traditional=yes
+-fi
+-rm -f conftest*
+-
+-  fi
+-fi
+-
+-echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6
+-  if test $ac_cv_prog_gcc_traditional = yes; then
+-    CC="$CC -traditional"
+-  fi
+-fi
+-
+-echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
+-echo "configure:906: checking for POSIXized ISC" >&5
+-if test -d /etc/conf/kconfig.d &&
+-  grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
+-then
+-  echo "$ac_t""yes" 1>&6
+-  ISC=yes # If later tests want to check for ISC.
+-  cat >> confdefs.h <<\EOF
+-#define _POSIX_SOURCE 1
+-EOF
+-
+-  if test "$GCC" = yes; then
+-    CC="$CC -posix"
+-  else
+-    CC="$CC -Xp"
+-  fi
+-else
+-  echo "$ac_t""no" 1>&6
+-  ISC=
+-fi
+-
+-echo $ac_n "checking for AIX""... $ac_c" 1>&6
+-echo "configure:927: checking for AIX" >&5
+-cat > conftest.$ac_ext <<EOF
+-#line 929 "configure"
+-#include "confdefs.h"
+-#ifdef _AIX
+-  yes
+-#endif
+-
+-EOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  egrep "yes" >/dev/null 2>&1; then
+-  rm -rf conftest*
+-  echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
+-#define _ALL_SOURCE 1
+-EOF
+-
+-else
+-  rm -rf conftest*
+-  echo "$ac_t""no" 1>&6
+-fi
+-rm -f conftest*
+-
+-
+-
+-cat > conftest.$ac_ext <<EOF
+-#line 952 "configure"
+-#include "confdefs.h"
+-#ifdef hpux
+-  yes
+-#endif
+-
+-EOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  egrep "yes" >/dev/null 2>&1; then
+-  rm -rf conftest*
+-  
+-cat >> confdefs.h <<\EOF
+-#define _HPUX_SOURCE 1
+-EOF
+-
+-if test "$CC" = cc; then CC="cc -Ae"; fi
+-
+-fi
+-rm -f conftest*
+-echo $ac_n "checking C compiler that understands ANSI prototypes""... $ac_c" 1>&6
+-echo "configure:972: checking C compiler that understands ANSI prototypes" >&5
+-cat > conftest.$ac_ext <<EOF
+-#line 974 "configure"
+-#include "confdefs.h"
+- 
+-int main() {
+-
+- extern int silly (int);
+-; return 0; }
+-EOF
+-if { (eval echo configure:982: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-  rm -rf conftest*
+-  
+- echo "$ac_t""$CC looks ok.  Good." 1>&6
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  
+- echo "$ac_t""$CC is not a good enough compiler" 1>&6
+- { echo "configure: error: Set env variable CC to your ANSI compiler and rerun configure." 1>&2; exit 1; }
+- 
+-fi
+-rm -f conftest*
++JD_INIT
++JD_ANSI_CC
+ 
+ ac_aux_dir=
+ for ac_dir in autoconf $srcdir/autoconf; do
+@@ -1013,7 +555,7 @@
+ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
+ 
+ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+-echo "configure:1017: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "configure:559: checking whether ${MAKE-make} sets \${MAKE}" >&5
+ set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1042,7 +584,7 @@
+ # Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1046: checking for $ac_word" >&5
++echo "configure:588: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1081,7 +623,7 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+-echo "configure:1085: checking for a BSD compatible install" >&5
++echo "configure:627: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1141,7 +683,7 @@
+ fi
+ 
+ echo $ac_n "checking host system type""... $ac_c" 1>&6
+-echo "configure:1145: checking host system type" >&5
++echo "configure:687: checking host system type" >&5
+ 
+ host_alias=$host
+ case "$host_alias" in
+@@ -1163,6 +705,86 @@
+ 
+ 
+ #Check these header since they cause trouble
++echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
++echo "configure:710: checking how to run the C preprocessor" >&5
++# On Suns, sometimes $CPP names a directory.
++if test -n "$CPP" && test -d "$CPP"; then
++  CPP=
++fi
++if test -z "$CPP"; then
++if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++    # This must be in double quotes, not single quotes, because CPP may get
++  # substituted into the Makefile and "${CC-cc}" will confuse make.
++  CPP="${CC-cc} -E"
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp.
++  cat > conftest.$ac_ext <<EOF
++#line 725 "configure"
++#include "confdefs.h"
++#include <assert.h>
++Syntax Error
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:731: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  :
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  CPP="${CC-cc} -E -traditional-cpp"
++  cat > conftest.$ac_ext <<EOF
++#line 742 "configure"
++#include "confdefs.h"
++#include <assert.h>
++Syntax Error
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:748: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  :
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  CPP="${CC-cc} -nologo -E"
++  cat > conftest.$ac_ext <<EOF
++#line 759 "configure"
++#include "confdefs.h"
++#include <assert.h>
++Syntax Error
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:765: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  :
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  CPP=/lib/cpp
++fi
++rm -f conftest*
++fi
++rm -f conftest*
++fi
++rm -f conftest*
++  ac_cv_prog_CPP="$CPP"
++fi
++  CPP="$ac_cv_prog_CPP"
++else
++  ac_cv_prog_CPP="$CPP"
++fi
++echo "$ac_t""$CPP" 1>&6
++
+ for ac_hdr in \
+ stdlib.h \
+ unistd.h \
+@@ -1179,17 +801,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:1183: checking for $ac_hdr" >&5
++echo "configure:805: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1188 "configure"
++#line 810 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1193: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:815: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -1217,12 +839,12 @@
+ 
+ 
+ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+-echo "configure:1221: checking for ANSI C header files" >&5
++echo "configure:843: checking for ANSI C header files" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1226 "configure"
++#line 848 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -1230,7 +852,7 @@
+ #include <float.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1234: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:856: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -1247,7 +869,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ cat > conftest.$ac_ext <<EOF
+-#line 1251 "configure"
++#line 873 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ EOF
+@@ -1265,7 +887,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat > conftest.$ac_ext <<EOF
+-#line 1269 "configure"
++#line 891 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+@@ -1286,7 +908,7 @@
+   :
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1290 "configure"
++#line 912 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+@@ -1297,7 +919,7 @@
+ exit (0); }
+ 
+ EOF
+-if { (eval echo configure:1301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+@@ -1321,12 +943,12 @@
+ fi
+ 
+ echo $ac_n "checking for mode_t""... $ac_c" 1>&6
+-echo "configure:1325: checking for mode_t" >&5
++echo "configure:947: checking for mode_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1330 "configure"
++#line 952 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -1354,12 +976,12 @@
+ fi
+ 
+ echo $ac_n "checking for pid_t""... $ac_c" 1>&6
+-echo "configure:1358: checking for pid_t" >&5
++echo "configure:980: checking for pid_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1363 "configure"
++#line 985 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -1387,12 +1009,12 @@
+ fi
+ 
+ echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
+-echo "configure:1391: checking for uid_t in sys/types.h" >&5
++echo "configure:1013: checking for uid_t in sys/types.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1396 "configure"
++#line 1018 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ EOF
+@@ -1426,12 +1048,12 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
+-echo "configure:1430: checking for $ac_hdr that defines DIR" >&5
++echo "configure:1052: checking for $ac_hdr that defines DIR" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1435 "configure"
++#line 1057 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$ac_hdr>
+@@ -1439,7 +1061,7 @@
+ DIR *dirp = 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1443: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1065: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "ac_cv_header_dirent_$ac_safe=yes"
+ else
+@@ -1464,7 +1086,7 @@
+ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+ if test $ac_header_dirent = dirent.h; then
+ echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
+-echo "configure:1468: checking for opendir in -ldir" >&5
++echo "configure:1090: checking for opendir in -ldir" >&5
+ ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1472,7 +1094,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldir  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1476 "configure"
++#line 1098 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -1483,7 +1105,7 @@
+ opendir()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -1505,7 +1127,7 @@
+ 
+ else
+ echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
+-echo "configure:1509: checking for opendir in -lx" >&5
++echo "configure:1131: checking for opendir in -lx" >&5
+ ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1513,7 +1135,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lx  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1517 "configure"
++#line 1139 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -1524,7 +1146,7 @@
+ opendir()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -1570,12 +1192,12 @@
+ 
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:1574: checking for $ac_func" >&5
++echo "configure:1196: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1579 "configure"
++#line 1201 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -1598,7 +1220,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -1624,7 +1246,7 @@
+ 
+ 
+ echo $ac_n "checking size of short""... $ac_c" 1>&6
+-echo "configure:1628: checking size of short" >&5
++echo "configure:1250: checking size of short" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1632,7 +1254,7 @@
+   ac_cv_sizeof_short=2
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1636 "configure"
++#line 1258 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ main()
+@@ -1643,7 +1265,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:1647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:1269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_sizeof_short=`cat conftestval`
+ else
+@@ -1663,7 +1285,7 @@
+ 
+ 
+ echo $ac_n "checking size of int""... $ac_c" 1>&6
+-echo "configure:1667: checking size of int" >&5
++echo "configure:1289: checking size of int" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1671,7 +1293,7 @@
+   ac_cv_sizeof_int=4
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1675 "configure"
++#line 1297 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ main()
+@@ -1682,7 +1304,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:1686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:1308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_sizeof_int=`cat conftestval`
+ else
+@@ -1702,7 +1324,7 @@
+ 
+ 
+ echo $ac_n "checking size of long""... $ac_c" 1>&6
+-echo "configure:1706: checking size of long" >&5
++echo "configure:1328: checking size of long" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1710,7 +1332,7 @@
+   ac_cv_sizeof_long=4
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1714 "configure"
++#line 1336 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ main()
+@@ -1721,7 +1343,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:1725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:1347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_sizeof_long=`cat conftestval`
+ else
+@@ -1741,7 +1363,7 @@
+ 
+ 
+ echo $ac_n "checking size of float""... $ac_c" 1>&6
+-echo "configure:1745: checking size of float" >&5
++echo "configure:1367: checking size of float" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_float'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1749,7 +1371,7 @@
+   ac_cv_sizeof_float=4
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1753 "configure"
++#line 1375 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ main()
+@@ -1760,7 +1382,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:1764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:1386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_sizeof_float=`cat conftestval`
+ else
+@@ -1780,7 +1402,7 @@
+ 
+ 
+ echo $ac_n "checking size of double""... $ac_c" 1>&6
+-echo "configure:1784: checking size of double" >&5
++echo "configure:1406: checking size of double" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1788,7 +1410,7 @@
+   ac_cv_sizeof_double=8
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1792 "configure"
++#line 1414 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ main()
+@@ -1799,7 +1421,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:1803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:1425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_sizeof_double=`cat conftestval`
+ else
+@@ -1820,7 +1442,7 @@
+ 
+ 
+ echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
+-echo "configure:1824: checking for dlopen in -ldl" >&5
++echo "configure:1446: checking for dlopen in -ldl" >&5
+ ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1828,7 +1450,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1832 "configure"
++#line 1454 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -1839,7 +1461,7 @@
+ dlopen()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -1857,17 +1479,17 @@
+   
+ 	ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
+-echo "configure:1861: checking for dlfcn.h" >&5
++echo "configure:1483: checking for dlfcn.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1866 "configure"
++#line 1488 "configure"
+ #include "confdefs.h"
+ #include <dlfcn.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1493: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -1918,111 +1540,16 @@
+ 
+ 
+ 
++JD_TERMCAP
++JD_GCC_WARNINGS
+ 
+-JD_Terminfo_Dirs="/usr/lib/terminfo \
+-                 /usr/share/terminfo \
+-                 /usr/share/lib/terminfo \
+-		 /usr/local/lib/terminfo"
+-
+-TERMCAP=-ltermcap
+-
 -echo $ac_n "checking for Terminfo""... $ac_c" 1>&6
--echo "configure:1845: checking for Terminfo" >&5
+-echo "configure:1931: checking for Terminfo" >&5
 -for terminfo_dir in $JD_Terminfo_Dirs
 -do
 -   if test -d $terminfo_dir 
@@ -17,6 +1037,160 @@ $NetBSD: patch-ab,v 1.5 1999/06/17 22:57:24 mjl Exp $
 -      break
 -   fi
 -done
- if test "$TERMCAP"; then
-   echo "$ac_t""no" 1>&6
-   cat >> confdefs.h <<\EOF
+-if test "$TERMCAP"; then
+-  echo "$ac_t""no" 1>&6
+-  cat >> confdefs.h <<\EOF
+-#define USE_TERMCAP 1
+-EOF
+-
+-fi
+-
+-
+-# Check whether --enable-warnings or --disable-warnings was given.
+-if test "${enable_warnings+set}" = set; then
+-  enableval="$enable_warnings"
+-  gcc_warnings=$enableval
+-fi
+-
+-if test -n "$GCC"
+-then
+-  CFLAGS="$CFLAGS -fno-strength-reduce"
+-  if test -n "$gcc_warnings"
+-  then
+-    CFLAGS="$CFLAGS -Wall -W -pedantic -Winline -Wmissing-prototypes \
+- -Wnested-externs -Wpointer-arith -Wcast-align -Wshadow -Wstrict-prototypes"
+-    # Now trim excess whitespace
+-    CFLAGS=`echo $CFLAGS`
+-  fi
+-fi
+-
+-
+-
+-#---------------------------------------------------------------------------
+-# Set the source directory and object directory.   The makefile assumes an
+-# abcolute path name.  This is because src/Makefile cds to OBJDIR and compiles
+-# the src file which is in SRCDIR
+-#---------------------------------------------------------------------------
+-SRCDIR=$CONFIG_DIR
+-if test "src" != "."
+-then
+-  if test -z "src"
+-  then
+-    SRCDIR=$SRCDIR/src
+-  else
+-    SRCDIR=$SRCDIR/src
+-  fi
+-fi
+-
+-OBJDIR=$SRCDIR/"$ARCH"objs
+-ELFDIR=$SRCDIR/elf"$ARCH"objs
+-
+-
+-
+- if test -z "src/modules.unx"
+- then
+-   Program_Modules=""
+- else
+-   Program_Modules=`cat src/modules.unx`
+- fi
+- PROGRAM_OFILES=""
+- PROGRAM_OBJECTS=""
+- PROGRAM_ELFOBJECTS=""
+- PROGRAM_OBJECT_RULES=""
+- PROGRAM_ELF_ORULES=""
+- for program_module in $Program_Modules; do
+-   PROGRAM_OFILES="$PROGRAM_OFILES $program_module.o"
+-   PROGRAM_OBJECTS="$PROGRAM_OBJECTS \$(OBJDIR)/$program_module.o"
+-   PROGRAM_ELFOBJECTS="$PROGRAM_ELFOBJECTS \$(ELFDIR)/$program_module.o"
+- done
+-
+-
+- for program_module in $Program_Modules; do
+-   
+-PROGRAM_OBJECT_RULES="$PROGRAM_OBJECT_RULES
+-\$(OBJDIR)/$program_module.o : \$(SRCDIR)/$program_module.c \$(DOT_O_DEPS) \$("$program_module"_O_DEP)
+-	cd \$(OBJDIR); \$(COMPILE_CMD) \$(SRCDIR)/$program_module.c
+-"
+-
+-   
+-PROGRAM_ELF_ORULES="$PROGRAM_ELF_ORULES
+-\$(ELFDIR)/$program_module.o : \$(SRCDIR)/$program_module.c \$(DOT_O_DEPS) \$("$program_module"_O_DEP)
+-	cd \$(ELFDIR); \$(ELFCOMPILE_CMD) \$(SRCDIR)/$program_module.c
+-"
+-
+- done
++JD_SET_OBJ_SRC_DIR(src)
+ 
++JD_GET_MODULES(src/modules.unx)
++JD_CREATE_MODULE_ORULES
+ 
+ echo $ac_n "checking SLANG_VERSION""... $ac_c" 1>&6
+-echo "configure:2026: checking SLANG_VERSION" >&5
++echo "configure:1553: checking SLANG_VERSION" >&5
+ slang_version=`grep "^#define  *SLANG_VERSION " $srcdir/src/slang.h |
+                awk '{ print $3 }'`
+ slang_major_version=`echo $slang_version |
+@@ -2194,9 +1721,6 @@
+ s%@oldincludedir@%$oldincludedir%g
+ s%@infodir@%$infodir%g
+ s%@mandir@%$mandir%g
+-s%@CONFIG_DIR@%$CONFIG_DIR%g
+-s%@CC@%$CC%g
+-s%@CPP@%$CPP%g
+ s%@SET_MAKE@%$SET_MAKE%g
+ s%@RANLIB@%$RANLIB%g
+ s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
+@@ -2207,15 +1731,9 @@
+ s%@host_cpu@%$host_cpu%g
+ s%@host_vendor@%$host_vendor%g
+ s%@host_os@%$host_os%g
++s%@CPP@%$CPP%g
+ s%@DYNAMIC_LINK_LIB@%$DYNAMIC_LINK_LIB%g
+ s%@DYNAMIC_LINK_FLAGS@%$DYNAMIC_LINK_FLAGS%g
+-s%@TERMCAP@%$TERMCAP%g
+-s%@SRCDIR@%$SRCDIR%g
+-s%@OBJDIR@%$OBJDIR%g
+-s%@ELFDIR@%$ELFDIR%g
+-s%@PROGRAM_OFILES@%$PROGRAM_OFILES%g
+-s%@PROGRAM_OBJECTS@%$PROGRAM_OBJECTS%g
+-s%@PROGRAM_ELFOBJECTS@%$PROGRAM_ELFOBJECTS%g
+ s%@slang_major_version@%$slang_major_version%g
+ s%@slang_minor_version@%$slang_minor_version%g
+ s%@slang_version@%$slang_version%g
+@@ -2541,32 +2059,10 @@
+ fi
+ 
+ 
+-  
+-PROGRAM_OBJECT_RULES="$PROGRAM_OBJECT_RULES
+-calc : \$(OBJDIR)/calc
+-	@echo calc created in \$(OBJDIR)
+-\$(OBJDIR)/calc : \$(OBJDIR)/calc.o \$("calc"_DEPS) \$(EXECDEPS)
+-	\$(CC) -o \$(OBJDIR)/calc \$(LDFLAGS) \$(OBJDIR)/calc.o \$("calc"_LIBS) \$(EXECLIBS)
+-\$(OBJDIR)/calc.o : \$(SRCDIR)/calc.c \$(DOT_O_DEPS) \$("calc"_O_DEP)
+-	cd \$(OBJDIR); \$(COMPILE_CMD) \$("calc"_INC) \$(EXECINC) \$(SRCDIR)/calc.c
+-"
+-
+-  
+-PROGRAM_OBJECT_RULES="$PROGRAM_OBJECT_RULES
+-untic : \$(OBJDIR)/untic
+-	@echo untic created in \$(OBJDIR)
+-\$(OBJDIR)/untic : \$(OBJDIR)/untic.o \$("untic"_DEPS) \$(EXECDEPS)
+-	\$(CC) -o \$(OBJDIR)/untic \$(LDFLAGS) \$(OBJDIR)/untic.o \$("untic"_LIBS) \$(EXECLIBS)
+-\$(OBJDIR)/untic.o : \$(SRCDIR)/untic.c \$(DOT_O_DEPS) \$("untic"_O_DEP)
+-	cd \$(OBJDIR); \$(COMPILE_CMD) \$("untic"_INC) \$(EXECINC) \$(SRCDIR)/untic.c
+-"
+-
+- 
+- echo "$PROGRAM_OBJECT_RULES" >> src/Makefile
+-
+- 
+- echo "$PROGRAM_ELF_ORULES" >> src/Makefile
+-
++JD_CREATE_EXEC_RULE(calc)
++JD_CREATE_EXEC_RULE(untic)
++JD_APPEND_RULES(src/Makefile)
++JD_APPEND_ELFRULES(src/Makefile)
+ 
+ echo ""
+ echo "Configuration complete.  You may need to edit src/Makefile."