added --with-scinterm site-config option and cleaned up Curses configuration

may be used to have multiple scinterm-versions in the Scintilla source tree

2 files changed, 27 insertions, 24 deletions

diff --git a/README b/README
index 7c8ffdb..a2b2568 100644
--- a/README
+++ b/README
@@ -17,7 +17,7 @@ SciTECO uses the [Scintilla](http://www.scintilla.org/) editor component and sup
 GTK+ as well as NCurses frontends (using [Scinterm](http://foicica.com/scinterm/)).
 The NCurses frontend also works with [PDCurses/XCurses](http://pdcurses.sourceforge.net/)
 and its [win32a port](http://www.projectpluto.com/win32a.htm).
-Both Linux and Windows are supported.
+Both Linux and Windows (MinGW 32/64) are supported.
 
 Features
 ========
@@ -54,11 +54,12 @@ SciTECO has the following build and runtime dependencies:
 * Other curses implementations might work as well but are untested.
 
 1. Build Scintilla as described in its README. If you want to build the ncurses version,
-   install Scinterm from a subdirectory of Scintilla called "scinterm".
+   install Scinterm from a subdirectory of Scintilla called `scinterm`
+   (also have a look at SciTECO's `--with-scinterm` configure option).
    * For TECO-style control code echoing, apply `patches/scintilla-teco-control-codes.patch`
      from the SciTECO archive/repository. This will hopefully be simplified in the future.
 2. Untar/unzip/check-out SciTECO into a subdirectory of Scintilla.
-   Alternatively, have a look at `--with-scintilla`.
+   Alternatively, have a look at SciTECO's `--with-scintilla` configure option.
 3. Build like any other Autoconf-based project. `autoreconf` (only necessary if building from
    a working copy), followed by `./configure`, followed by `make`.
    The interface may be chosen with `--with-interface` (ncurses is the default).
diff --git a/configure.ac b/configure.ac
index ae134c6..fe492bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,40 +91,42 @@ AC_SUBST(SCINTILLA_PATH)
 
 CPPFLAGS="$CPPFLAGS -I$SCINTILLA_PATH/include -DSCI_LEXER"
 
+AC_ARG_WITH(scinterm,
+	AS_HELP_STRING([--with-scinterm=PATH],
+		       [Specify Scinterm's path [default=SCINTILLA_PATH/scinterm]]),
+	[SCINTERM_PATH=$withval], [SCINTERM_PATH=$SCINTILLA_PATH/scinterm])
+SCINTERM_PATH=`eval $READLINK -e $SCINTERM_PATH`
+
 AC_ARG_WITH(interface,
 	AS_HELP_STRING([--with-interface=ncurses|pdcurses|gtk],
 		       [Specify user interface [default=ncurses]]),
 	[INTERFACE=$withval], [INTERFACE=ncurses])
 
 case $INTERFACE in
-ncurses)
-	AC_CHECK_LIB(ncurses, initscr, , [
-		AC_MSG_ERROR([libncurses missing!])
-	])
-	AC_CHECK_HEADERS([curses.h], , [
-		AC_MSG_ERROR([Curses header missing!])
-	])
-	AC_DEFINE(INTERFACE_NCURSES, , [Build with curses support])
+*curses)
+	case $INTERFACE in
+	ncurses)
+		AC_CHECK_LIB(ncurses, initscr, , [
+			AC_MSG_ERROR([libncurses missing!])
+		])
+		;;
+	pdcurses)
+		AC_CHECK_LIB(pdcurses, initscr, , [
+			AC_MSG_ERROR([libpdcurses missing!])
+		])
+		AC_CHECK_FUNC([PDC_set_resize_limits], [
+			AC_DEFINE(PDCURSES_WIN32A, , [PDCurses supports Win32a extensions])
+		])
+		;;
+	esac
 
-	# For Scintilla:
-	CPPFLAGS="$CPPFLAGS -DNCURSES -I$SCINTILLA_PATH/scinterm"
-	;;
-
-pdcurses)
-	AC_CHECK_LIB(pdcurses, initscr, , [
-		AC_MSG_ERROR([libpdcurses missing!])
-	])
 	AC_CHECK_HEADERS([curses.h], , [
 		AC_MSG_ERROR([Curses header missing!])
 	])
 	AC_DEFINE(INTERFACE_NCURSES, , [Build with curses support])
 
-	AC_CHECK_FUNC([PDC_set_resize_limits], [
-		AC_DEFINE(PDCURSES_WIN32A, , [PDCurses supports Win32a extensions])
-	])
-
 	# For Scintilla:
-	CPPFLAGS="$CPPFLAGS -DNCURSES -I$SCINTILLA_PATH/scinterm"
+	CPPFLAGS="$CPPFLAGS -DNCURSES -I$SCINTERM_PATH"
 	;;
 
 gtk)