diff --git a/Makefile.in b/Makefile.in index 3b8a1c2..8ac0edf 100644 --- a/Makefile.in +++ b/Makefile.in @@ -10,6 +10,8 @@ ifneq ($(SCSH_INCLUDES),) INCLUDES += -I$(SCSH_INCLUDES) endif +SCSH_MODULES = @scsh_modules@ + SCX_VERSION = "0.1" SCX_VM = scxvm SCX_IMAGE = scx.image @@ -87,13 +89,15 @@ main.o: c/main.c STARTUP_MSG = "with SCX $(SCX_VERSION), the X11 support" +SCSH_ARGS = +lp $(SCSH_MODULES)/ -ll sunterlib.scm + $(SCX_IMAGE): $(SCX_VM) $(SCM_FILES) $(SCM_CONFIG_FILES) ( \ echo ",batch on"; \ echo ",config ,load $(SCM_CONFIG_FILES)"; \ echo ",load-package xlib"; \ echo "(dump-scsh \"$(SCX_IMAGE)\")"; \ - ) | ./$(SCX_VM) + ) | ./$(SCX_VM) $(SCSH_ARGS) # echo ",load-package xpm"; \ diff --git a/configure.in b/configure.in index 921a140..3d16723 100644 --- a/configure.in +++ b/configure.in @@ -7,12 +7,15 @@ AC_INIT AC_SUBST(x_includes) AC_SUBST(x_libraries) - AC_ARG_WITH(scsh-includes, [ --with-scsh-includes=DIR scsh include files are in DIR [/usr/local]], + AC_ARG_WITH(scsh-includes, [ --with-scsh-includes=DIR scsh include files are in DIR [/usr/local/include]], scsh_includes=$withval , scsh_includes=) AC_SUBST(scsh_includes) AC_ARG_WITH(scsh-libraries, [ --with-scsh-libraries=DIR scsh libraries are in DIR [/usr/local/lib/scsh]], scsh_libraries=$withval , scsh_libraries=/usr/local/lib/scsh) AC_SUBST(scsh_libraries) + AC_ARG_WITH(scsh-modules, [ --with-scsh-modules=DIR scsh modules are in DIR [/usr/local/lib/scsh/modules]], + scsh_modules=$withval , scsh_libraries=/usr/local/lib/scsh/modules) + AC_SUBST(scsh_modules) #AC_MSG_CHECKING(scsh installation) #AC_CHECK_HEADER(scheme48.h)