if test "$athena" = true; then
enable_athena=yes
- prefix=/afs/athena.mit.edu/system/moira
+ prefix=/afs/.athena.mit.edu/system/moira
bindir=$prefix/arch/$ATHENA_SYS/bin
sbindir=$bindir
if test "$readline" != no; then
if test "$readline" != yes; then
- READLINE_CPPFLAGS="-I$readline/include -I$readline/include/readline"
+ READLINE_CPPFLAGS="-I$readline/include"
READLINE_LIBS="-L$readline/lib"
- else
- READLINE_CPPFLAGS="-I/usr/include/readline"
fi
READLINE_CPPFLAGS="$READLINE_CPPFLAGS -DHAVE_READLINE"
READLINE_LIBS="$READLINE_LIBS -lreadline -ltermcap"
# Curses
curses=curses
echo "checking for curses" 1>&6
-echo "configure:2358: checking for curses" >&5
+echo "configure:2356: checking for curses" >&5
echo $ac_n "checking for main in -lcurses""... $ac_c" 1>&6
-echo "configure:2360: checking for main in -lcurses" >&5
+echo "configure:2358: checking for main in -lcurses" >&5
ac_lib_var=`echo curses'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lcurses $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2368 "configure"
+#line 2366 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2373: \"$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
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for main in -lncurses""... $ac_c" 1>&6
-echo "configure:2394: checking for main in -lncurses" >&5
+echo "configure:2392: checking for main in -lncurses" >&5
ac_lib_var=`echo ncurses'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lncurses $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2402 "configure"
+#line 2400 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2407: \"$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
OLDLIBS=$LIBS
LIBS=-l$curses
echo "checking if curses needs termcap" 1>&6
-echo "configure:2435: checking if curses needs termcap" >&5
+echo "configure:2433: checking if curses needs termcap" >&5
if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 2440 "configure"
+#line 2438 "configure"
#include "confdefs.h"
#include <curses.h>
main(int argc, char **argv)
return 0;
}
EOF
-if { (eval echo configure:2450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
CURSES_LIBS="-l$curses"
else
:
else
cat > conftest.$ac_ext <<EOF
-#line 2462 "configure"
+#line 2460 "configure"
#include "confdefs.h"
#include <curses.h>
main(int argc, char **argv)
return 0;
}
EOF
-if { (eval echo configure:2472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
CURSES_LIBS="-l$curses -ltermcap"
else
OLDLIBS=$LIBS
LIBS=$CURSES_LIBS
cat > conftest.$ac_ext <<EOF
-#line 2494 "configure"
+#line 2492 "configure"
#include "confdefs.h"
#include <curses.h>
int main() {
WINDOW *w; getmaxx(w);
; return 0; }
EOF
-if { (eval echo configure:2501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
:
else
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 2509 "configure"
+#line 2507 "configure"
#include "confdefs.h"
#include <curses.h>
int main() {
WINDOW *w; w->_maxx;
; return 0; }
EOF
-if { (eval echo configure:2516: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
CURSES_CPPFLAGS="-D'getmaxx(w)=w->_maxx'"
else
fi
rm -f conftest*
cat > conftest.$ac_ext <<EOF
-#line 2529 "configure"
+#line 2527 "configure"
#include "confdefs.h"
#include <curses.h>
int main() {
newterm(NULL, NULL, NULL);
; return 0; }
EOF
-if { (eval echo configure:2536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
CURSES_CPPFLAGS="$CURSES_CPPFLAGS -DCURSES_HAS_NEWTERM"
else
-for ac_func in getusershell
+for ac_func in getusershell strlcpy strlcat
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2558: checking for $ac_func" >&5
+echo "configure:2556: 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 2563 "configure"
+#line 2561 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:2586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2584: \"$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