From 850206158f6e77a4798f79fe293a7d7b7a7687f0 Mon Sep 17 00:00:00 2001
From: Robin Haberkorn <robin.haberkorn@googlemail.com>
Date: Thu, 31 Jan 2013 12:50:54 +0100
Subject: fixed bootstrapping using sciteco-minimal and bootstrap autodetection

was broken due to untested changes
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 9d29eb1..b7fab50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,7 @@ fi
 # For bootstrapping via installed sciteco
 AC_CHECK_PROG(SCITECO, sciteco, sciteco)
 if [[ x$SCITECO = x ]]; then
-	bootstrap = yes
+	bootstrap=yes
 fi
 
 # Checks for libraries.
-- 
cgit v1.2.3


From b66d269b94016d43b3d256ab01c123ba2937c917 Mon Sep 17 00:00:00 2001
From: Robin Haberkorn <robin.haberkorn@googlemail.com>
Date: Fri, 1 Feb 2013 20:26:19 +0100
Subject: perform additional expansions on explicitly-specified Scintilla paths

a common ./configure parameter would be --with-scintilla=~/scintilla.
however the calling shell will not expand tilde and the invoked
shell will not automatically fully expand variables.
---
 configure.ac | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index b7fab50..4a9d500 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,7 +80,9 @@ AC_ARG_WITH(scintilla,
 	AS_HELP_STRING([--with-scintilla=PATH],
 		       [Specify Scintilla's path [default=..]]),
 	[SCINTILLA_PATH=$withval], [SCINTILLA_PATH=..])
-SCINTILLA_PATH=`$READLINK -e $SCINTILLA_PATH`
+# eval necessary to perform necessary expansions that may not
+# have been done by the calling shell
+SCINTILLA_PATH=`eval $READLINK -e $SCINTILLA_PATH`
 AC_SUBST(SCINTILLA_PATH)
 
 CPPFLAGS="$CPPFLAGS -I$SCINTILLA_PATH/include -DSCI_LEXER"
-- 
cgit v1.2.3