aboutsummaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorSteve Bennett <steveb@workware.net.au>2010-11-19 21:49:32 +1000
committerSteve Bennett <steveb@workware.net.au>2010-11-19 21:49:32 +1000
commit2dca378061f626b371c91ae3feb618af555fd50d (patch)
tree5e22df9427ddc85bdaac40018daaccd8d9a474d9 /configure.ac
parent4bc9fdcf23cf4f75084845edc4940b98880ba634 (diff)
downloadjimtcl-2dca378061f626b371c91ae3feb618af555fd50d.zip
jimtcl-2dca378061f626b371c91ae3feb618af555fd50d.tar.gz
jimtcl-2dca378061f626b371c91ae3feb618af555fd50d.tar.bz2
Disable line editing on systems without termios
Reported-By: Spencer Oliver <ntfreak@users.sourceforge.net> Signed-off-by: Steve Bennett <steveb@workware.net.au>
Diffstat (limited to 'configure.ac')
-rwxr-xr-xconfigure.ac12
1 files changed, 7 insertions, 5 deletions
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)