From 9ad99af93e936a0e17e479e03d116bee634aa757 Mon Sep 17 00:00:00 2001 From: "Ben \"root\" Anderson" Date: Fri, 25 Oct 2013 01:51:32 -0500 Subject: [PATCH] Force -m32 on Windows because prebuilts; use windows.m4; Add --with-linux-tty so that driver can actually be used; correct a a Linux check --- configure.ac | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index e3fe8773fb..6c903b7b13 100644 --- a/configure.ac +++ b/configure.ac @@ -27,8 +27,13 @@ test "$DEFAULT_LDFLAGS" = "yes" && LDFLAGS="" if test "$host_os" = "mingw32"; then CPPFLAGS="$CPPFLAGS -I$PWD/extern/for_mingw/include" LDFLAGS="$LDFLAGS -L$PWD/extern/for_mingw/lib" + # HACK: The prebuilts are 32bit only. Force the issue. + CFLAGS="$CFLAGS -m32" fi +AM_CONDITIONAL(WITH_TTY, test "$with_tty" = "yes") +AC_ARG_WITH(linux-tty, AS_HELP_STRING([--with-linux-tty], [Enable Linux TTY input]), with_tty=yes, with_tty=no) + compile=release AC_ARG_WITH(debug, AS_HELP_STRING([--with-debug],[Enable debug mode]), with_debug=$withval, with_debug=no) AC_ARG_WITH(fast-compile, AS_HELP_STRING([--with-fast-compile],[Enable fast compile]), with_fast_compile=$withval, with_fast_compile=no) @@ -135,7 +140,10 @@ case $host_os in unix=yes ;; esac -if test $host_os != mingw32; then +if test "$windows" = "yes"; then + SM_WINDOWS +fi +if test "$linux" = "yes"; then AC_DEFINE(LUA_USE_LINUX, 1, [Linux for Lua]) fi AM_CONDITIONAL(UNIX, test "$unix" = "yes" )