diff --git a/Makefile.in b/Makefile.in
index d97883691..e03ebb534 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -143,7 +143,7 @@ IOLIB_HEADERS=$(srcdir)/os/pl-buffer.h \
 	$(srcdir)/os/pl-table.h \
 	$(srcdir)/os/pl-text.h \
 	$(srcdir)/os/pl-utf8.h \
-	$(srcdir)/H/pl-yap.h @ENABLE_WINCONSOLE@ $(srcdir)/os/windows/dirent.h $(srcdir)/os/windows/utf8.h $(srcdir)/os/windows/utf8.c $(srcdir)/os/windows/uxnt.h  $(srcdir)/os/windows/popen.c 
+	$(srcdir)/H/pl-yap.h @WINDOWS@ $(srcdir)/os/windows/dirent.h $(srcdir)/os/windows/utf8.h $(srcdir)/os/windows/utf8.c $(srcdir)/os/windows/uxnt.h  $(srcdir)/os/windows/popen.c 
 
 HEADERS = \
 	$(srcdir)/H/Atoms.h \
diff --git a/configure b/configure
index 497969046..eeca06ad6 100755
--- a/configure
+++ b/configure
@@ -653,7 +653,7 @@ LTLIBOBJS
 LIBOBJS
 RAPTOR_CPPFLAGS
 RAPTOR_LDFLAGS
-ENABLE_RAPTOR
+PKG_RAPTOR
 LTX_PL
 _ACJNI_JAVAC
 JAVADOC
@@ -755,6 +755,7 @@ INSTALL_ENV
 PKG_PRISM
 EGREP
 GREP
+INDENT
 INSTALL_INFO
 AR
 RANLIB
@@ -5030,6 +5031,97 @@ $as_echo "no" >&6; }
 fi
 
 
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}indent", so it can be a program name with args.
+set dummy ${ac_tool_prefix}indent; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_INDENT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$INDENT"; then
+  ac_cv_prog_INDENT="$INDENT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_INDENT="${ac_tool_prefix}indent"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+INDENT=$ac_cv_prog_INDENT
+if test -n "$INDENT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INDENT" >&5
+$as_echo "$INDENT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_INDENT"; then
+  ac_ct_INDENT=$INDENT
+  # Extract the first word of "indent", so it can be a program name with args.
+set dummy indent; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_INDENT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_INDENT"; then
+  ac_cv_prog_ac_ct_INDENT="$ac_ct_INDENT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_INDENT="indent"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_INDENT=$ac_cv_prog_ac_ct_INDENT
+if test -n "$ac_ct_INDENT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_INDENT" >&5
+$as_echo "$ac_ct_INDENT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_INDENT" = x; then
+    INDENT=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    INDENT=$ac_ct_INDENT
+  fi
+else
+  INDENT="$ac_cv_prog_INDENT"
+fi
 
 
 i_am_cross_compiling=$cross_compiling
@@ -6461,9 +6553,9 @@ else
 fi
 
 if test -e "$srcdir"/packages/raptor/Makefile.in; then
-  ENABLE_RAPTOR=""
+  ENABLE_RAPTOR="packages/raptor"
 else
-  ENABLE_RAPTOR="@# "
+  ENABLE_RAPTOR=""
 fi
 
 if test -e "$srcdir"/packages/RDF/Makefile.in; then
@@ -8056,6 +8148,7 @@ CMDEXT=sh
 
 
 
+
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc threaded code" >&5
@@ -11659,7 +11752,7 @@ else
 JAVA_TEST=Test.java
 CLASS_TEST=Test.class
 cat << \EOF > $JAVA_TEST
-/* #line 11662 "configure" */
+/* #line 11755 "configure" */
 public class Test {
 }
 EOF
@@ -11835,7 +11928,7 @@ EOF
 if uudecode$EXEEXT Test.uue; then
         ac_cv_prog_uudecode_base64=yes
 else
-        echo "configure: 11838: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
+        echo "configure: 11931: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
         echo "configure: failed file was:" >&5
         cat Test.uue >&5
         ac_cv_prog_uudecode_base64=no
@@ -11966,7 +12059,7 @@ else
 JAVA_TEST=Test.java
 CLASS_TEST=Test.class
 cat << \EOF > $JAVA_TEST
-/* #line 11969 "configure" */
+/* #line 12062 "configure" */
 public class Test {
 }
 EOF
@@ -12001,7 +12094,7 @@ JAVA_TEST=Test.java
 CLASS_TEST=Test.class
 TEST=Test
 cat << \EOF > $JAVA_TEST
-/* [#]line 12004 "configure" */
+/* [#]line 12097 "configure" */
 public class Test {
 public static void main (String args[]) {
         System.exit (0);
@@ -12688,7 +12781,7 @@ else
 fi
 
 if test -e "$srcdir"/packages/raptor/Makefile.in; then
-   ENABLE_RAPTOR=""
+  PKG_RAPTOR="packages/raptor"
 
 
 
@@ -12705,9 +12798,9 @@ fi
 
 if test "$yap_cv_raptor" = no
 then
-  ENABLE_RAPTOR="@# "
+  PKG_RAPTOR=""
 else
-  ENABLE_RAPTOR=""
+  PKG_RAPTOR="packages/raptor"
 fi
 
 if test "$yap_cv_raptor" != no; then
@@ -12815,7 +12908,7 @@ RAPTOR_LDFLAGS="$LIBS"
 
 if test "$raptor_available" = no
 then
-  ENABLE_RAPTOR="@# "
+  PKG_RAPTOR=""
   cat << EOF
 ##################################################################
 # ERROR: Could not find raptor library. Either I don't have the
@@ -12823,7 +12916,7 @@ then
 ##################################################################
 EOF
 else
-  ENABLE_RAPTOR=""
+  PKG_RAPTOR="packages/raptor"
 fi
 
 
@@ -14142,7 +14235,7 @@ fi
 
 
 else
-   ENABLE_RAPTOR="@# "
+   PKG_RAPTOR=""
 fi
 
 
diff --git a/configure.in b/configure.in
index 43bc1ac90..467187a09 100755
--- a/configure.in
+++ b/configure.in
@@ -469,7 +469,7 @@ AC_PROG_RANLIB
 AC_CHECK_TOOL(AR,ar,:)
 AC_PATH_PROG(INSTALL_INFO,install-info,true,$PATH:/sbin:/usr/sbin:/usr/etc:/usr/local/sbin)
 AC_PATH_PROG(SHELL,sh)
-
+AC_CHECK_TOOL([INDENT], [indent], [:])
 
 dnl Check for libraries.
 dnl mingw does not get along well with libm
@@ -686,9 +686,9 @@ else
 fi
 
 if test -e "$srcdir"/packages/raptor/Makefile.in; then
-  ENABLE_RAPTOR=""
+  ENABLE_RAPTOR="packages/raptor"
 else
-  ENABLE_RAPTOR="@# "
+  ENABLE_RAPTOR=""
 fi
 
 if test -e "$srcdir"/packages/RDF/Makefile.in; then
@@ -1289,6 +1289,7 @@ AC_SUBST(STATIC_MODE)
 AC_SUBST(PKG_WINCONSOLE)
 AC_SUBST(WINDOWS)
 AC_SUBST(EXTRA_INCLUDES_FOR_WIN32)
+AC_SUBST(INDENT)
 
 AC_SUBST(PKG_MINISAT)
 AC_SUBST(PKG_REAL)
@@ -1801,11 +1802,11 @@ else
 fi
 
 if test -e "$srcdir"/packages/raptor/Makefile.in; then
-   ENABLE_RAPTOR=""
+  PKG_RAPTOR="packages/raptor"
 
    m4_include([packages/raptor/configure.in])
 else
-   ENABLE_RAPTOR="@# "
+   PKG_RAPTOR=""
 fi
 
 m4_include([library/matlab/configure.in])
diff --git a/packages/myddas/Makefile.in b/packages/myddas/Makefile.in
index 4413cd8f3..a7671906f 100644
--- a/packages/myddas/Makefile.in
+++ b/packages/myddas/Makefile.in
@@ -85,6 +85,8 @@ install: all install_myddas
 	mkdir -p $(DESTDIR)$(SHAREDIR)
 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
 
+install-examples:
+
 install_myddas:
 	count=`echo "$(YAP_EXTRAS)" | grep MYDDAS | wc -l`; \
 	if [ $$count -ne 0 ]; then \
@@ -98,3 +100,5 @@ install_myddas:
 clean:
 	rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK
 
+distclean: clean
+	rm -f Makefile
diff --git a/packages/raptor b/packages/raptor
index 0f77a1e1b..d5c70de04 160000
--- a/packages/raptor
+++ b/packages/raptor
@@ -1 +1 @@
-Subproject commit 0f77a1e1b90b36bddb1844712380f4f3858123b7
+Subproject commit d5c70de04a6fce6be71a9086d0164dd0b0c9d9d4