Add support for statically linking the C++ standard library

[builder.git] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 02fbd33445a9735dd78e5c3c3d71f7446d54619d..b8531257a94a68b134cfadb8b4f31acd2b61406c 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -6,6 +6,9 @@ INCLUDEDIR=temp/bootstrap/include
 REQUIRED="core datafile"
 CFLAGS="-I$INCLUDEDIR `pkg-config --cflags sigc++-2.0`"
 LIBS="`pkg-config --libs sigc++-2.0` -lpthread"
+if pkg-config --exists "sigc++-2.0 >= 2.5.1"; then
+       CFLAGS="$CFLAGS -std=c++11"
+fi
 MACHINE="`uname -m`"
 SYSTEM="`uname -s`"
 if [ "$MACHINE" = "x86_64" ]; then
@@ -94,7 +97,7 @@ for i in $REQUIRED; do
                done
                findargs="$subdirs"
                if [ "$check_overlay" ]; then
-                       findargs="$findargs -mindepth 1 ( -type d ! ( $check_overlay ) -prune ) ,"
+                       findargs="$findargs -mindepth 1 ( -type d ! ( $check_overlay ) -prune -false ) -o "
                fi
 
                headers=`find $findargs -name '*.h'`