From 30d8bf3e2835dbb0bf6876a6a1d4dd227ba335a9 Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Fri, 22 Aug 2014 05:54:47 +0200 Subject: automatically build Scintilla as part of SciTECO's build system: this should simplify building SciTECO for new users * compiler and archiver are passed down from Autoconf, so cross-compiling should work transparently * `make clean` will also clean the Scintilla source tree * there is no longer any need for "source bundles" as tar balls also contain Scintilla/Scinterm now * building from Git is not much more difficult than building from a tar ball * The versions of Scintilla/Scinterm embedded as submodules already contain all the patches necessary (currently none are necessary), so there's no need to have patch files in the repository * INSTALL instructions have been rewritten * the --with-scintilla and --with-scinterm site-config options have been kept. But they should be rarely necessary now. --- configure.ac | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 1e13986..8b67de1 100644 --- a/configure.ac +++ b/configure.ac @@ -35,6 +35,9 @@ AC_PROG_CC_C99 AC_PROG_GREP AC_PROG_INSTALL +# Required by the Scintilla build process: +AC_CHECK_TOOL(AR, ar) + # Emscripten uses Clang as well AM_CONDITIONAL(CLANG, [$CXX --version | $GREP -E "clang|Emscripten" >/dev/null]) @@ -99,8 +102,8 @@ esac # AC_ARG_WITH(scintilla, AS_HELP_STRING([--with-scintilla=PATH], - [Specify Scintilla's path [default=../scintilla]]), - [SCINTILLA_PATH=$withval], [SCINTILLA_PATH=../scintilla]) + [Specify Scintilla's path [default=./scintilla]]), + [SCINTILLA_PATH=$withval], [SCINTILLA_PATH=./scintilla]) SCINTILLA_PATH=`canonicalize $SCINTILLA_PATH` AC_SUBST(SCINTILLA_PATH) @@ -111,6 +114,7 @@ AC_ARG_WITH(scinterm, [Specify Scinterm's path [default=SCINTILLA_PATH/scinterm]]), [SCINTERM_PATH=$withval], [SCINTERM_PATH=$SCINTILLA_PATH/scinterm]) SCINTERM_PATH=`canonicalize $SCINTERM_PATH` +AC_SUBST(SCINTERM_PATH) AC_ARG_WITH(interface, AS_HELP_STRING([--with-interface=ncurses|pdcurses|emcurses|gtk], -- cgit v1.2.3