summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2015-05-13 11:56:24 +0200
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2015-05-13 11:56:24 +0200
commitde30f7538a865a2ee7acb7dd8294fb6cdc4f98be (patch)
treeba11189e6e83e83e73167518b45641fc287c8eda /build
parent6504cffdbe74d9b671222a7ec24b26fbb4f871f0 (diff)
parent86ad56f005d9d3871f654390739459d5634dd5d5 (diff)
downloadastra-de30f7538a865a2ee7acb7dd8294fb6cdc4f98be.tar.gz
astra-de30f7538a865a2ee7acb7dd8294fb6cdc4f98be.tar.bz2
astra-de30f7538a865a2ee7acb7dd8294fb6cdc4f98be.tar.xz
astra-de30f7538a865a2ee7acb7dd8294fb6cdc4f98be.zip
Merge branch 'master'
Diffstat (limited to 'build')
-rw-r--r--build/linux/Makefile.in2
-rw-r--r--build/linux/configure.ac2
2 files changed, 2 insertions, 2 deletions
diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in
index 0dfa15a..2d862f2 100644
--- a/build/linux/Makefile.in
+++ b/build/linux/Makefile.in
@@ -28,7 +28,7 @@ CXXFLAGS=@SAVED_CXXFLAGS@
LDFLAGS=@SAVED_LDFLAGS@
LIBS=@SAVED_LIBS@
-CPPFLAGS+=-I../.. -I../../include -I../../lib/include/rapidxml
+CPPFLAGS+=-I../.. -I../../include -I../../lib/include
CXXFLAGS+=-g -O3 -Wall -Wshadow
LIBS+=-lpthread
LDFLAGS+=-g
diff --git a/build/linux/configure.ac b/build/linux/configure.ac
index d9e1f1a..58a3f4c 100644
--- a/build/linux/configure.ac
+++ b/build/linux/configure.ac
@@ -190,7 +190,7 @@ if test x"$with_python" != x -a x"$with_python" != xno; then
AC_MSG_CHECKING(for python)
ASTRA_RUN_LOGOUTPUT(echo 'import sys' | $PYTHON -)
if test $? -ne 0; then
- AC_MSG_ERROR(Python binary not found)]
+ AC_MSG_ERROR(Python binary not found)
fi
AC_MSG_RESULT([$PYTHON])
HAVEPYTHON=yes