Add --disable-console option to configure script.

diff --git a/Makefile.am b/Makefile.am
index 20e06f6fc553f7d2bf5cecac2c33b41bb87ac5e3..58303f82591a02db182b590b5aaf4ff78573cfdb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,6 +51,7 @@ libcycript_sys_la_LIBADD = $(LTLIBFFI) -ldl
 libcycript_sys_la_SOURCES += Cycript.tab.cc
 libcycript_sys_la_SOURCES += lex.cy.cpp
 
 libcycript_sys_la_SOURCES += Cycript.tab.cc
 libcycript_sys_la_SOURCES += lex.cy.cpp
 

+if CY_CONSOLE

 bin_PROGRAMS = cycript
 cycript_SOURCES = Console.cpp Display.cpp
 cycript_LDADD = libcycript.la libcycript-sys.la $(LTLIBAPR) $(LTLIBREADLINE) $(LTLIBTERMCAP) -ldl
 bin_PROGRAMS = cycript
 cycript_SOURCES = Console.cpp Display.cpp
 cycript_LDADD = libcycript.la libcycript-sys.la $(LTLIBAPR) $(LTLIBREADLINE) $(LTLIBTERMCAP) -ldl


@@ -59,6 +60,7 @@ ldid = true
 entitle = $(ldid) -Scycript.xml
 
 filters = $(CY_FILTERS)
 entitle = $(ldid) -Scycript.xml
 
 filters = $(CY_FILTERS)

+endif

 
 if CY_EXECUTE
 libcycript_sys_la_SOURCES += sig/ffi_type.cpp sig/parse.cpp sig/copy.cpp
 
 if CY_EXECUTE
 libcycript_sys_la_SOURCES += sig/ffi_type.cpp sig/parse.cpp sig/copy.cpp


@@ -87,6 +89,8 @@ endif
 
 if CY_MACH
 libcycript_sys_la_SOURCES += Handler.mm
 
 if CY_MACH
 libcycript_sys_la_SOURCES += Handler.mm

+
+if CY_CONSOLE

 cycript_SOURCES += Mach/Inject.cpp
 
 AM_CPPFLAGS += -DCY_ATTACH
 cycript_SOURCES += Mach/Inject.cpp
 
 AM_CPPFLAGS += -DCY_ATTACH


@@ -106,6 +110,7 @@ Trampoline.t.hpp: libTrampoline.t.la trampoline.sh
        $(srcdir)/trampoline.sh $@ .libs/libTrampoline.t.dylib Trampoline $(SED) $(LIPO) $(NM) $(OTOOL)
        ! grep '## symbol stub for:' $@
 endif
        $(srcdir)/trampoline.sh $@ .libs/libTrampoline.t.dylib Trampoline $(SED) $(LIPO) $(NM) $(OTOOL)
        ! grep '## symbol stub for:' $@
 endif

+endif

 
 libcycript_sim_la_SHORTNAME = sim
 if CY_IOS_SIMULATOR
 
 libcycript_sim_la_SHORTNAME = sim
 if CY_IOS_SIMULATOR

diff --git a/configure.ac b/configure.ac
index a446810b29e361b75dd546eb22734d7b44ddf4dc..1115adf390efb5d0873930310046d3ece5767c38 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -210,6 +210,10 @@ AC_ARG_ENABLE([javascript], [AS_HELP_STRING(
 ], [CY_CHECK_JAVASCRIPT])
 dnl }}}
 
 ], [CY_CHECK_JAVASCRIPT])
 dnl }}}
 

+AC_ARG_ENABLE([console], AS_HELP_STRING([--disable-console], [disable console]))
+AM_CONDITIONAL([CY_CONSOLE], [test "x$enable_console" != "xno"])
+
+AM_COND_IF([CY_CONSOLE], [

 dnl APR_FIND_APR {{{
 AS_IF([test "x$LTLIBAPR" != x], [
     AC_SUBST([LTLIBAPR])
 dnl APR_FIND_APR {{{
 AS_IF([test "x$LTLIBAPR" != x], [
     AC_SUBST([LTLIBAPR])


@@ -223,6 +227,7 @@ AS_CASE([$apr_found], [yes], [
     AC_MSG_ERROR([missing "libapr"])
 ])])
 dnl }}}
     AC_MSG_ERROR([missing "libapr"])
 ])])
 dnl }}}

+])

 
 AC_DEFUN([CY_CHECK_PKG_CONFIG_LIBFFI], [
     PKG_CHECK_MODULES([LIBFFI], [libffi], [
 
 AC_DEFUN([CY_CHECK_PKG_CONFIG_LIBFFI], [
     PKG_CHECK_MODULES([LIBFFI], [libffi], [