--- configure.orig	Fri Aug  4 04:49:54 2000
+++ configure	Mon Aug 14 21:05:37 2000
@@ -10814,11 +10814,11 @@
 
     if test -z "$with_ncurses"; then
     
-echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:10819: checking for tgetent in -lncurses" >&5
+echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
+echo "configure:10819: checking for tgetent in -lcurses" >&5
 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
 
-xe_check_libs=" -lncurses "
+xe_check_libs=" -lcurses "
 cat > conftest.$ac_ext <<EOF
 #line 10824 "configure"
 #include "confdefs.h"
@@ -10862,14 +10862,14 @@
 EOF
 }
 
-    ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:10868: checking for ncurses/curses.h" >&5
+    ac_safe=`echo "curses/curses.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for curses/curses.h""... $ac_c" 1>&6
+echo "configure:10868: checking for curses/curses.h" >&5
 
 cat > conftest.$ac_ext <<EOF
 #line 10871 "configure"
 #include "confdefs.h"
-#include <ncurses/curses.h>
+#include <curses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 { (eval echo configure:10876: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
@@ -10887,19 +10887,19 @@
 rm -f conftest*
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  curses_h_path=ncurses/curses.h
+  curses_h_path=curses/curses.h
 else
   echo "$ac_t""no" 1>&6
 fi
 
-    ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6
-echo "configure:10898: checking for ncurses/term.h" >&5
+    ac_safe=`echo "curses/term.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for curses/term.h""... $ac_c" 1>&6
+echo "configure:10898: checking for curses/term.h" >&5
 
 cat > conftest.$ac_ext <<EOF
 #line 10901 "configure"
 #include "confdefs.h"
-#include <ncurses/term.h>
+#include <curses/term.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 { (eval echo configure:10906: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
@@ -10917,7 +10917,7 @@
 rm -f conftest*
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  term_h_path=ncurses/term.h
+  term_h_path=curses/term.h
 else
   echo "$ac_t""no" 1>&6
 fi
@@ -10925,19 +10925,19 @@
     extra_objs="$extra_objs terminfo.o" &&  if test "$extra_verbose" = "yes"; then
    echo "    xemacs will be linked with \"terminfo.o\""
  fi
-    LIBS="-lncurses $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lncurses\" to \$LIBS"; fi
+    LIBS="-lcurses $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lncurses\" to \$LIBS"; fi
 
     if test "$ac_cv_header_ncurses_curses_h" != "yes" ; then
                         save_c_switch_site="$c_switch_site"
       c_switch_site="$c_switch_site -I/usr/include/ncurses"
-      ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:10936: checking for ncurses/curses.h" >&5
+      ac_safe=`echo "curses/curses.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for curses/curses.h""... $ac_c" 1>&6
+echo "configure:10936: checking for curses/curses.h" >&5
 
 cat > conftest.$ac_ext <<EOF
 #line 10939 "configure"
 #include "confdefs.h"
-#include <ncurses/curses.h>
+#include <curses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 { (eval echo configure:10944: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
@@ -10955,7 +10955,7 @@
 rm -f conftest*
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  curses_h_path=ncurses/curses.h
+  curses_h_path=curses/curses.h
 else
   echo "$ac_t""no" 1>&6
 fi
