diff options
| -rwxr-xr-x | configure | 19 | ||||
| -rwxr-xr-x | configure.ac | 12 |
2 files changed, 21 insertions, 10 deletions
@@ -3665,10 +3665,6 @@ if test "${enable_lineedit+set}" = set; then : fi -if test $lineedit -eq 1; then - EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_LINENOISE" - EXTRA_OBJS="$EXTRA_OBJS linenoise.o" -fi # Is $1 in list $2? in_list() @@ -3769,7 +3765,7 @@ if test "${with_jim_regexp+set}" = set; then : fi -for ac_header in sys/un.h dlfcn.h +for ac_header in sys/un.h dlfcn.h termios.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -3782,6 +3778,14 @@ fi done +ac_fn_c_check_header_mongrel "$LINENO" "termios.h" "ac_cv_header_termios_h" "$ac_includes_default" +if test "x$ac_cv_header_termios_h" = xyes; then : + +else + lineedit=0 +fi + + for ac_func in ualarm sysinfo lstat fork vfork do : @@ -4310,6 +4314,11 @@ if test $iswin = yes; then in_list "aio" "$ext $extmod" && LIBS="$LIBS -lwsock32" EXTRA_OBJS="$EXTRA_OBJS jim-win32compat.o" fi +if test $lineedit -eq 1; then + EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_LINENOISE" + EXTRA_OBJS="$EXTRA_OBJS linenoise.o" +fi + EXTRA_CFLAGS=$EXTRA_CFLAGS diff --git a/configure.ac b/configure.ac index 599c035..f00d1ad 100755 --- a/configure.ac +++ b/configure.ac @@ -93,10 +93,6 @@ AC_ARG_ENABLE(lineedit, fi ] ) -if test $lineedit -eq 1; then - EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_LINENOISE" - EXTRA_OBJS="$EXTRA_OBJS linenoise.o" -fi # Is $1 in list $2? in_list() @@ -214,7 +210,8 @@ AC_ARG_WITH(jim-regexp, ] ) -AC_CHECK_HEADERS([sys/un.h dlfcn.h]) +AC_CHECK_HEADERS([sys/un.h dlfcn.h termios.h]) +AC_CHECK_HEADER(termios.h,,lineedit=0) AC_CHECK_FUNCS([ualarm sysinfo lstat fork vfork]) AC_CHECK_FUNCS([backtrace geteuid mkstemp realpath strptime]) @@ -393,6 +390,11 @@ if test $iswin = yes; then in_list "aio" "$ext $extmod" && LIBS="$LIBS -lwsock32" EXTRA_OBJS="$EXTRA_OBJS jim-win32compat.o" fi +if test $lineedit -eq 1; then + EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_LINENOISE" + EXTRA_OBJS="$EXTRA_OBJS linenoise.o" +fi + AC_SUBST(EXTRA_CFLAGS,$EXTRA_CFLAGS) AC_SUBST(EXTRA_OBJS,$EXTRA_OBJS) |