diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2024-08-23 04:13:15 +0200 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2024-08-23 04:51:55 +0200 |
| commit | ee9cf43587d5fef3a0f6d97ef50b8cf848945bcb (patch) | |
| tree | 4e4bb285120f56c65292dfc9ae33d126bf06ad8e /configure.ac | |
| parent | e2c7c11066739cf1141f1d47dc3789a5e82eb9cd (diff) | |
| download | sciteco-ee9cf43587d5fef3a0f6d97ef50b8cf848945bcb.tar.gz | |
fully support out of tree builds
* You no longer have to copy contrib/scintilla, contrib/scinterm and contrib/lexilla
manually to the build directory.
* It turns out, that Scintilla/Lexilla was supporting this since 2016.
Scintilla allows pointing to a source directory (srdir) and Lexilla to a binary directory (DIR_O).
* For Scinterm I opened a pull request in order to add srcdir/basedir variables:
https://github.com/orbitalquark/scinterm/pull/21
* `make distcheck` is therefore now also fixed.
* The FreeBSD package is now allowed to build out of source.
I haven't tested it yet.
* See also https://github.com/ScintillaOrg/lexilla/issues/266
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index d12dda5..511d169 100644 --- a/configure.ac +++ b/configure.ac @@ -191,8 +191,8 @@ AM_CPPFLAGS="$AM_CPPFLAGS -D'SCITECODATADIR=\"\$(scitecodatadir)\"' \ # Scintilla (some platforms ship with it). AC_ARG_WITH(scintilla, AS_HELP_STRING([--with-scintilla=PATH], - [Specify Scintilla's path [default=./contrib/scintilla]]), - [SCINTILLA_PATH=$withval], [SCINTILLA_PATH=./contrib/scintilla]) + [Specify Scintilla's path [default=SRCDIR/contrib/scintilla]]), + [SCINTILLA_PATH=$withval], [SCINTILLA_PATH=$srcdir/contrib/scintilla]) SCINTILLA_PATH=`canonicalize $SCINTILLA_PATH` AC_SUBST(SCINTILLA_PATH) @@ -200,15 +200,15 @@ CPPFLAGS="$CPPFLAGS -I$SCINTILLA_PATH/include" AC_ARG_WITH(scinterm, AS_HELP_STRING([--with-scinterm=PATH], - [Specify Scinterm's path [default=./contrib/scinterm]]), - [SCINTERM_PATH=$withval], [SCINTERM_PATH=./contrib/scinterm]) + [Specify Scinterm's path [default=SRCDIR/contrib/scinterm]]), + [SCINTERM_PATH=$withval], [SCINTERM_PATH=$srcdir/contrib/scinterm]) SCINTERM_PATH=`canonicalize $SCINTERM_PATH` AC_SUBST(SCINTERM_PATH) AC_ARG_WITH(lexilla, AS_HELP_STRING([--with-lexilla=PATH], - [Specify Lexilla's path [default=./contrib/lexilla]]), - [LEXILLA_PATH=$withval], [LEXILLA_PATH=./contrib/lexilla]) + [Specify Lexilla's path [default=SRCDIR/contrib/lexilla]]), + [LEXILLA_PATH=$withval], [LEXILLA_PATH=$srcdir/contrib/lexilla]) AM_CONDITIONAL(LEXILLA, [test x$LEXILLA_PATH != xno]) if [[ x$LEXILLA_PATH != xno ]]; then LEXILLA_PATH=`canonicalize $LEXILLA_PATH` |