gsl-shell.git - gsl-shell

diff --git a/Makefile b/Makefile
index afe094e9..4919a475 100644
--- a/Makefile
+++ b/Makefile

@@ -45,8 +45,12 @@ endif

SUBDIRS = $(LUADIR)

-C_SRC_FILES = completion.c gs-types.c lua-utils.c lua-rng.c randist.c sf.c lua-graph.c \

- lua-gsl.c

+C_SRC_FILES = gs-types.c lua-utils.c lua-rng.c randist.c sf.c \

+ lua-graph.c lua-gsl.c

+

+ifeq ($(strip $(USE_READLINE)),yes)

+ C_SRC_FILES += completion.c

+endif

LUA_BASE_FILES = bspline.lua fft-init.lua integ-init.lua randist-init.lua template.lua check.lua graph-init.lua iter.lua time.lua gsl-check.lua linfit.lua roots.lua contour.lua gsl.lua matrix.lua strict.lua csv.lua gslext.lua num.lua demo-init.lua import.lua plot3d.lua

diff --git a/gsl-shell-jit.c b/gsl-shell-jit.c
index d95052b5..e1d57f67 100644
--- a/gsl-shell-jit.c
+++ b/gsl-shell-jit.c

@@ -628,7 +628,9 @@ int main(int argc, char **argv)

{

int status;

struct Smain s;

+#ifdef USE_READLINE

initialize_readline();

+#endif

pthread_mutex_init (gsl_shell_mutex, NULL);

lua_State *L = lua_open(); /* create state */

if (L == NULL) {

diff --git a/makedefs b/makedefs
index 1b9232aa..25e01738 100644
--- a/makedefs
+++ b/makedefs

@@ -49,8 +49,10 @@ ifeq ($(strip $(DISABLE_GAMMA_CORR)), yes)

DEFS += -DDISABLE_GAMMA_CORR

endif

-ifeq ($(strip $(USE_READLINE)), yes)

+ifeq ($(strip $(USE_READLINE)),yes)

ifneq ($(HOST_SYS),Windows)

DEFS += -DUSE_READLINE

+ else

+ USE_READLINE = no

endif

endif