diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2023-04-16 12:59:50 +0300 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2023-04-16 12:59:50 +0300 |
| commit | 2344b11599ce696ebc0bd7773befada44246897c (patch) | |
| tree | 3349209da9568f8e38096f121de0d3778ea2f870 /configure.ac | |
| parent | a6b5394086260c262e393dd113057916fd14134b (diff) | |
| download | sciteco-2344b11599ce696ebc0bd7773befada44246897c.tar.gz | |
updated Scintilla to v5.3.4, Scinterm to v4.1 and Lexilla to v5.2.4
* actually everything is updated to their current HEADs but the aforementioned versions are close.
* Scintilla uses threads now, so we added checks for pthread.
To be on the safe side, we imported AX_PTHREAD from the Autoconf archives.
The flags are kept out of the ordinary build system, though and used only for compiling Scintilla
and for linking.
SciTECO may also use threads, but via Glib.
* Scinterm removed SCI_COLOR_PAIR(), so we re-added it to src/interface-curses/interface.c.
* There is an Asciidoc lexer now.
* The <Ix$> interruption bug (see TODO) is not fixed by this upgrade.
Perhaps the Mac OS version runs better now. Feedback is needed (refs #12).
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 4ee824c..1dec488 100644 --- a/configure.ac +++ b/configure.ac @@ -134,6 +134,13 @@ PKG_CHECK_MODULES(LIBGLIB, [glib-2.0 >= 2.44], [ LIBS="$LIBS $LIBGLIB_LIBS" ]) +# Required by Scintilla. +AX_PTHREAD([], [ + AC_MSG_ERROR([pthread not found!]) +]) +SCINTILLA_CXXFLAGS="$SCINTILLA_CXXFLAGS $PTHREAD_CFLAGS" +LIBS="$LIBS $PTHREAD_LIBS" + case $host in *-mingw*) AC_CHECK_HEADERS([windows.h], , [ @@ -200,11 +207,10 @@ AM_CONDITIONAL(LEXILLA, [test x$LEXILLA_PATH != xno]) if [[ x$LEXILLA_PATH != xno ]]; then LEXILLA_PATH=`canonicalize $LEXILLA_PATH` AC_SUBST(LEXILLA_PATH) + CPPFLAGS="$CPPFLAGS -I$LEXILLA_PATH/include" AC_DEFINE(HAVE_LEXILLA, 1, [Building with Lexilla (Lexer) support]) fi -CPPFLAGS="$CPPFLAGS -I$LEXILLA_PATH/include" - AC_ARG_WITH(interface, AS_HELP_STRING([--with-interface=ncurses|netbsd-curses|xcurses|pdcurses|pdcurses-gui|gtk], [Specify user interface [default=ncurses]]), |