diff options
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | src/Makefile.am | 16 |
2 files changed, 24 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index c4529cd..51d0535 100644 --- a/configure.ac +++ b/configure.ac @@ -31,6 +31,12 @@ if [[ x$READLINK = x ]]; then AC_MSG_ERROR([Required tool readlink not found!]) fi +# For bootstrapping via installed sciteco +AC_CHECK_PROG(SCITECO, sciteco, sciteco) +if [[ x$SCITECO = x ]]; then + bootstrap = yes +fi + # Checks for libraries. PKG_CHECK_MODULES(LIBGLIB, [glib-2.0], [ CFLAGS="$CFLAGS $LIBGLIB_CFLAGS" @@ -138,7 +144,12 @@ esac AM_CONDITIONAL(INTERFACE_GTK, [test x$INTERFACE = xgtk]) -#CXXFLAGS="$CXXFLAGS $CFLAGS" +AC_ARG_ENABLE(bootstrap, + AS_HELP_STRING([--enable-bootstrap], + [Bootstrap using sciteco-minimal, + otherwise use preinstalled sciteco [default=check]]), + [bootstrap=$enableval]) +AM_CONDITIONAL(BOOTSTRAP, [test x$bootstrap = xyes]) AC_CONFIG_FILES([Makefile src/Makefile]) AC_OUTPUT diff --git a/src/Makefile.am b/src/Makefile.am index 11d2830..81cf526 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,7 +10,13 @@ BUILT_SOURCES = symbols-scintilla.cpp symbols-scilexer.cpp EXTRA_DIST = gtk-info-popup.gob \ symbols-extract.tes +if BOOTSTRAP noinst_PROGRAMS = sciteco-minimal +BOOTSTRAP_SCITECO = ./sciteco-minimal +symbols-scintilla.cpp symbols-scilexer.cpp : sciteco-minimal +else +BOOTSTRAP_SCITECO = @SCITECO@ +endif sciteco_minimal_SOURCES = main.cpp sciteco.h \ cmdline.cpp \ undo.cpp undo.h \ @@ -44,13 +50,15 @@ sciteco_SOURCES = $(sciteco_minimal_SOURCES) nodist_sciteco_SOURCES = $(nodist_sciteco_minimal_SOURCES) \ symbols-scintilla.cpp symbols-scilexer.cpp +CLEANFILES = $(BUILT_SOURCES) + %.c %.h %-private.h : %.gob @GOB2@ $< symbols-scintilla.cpp : @SCINTILLA_PATH@/include/Scintilla.h \ - sciteco-minimal symbols-extract.tes - ./sciteco-minimal -m symbols-extract.tes $< $@ "SCI_" scintilla + symbols-extract.tes + $(BOOTSTRAP_SCITECO) -m symbols-extract.tes $< $@ "SCI_" scintilla symbols-scilexer.cpp : @SCINTILLA_PATH@/include/SciLexer.h \ - sciteco-minimal symbols-extract.tes - ./sciteco-minimal -m symbols-extract.tes $< $@ "SCLEX_,SCE_" scilexer + symbols-extract.tes + $(BOOTSTRAP_SCITECO) -m symbols-extract.tes $< $@ "SCLEX_,SCE_" scilexer |