# HG changeset patch
# User samer
# Date 1432137604 -3600
# Node ID 0fff15c5101927e31ac23e3f399b60349877a376
# Parent  1a2e9d3adcb269ad7358fd54c5fffc32e22b404c# Parent  085078c8b516ee3a56881a7d14f2f6e425e9cf82
Merge.

diff -r 1a2e9d3adcb2 -r 0fff15c51019 .swiplrc
--- a/.swiplrc	Wed May 20 16:58:09 2015 +0100
+++ b/.swiplrc	Wed May 20 17:00:04 2015 +0100
@@ -1,4 +1,4 @@
-:- op(200,fy,@).
+:- op(200,fy,@). % Shouldn't really need this...
 
 colour_terminal :- 
 	stream_property(user_output, tty(true)),
diff -r 1a2e9d3adcb2 -r 0fff15c51019 src/swipl/upgrade_swipl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/swipl/upgrade_swipl	Wed May 20 17:00:04 2015 +0100
@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e # exit on error
+if [ $# -lt 1 ]; then
+	echo "Usage: upgrade_swipl <version>"
+	echo "Eg:    upgrade_swipl 7.3.1"
+	exit
+fi
+
+ver="$1"
+cd ~/src/swipl
+curl "http://www.swi-prolog.org/download/devel/src/swipl-$ver.tar.gz" | tar xz
+(cd "swipl-$ver" && cp -p ../http_openid.pl packages/http && cp ../build . && ./build)
+swipl -g "maplist(pack_rebuild,[real,prosqlite,plml,plsmf]), halt"
diff -r 1a2e9d3adcb2 -r 0fff15c51019 var/dml/settings.db
--- a/var/dml/settings.db	Wed May 20 16:58:09 2015 +0100
+++ b/var/dml/settings.db	Wed May 20 17:00:04 2015 +0100
@@ -44,3 +44,6 @@
 
 %	Keep information to support source-level debugging
 setting(swish:debug_info, true).
+
+%	Enables automatic semantic web searches for recognised URIs
+setting(crawler:enable_auto_crawl, false).