diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2014-10-07 19:23:45 +0200 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2014-10-07 19:23:45 +0200 |
| commit | 08c58ff72efd61380e82329609c552d3c446071d (patch) | |
| tree | d4200ee62204797e325df4446784f982e4250faa /configure.ac | |
| parent | af17bd73e210f16c8947acb8119ff9e2d3c2f054 (diff) | |
| parent | 35df3d7d0928b57166b2da800d40d38f079ce768 (diff) | |
| download | sciteco-08c58ff72efd61380e82329609c552d3c446071d.tar.gz | |
Merge branch 'master' of https://github.com/rhaberkorn/sciteco
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 6 insertions, 2 deletions
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], |