Merge ../../yap-6.3

C/blobs.c

@@ -17,7 +17,7 @@
 /* for freeBSD9.1 */
 #define _WITH_DPRINTF
 
-#include "blobs.h"
+#include "YapBlobs.h"
 
 static blob_type_t unregistered_blob_atom = {
     YAP_BLOB_MAGIC_B, PL_BLOB_NOCOPY | PL_BLOB_TEXT, "unregistered"};

C/threads.c

@@ -28,7 +28,7 @@ static char     SccsId[] = "%W% %G%";
 #include "YapHeap.h"
 #include "YapEval.h"
 #include "yapio.h"
-#include "blobs.h"
+#include "YapBlobs.h"
 #include <stdio.h>
 #if HAVE_UNISTD_H
 #include <unistd.h>

CMakeLists.txt

@@ -686,8 +686,11 @@ if (PYTHONLIBS_FOUND AND SWIG_FOUND)
     include(FindPythonModule)
 
     find_python_module(jupyter)
+    find_python_module(wheel)
+    find_python_module(setuptools)
+    find_python_module(backcall)
 
-    if (PY_JUPYTER)
+    if (PY_JUPYTER AND PY_WHEEL AND PY_SETUPTOOLS AND PY_BACKCALL)
         add_subdirectory(packages/python/yap_kernel)
     ENDIF ()
 endif ()

CXX/yapi.cpp

@@ -11,7 +11,7 @@ extern "C" {
 #endif
 
 #include "YapInterface.h"
-#include "blobs.h"
+#include "YapBlobs.h"
 #include "iopreds.h"
 
 X_API char *Yap_TermToBuffer(Term t, encoding_t encodingp, int flags);

H/sshift.h

@@ -21,7 +21,7 @@
 #define REINIT_LOCK(P) INIT_LOCK(P) 
 #define REINIT_RWLOCK(P) INIT_RWLOCK(P) 
 
-#include <blobs.h>
+#include <YapBlobs.h>
 
 #define CharP(ptr)	((char *) (ptr))
 

include/SWI-Prolog.h

@@ -692,7 +692,7 @@ PL_EXPORT(int) PL_resource_error(const char *resource);
 #define PL_set_feature PL_set_prolog_flag /* compatibility */
 PL_EXPORT(int) PL_set_prolog_flag(const char *name, int type, ...);
 
-#include <blobs.h>
+#include "YapBlobs.h"
 
 #if USE_GMP && !defined(__cplusplus)
 

library/dialect/swi/fli/swi.h

@@ -43,6 +43,7 @@
 void Yap_swi_install(void);
 void Yap_install_blobs(void);
 
+
 static inline Term
 SWIModuleToModule(module_t m)
 {

os/files.c

@@ -429,7 +429,11 @@ static Int access_file(USES_REGS1) {
                 return FALSE;
             }
         } else {
+<<<<<<< HEAD
+	  return true;
+=======
             return false;
+>>>>>>> f798372fb1dc4ff03c592d2ae8e0245a842305b8
         }
     }
 #if HAVE_ACCESS