- remove the part that aborts if readline is not found
This commit is contained in:
Bryce Denney
parent
3b6d9ae017
commit
5be1416c96
76
bochs/configure
vendored
76
bochs/configure
vendored
@ -3705,22 +3705,9 @@ rm -fr conftest*
|
||||
fi
|
||||
|
||||
LIBS=$OLD_LIBS
|
||||
if test "$rl_without_curses_ok" = no -a "$rl_with_curses_ok" = no; then
|
||||
echo WARNING: readline was found but it is broken, with or without the -lcurses link option
|
||||
exit 1
|
||||
elif test "$rl_without_curses_ok" = no; then
|
||||
# we must add -lcurses!
|
||||
if test "$READLINE_LIB" != ""; then
|
||||
echo Adding -lcurses to your library list.
|
||||
READLINE_LIB="$READLINE_LIB -lcurses"
|
||||
fi
|
||||
else
|
||||
true # it worked without anything special
|
||||
fi
|
||||
|
||||
|
||||
echo $ac_n "checking whether user wants readline""... $ac_c" 1>&6
|
||||
echo "configure:3724: checking whether user wants readline" >&5
|
||||
echo "configure:3711: checking whether user wants readline" >&5
|
||||
# Check whether --enable-readline or --disable-readline was given.
|
||||
if test "${enable_readline+set}" = set; then
|
||||
enableval="$enable_readline"
|
||||
@ -3741,7 +3728,7 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking whether to use readline""... $ac_c" 1>&6
|
||||
echo "configure:3745: checking whether to use readline" >&5
|
||||
echo "configure:3732: checking whether to use readline" >&5
|
||||
if test "$want_readline" = yes; then
|
||||
if test "$bx_debugger" = 1; then
|
||||
if test "$rl_without_curses_ok" = yes; then
|
||||
@ -3771,19 +3758,20 @@ else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
|
||||
ac_safe=`echo "readline/history.h" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for readline/history.h""... $ac_c" 1>&6
|
||||
echo "configure:3777: checking for readline/history.h" >&5
|
||||
echo "configure:3765: checking for readline/history.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 3782 "configure"
|
||||
#line 3770 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <readline/history.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:3787: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:3775: \"$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*
|
||||
@ -3810,7 +3798,7 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking for loader support""... $ac_c" 1>&6
|
||||
echo "configure:3814: checking for loader support" >&5
|
||||
echo "configure:3802: checking for loader support" >&5
|
||||
# Check whether --enable-loader or --disable-loader was given.
|
||||
if test "${enable_loader+set}" = set; then
|
||||
enableval="$enable_loader"
|
||||
@ -3848,7 +3836,7 @@ fi
|
||||
INSTRUMENT_DIR='instrument/stubs'
|
||||
|
||||
echo $ac_n "checking for instrumentation support""... $ac_c" 1>&6
|
||||
echo "configure:3852: checking for instrumentation support" >&5
|
||||
echo "configure:3840: checking for instrumentation support" >&5
|
||||
# Check whether --enable-instrumentation or --disable-instrumentation was given.
|
||||
if test "${enable_instrumentation+set}" = set; then
|
||||
enableval="$enable_instrumentation"
|
||||
@ -3983,7 +3971,7 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking for VGA emulation""... $ac_c" 1>&6
|
||||
echo "configure:3987: checking for VGA emulation" >&5
|
||||
echo "configure:3975: checking for VGA emulation" >&5
|
||||
# Check whether --enable-vga or --disable-vga was given.
|
||||
if test "${enable_vga+set}" = set; then
|
||||
enableval="$enable_vga"
|
||||
@ -4017,7 +4005,7 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking for FPU emulation""... $ac_c" 1>&6
|
||||
echo "configure:4021: checking for FPU emulation" >&5
|
||||
echo "configure:4009: checking for FPU emulation" >&5
|
||||
FPU_VAR=''
|
||||
FPU_GLUE_OBJ=''
|
||||
# Check whether --enable-fpu or --disable-fpu was given.
|
||||
@ -4062,7 +4050,7 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking for x86 debugger support""... $ac_c" 1>&6
|
||||
echo "configure:4066: checking for x86 debugger support" >&5
|
||||
echo "configure:4054: checking for x86 debugger support" >&5
|
||||
# Check whether --enable-x86-debugger or --disable-x86-debugger was given.
|
||||
if test "${enable_x86_debugger+set}" = set; then
|
||||
enableval="$enable_x86_debugger"
|
||||
@ -4098,7 +4086,7 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking for CDROM support""... $ac_c" 1>&6
|
||||
echo "configure:4102: checking for CDROM support" >&5
|
||||
echo "configure:4090: checking for CDROM support" >&5
|
||||
# Check whether --enable-cdrom or --disable-cdrom was given.
|
||||
if test "${enable_cdrom+set}" = set; then
|
||||
enableval="$enable_cdrom"
|
||||
@ -4137,7 +4125,7 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking for Sound Blaster 16 support""... $ac_c" 1>&6
|
||||
echo "configure:4141: checking for Sound Blaster 16 support" >&5
|
||||
echo "configure:4129: checking for Sound Blaster 16 support" >&5
|
||||
# Check whether --enable-sb16 or --disable-sb16 was given.
|
||||
if test "${enable_sb16+set}" = set; then
|
||||
enableval="$enable_sb16"
|
||||
@ -4211,7 +4199,7 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking for I/O Interface to the debugger""... $ac_c" 1>&6
|
||||
echo "configure:4215: checking for I/O Interface to the debugger" >&5
|
||||
echo "configure:4203: checking for I/O Interface to the debugger" >&5
|
||||
IODEBUG_OBJS=''
|
||||
# Check whether --enable-iodebug or --disable-iodebug was given.
|
||||
if test "${enable_iodebug+set}" = set; then
|
||||
@ -4336,7 +4324,7 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking for gui library to use""... $ac_c" 1>&6
|
||||
echo "configure:4340: checking for gui library to use" >&5
|
||||
echo "configure:4328: checking for gui library to use" >&5
|
||||
|
||||
if (test "$with_x11" != yes) && \
|
||||
(test "$with_beos" != yes) && \
|
||||
@ -4509,7 +4497,7 @@ fi
|
||||
|
||||
if test "$use_curses" = yes; then
|
||||
echo $ac_n "checking for mvaddch in -lcurses""... $ac_c" 1>&6
|
||||
echo "configure:4513: checking for mvaddch in -lcurses" >&5
|
||||
echo "configure:4501: checking for mvaddch in -lcurses" >&5
|
||||
ac_lib_var=`echo curses'_'mvaddch | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -4517,7 +4505,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lcurses $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4521 "configure"
|
||||
#line 4509 "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
|
||||
@ -4528,7 +4516,7 @@ int main() {
|
||||
mvaddch()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:4520: \"$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
|
||||
@ -4549,7 +4537,7 @@ else
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for mvaddch in -lncurses""... $ac_c" 1>&6
|
||||
echo "configure:4553: checking for mvaddch in -lncurses" >&5
|
||||
echo "configure:4541: checking for mvaddch in -lncurses" >&5
|
||||
ac_lib_var=`echo ncurses'_'mvaddch | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -4557,7 +4545,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lncurses $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4561 "configure"
|
||||
#line 4549 "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
|
||||
@ -4568,7 +4556,7 @@ int main() {
|
||||
mvaddch()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:4560: \"$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
|
||||
@ -4589,7 +4577,7 @@ else
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for mvaddch in -ltermlib""... $ac_c" 1>&6
|
||||
echo "configure:4593: checking for mvaddch in -ltermlib" >&5
|
||||
echo "configure:4581: checking for mvaddch in -ltermlib" >&5
|
||||
ac_lib_var=`echo termlib'_'mvaddch | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -4597,7 +4585,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ltermlib $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4601 "configure"
|
||||
#line 4589 "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
|
||||
@ -4608,7 +4596,7 @@ int main() {
|
||||
mvaddch()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:4600: \"$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
|
||||
@ -4637,18 +4625,18 @@ fi
|
||||
if test "$with_rfb" = yes; then
|
||||
# first see if compiler takes "-pthread" argument
|
||||
echo $ac_n "checking for -pthread arg to compiler""... $ac_c" 1>&6
|
||||
echo "configure:4641: checking for -pthread arg to compiler" >&5
|
||||
echo "configure:4629: checking for -pthread arg to compiler" >&5
|
||||
CFLAGS_SAVE="$CFLAGS"
|
||||
CFLAGS="$CFLAGS -pthread"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4645 "configure"
|
||||
#line 4633 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <pthread.h>
|
||||
int main() {
|
||||
pthread_create(0,0,0,0);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:4640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
|
||||
# it compiles with -pthread
|
||||
@ -4664,7 +4652,7 @@ else
|
||||
# now try with -lpthread
|
||||
CFLAGS="$CFLAGS_SAVE"
|
||||
echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
|
||||
echo "configure:4668: checking for pthread_create in -lpthread" >&5
|
||||
echo "configure:4656: checking for pthread_create in -lpthread" >&5
|
||||
ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -4672,7 +4660,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lpthread $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4676 "configure"
|
||||
#line 4664 "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
|
||||
@ -4683,7 +4671,7 @@ int main() {
|
||||
pthread_create()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:4675: \"$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
|
||||
@ -4739,7 +4727,7 @@ fi
|
||||
# Extract the first word of "gzip", so it can be a program name with args.
|
||||
set dummy gzip; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4743: checking for $ac_word" >&5
|
||||
echo "configure:4731: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_GZIP'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -4774,7 +4762,7 @@ fi
|
||||
# Extract the first word of "tar", so it can be a program name with args.
|
||||
set dummy tar; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4778: checking for $ac_word" >&5
|
||||
echo "configure:4766: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_TAR'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
||||
@ -527,19 +527,6 @@ AC_TRY_RUN([
|
||||
[ AC_MSG_RESULT(no) ]
|
||||
)
|
||||
LIBS=$OLD_LIBS
|
||||
if test "$rl_without_curses_ok" = no -a "$rl_with_curses_ok" = no; then
|
||||
echo WARNING: readline was found but it is broken, with or without the -lcurses link option
|
||||
exit 1
|
||||
elif test "$rl_without_curses_ok" = no; then
|
||||
# we must add -lcurses!
|
||||
if test "$READLINE_LIB" != ""; then
|
||||
echo Adding -lcurses to your library list.
|
||||
READLINE_LIB="$READLINE_LIB -lcurses"
|
||||
fi
|
||||
else
|
||||
true # it worked without anything special
|
||||
fi
|
||||
AC_SUBST(READLINE_LIB)
|
||||
|
||||
AC_MSG_CHECKING(whether user wants readline)
|
||||
AC_ARG_ENABLE(readline,
|
||||
@ -580,6 +567,7 @@ if test "$want_readline" = yes; then
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
AC_SUBST(READLINE_LIB)
|
||||
|
||||
AC_CHECK_HEADER(readline/history.h,
|
||||
AC_DEFINE(HAVE_READLINE_HISTORY_H)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user