configuration fixes

C/yap-args.c

@@ -198,7 +198,7 @@ static bool consult(const char *b_file USES_REGS) {
       t = ArgOfTerm(1, t);
       if (IsApplTerm(t) && FunctorOfTerm(t) == functor_compile2) {
         consult(RepAtom(AtomOfTerm(ArgOfTerm(1, t)))->StrOfAE);
-	Yap_PopException();
+	Yap_ResetException(LOCAL_ActiveError);
       } else {
         YAP_RunGoalOnce(t);
       }

packages/jpl/src/c/jpl.c

@@ -640,7 +640,7 @@ static JNIEnv*
 jni_env(void) /* economically gets a JNIEnv pointer, valid for this thread */
 { JNIEnv	*env;
 
-  switch( (*jvm)->GetEnv(jvm, (void**)&env, JNI_VERSION_1_4) )
+  switch( (*jvm)->GetEnv(jvm, (void**)&env, JNI_VERSION_1_8) )
   { case JNI_OK:
       return env;
     case JNI_EDETACHED:

packages/myddas/sqlite3/CMakeLists.txt

@@ -2,10 +2,11 @@ if (WITH_SQLITE3)
 
   message( "   * Sqlite3 Data-Base (http://www.sqlite3.org), distributed with MYDDAS" )
 
-  set (SQLITE_EXTRA
-    chinook.db
+  set (SQLITE_TEST
     sqlitest.yap)
 
+  set (SQLITE_DB    chinook.db)
+
   set( YAPSQLITE3_SOURCES
     myddas_sqlite3.c
     src/sqlite3.h
@@ -65,8 +66,12 @@ if (WITH_SQLITE3)
       )
   endif()
 
-  install(FILES ${SQLITE_EXTRA}
+  install(FILES ${SQLITE_DB}
     DESTINATION ${YAP_PLDIR}/data
     )
 
+  install(FILES ${SQLITE_TEST}
+    DESTINATION ${YAP_PLDIR}/test
+    )
+
 endif()

pl/boot.yap

@@ -476,7 +476,7 @@ If this hook preodicate succeeds it must instantiate the  _Action_ argument to t
 
 :- ensure_loaded('../pl/pathconf.yap').
 
-:- ( get_prolog_flag(android,true)  -> ensure_loaded(library(android)) ; true ).
+:-  ensure_loaded('../pl/android.yap').
 
 
 

pl/pathconf.yap

@@ -112,6 +112,8 @@ foreign_directory(yap('lib/Yap')).
 ~~~~~~~~~~~~~~~~~~~~~
 */
 
+:- multifile prolog_file_type/2.
+:- discontiguous prolog_file_type/2.
 :- dynamic prolog_file_type/2.
 
 prolog_file_type(yap, prolog).