diff --git a/C/modules.c b/C/modules.c
index bd424d33a..27d16502e 100644
--- a/C/modules.c
+++ b/C/modules.c
@@ -263,21 +263,6 @@ p_strip_module( USES_REGS1 )
     Yap_unify(ARG2, tmod);      
 }
 
-static Int
-p_system_module( USES_REGS1 )
-{
-  Term t1 = Deref(ARG1);
-  if (t1 == PROLOG_MODULE) {
-    return TRUE;
-  }
-  return t1 == TermProlog ||
-    t1 == IDB_MODULE ||
-    t1 == IDB_MODULE ||
-    t1 == ATTRIBUTES_MODULE ||
-    t1 == SYSTEM_MODULE ||
-    t1 == GLOBALS_MODULE;
-}
-
 static Int
 p_context_module( USES_REGS1 )
 {
@@ -351,7 +336,6 @@ Yap_InitModulesC(void)
   Yap_InitCPred("$change_module", 1, p_change_module, SafePredFlag|SyncPredFlag);
   Yap_InitCPred("strip_module", 3, p_strip_module, SafePredFlag|SyncPredFlag);
   Yap_InitCPred("context_module", 1, p_context_module, 0);
-  Yap_InitCPred("$system_module", 1, p_system_module, 0);
   Yap_InitCPredBack("$all_current_modules", 1, 1, init_current_module, cont_current_module,
 		SafePredFlag|SyncPredFlag);
 }
diff --git a/C/qlyr.c b/C/qlyr.c
index f953fa46d..cbbc7203a 100755
--- a/C/qlyr.c
+++ b/C/qlyr.c
@@ -828,6 +828,7 @@ ReadHash(IOSTREAM *stream)
 static void
 read_clauses(IOSTREAM *stream, PredEntry *pp, UInt nclauses, UInt flags) {
   CACHE_REGS
+  __android_log_print(ANDROID_LOG_ERROR, __FUNCTION__ , "   ? read_uint %p %d  %p", pp, nclauses, stream);
   if (pp->PredFlags & LogUpdatePredFlag) {
     /* first, clean up whatever was there */
     if (pp->cs.p_code.NOfClauses) {
@@ -968,8 +969,9 @@ read_pred(IOSTREAM *stream, Term mod) {
   }
   ap->TimeStampOfPred = read_uint(stream);
   /* multifile predicates cannot reside in module 0 */
-  if (flags & MultiFileFlag && ap->ModuleOfPred == PROLOG_MODULE)
+  if (flags & MultiFileFlag && ap->ModuleOfPred == PROLOG_MODULE) {
     ap->ModuleOfPred = TermProlog;
+  }
   read_clauses(stream, ap, nclauses, flags);
   if (flags & HiddenPredFlag) {  
     Yap_HidePred(ap);
@@ -1003,15 +1005,17 @@ read_module(IOSTREAM *stream) {
   InitHash();
   read_header(stream);
   ReadHash(stream);
+  __android_log_print(ANDROID_LOG_ERROR, __FUNCTION__ , " after read_hash  %p", stream);
   while ((x = read_tag(stream)) == QLY_START_MODULE) {
     Term mod = (Term)read_uint(stream);
-
+    __android_log_print(ANDROID_LOG_ERROR, __FUNCTION__ , " after read_uint %x  %p", mod, stream);
     mod = MkAtomTerm(AtomAdjust(AtomOfTerm(mod)));
     if (mod)
     while ((x = read_tag(stream)) == QLY_START_PREDICATE) {
       read_pred(stream, mod);
     }
   }
+  __android_log_print(ANDROID_LOG_ERROR, __FUNCTION__ , "  %p", stream);
   read_ops(stream);
   CloseHash();
 }
@@ -1087,6 +1091,7 @@ Yap_Restore(char *s, char *lib_dir)
   read_module(stream);
   Sclose( stream );
   GLOBAL_RestoreFile = NULL;
+  __android_log_print(ANDROID_LOG_INFO, "qlyr.c", "loading startup %p, done", stream);
   return DO_ONLY_CODE;
 }
 
diff --git a/C/save.c b/C/save.c
index 6e620bc1f..0010f3636 100755
--- a/C/save.c
+++ b/C/save.c
@@ -252,11 +252,10 @@ open_file(char *my_file, int flag)
       if (flag == O_RDONLY) {
 	  extern AAssetManager *assetManager;
 	  my_file += strlen("/assets/");
-	  __android_log_print(ANDROID_LOG_ERROR, "save.c", "open_file  %p %s", assetManager, my_file);
 	  AAsset* asset = AAssetManager_open(assetManager, my_file, AASSET_MODE_UNKNOWN);
 	   if (!asset)
 	      return -1;
-	  __android_log_print(ANDROID_LOG_ERROR, "save.c", "open_file   %p", asset);
+	   __android_log_print(ANDROID_LOG_ERROR, __FUNCTION__ , "  %p", asset);
 	  AAsset_close( asset );
 	  return 0; // usually the file will be compressed, so there is no point in actually trying to open it.
       }
diff --git a/C/sysbits.c b/C/sysbits.c
index 0c4cc013d..e1dad684f 100755
--- a/C/sysbits.c
+++ b/C/sysbits.c
@@ -134,6 +134,7 @@ Yap_WinError(char *yap_error)
 static int
 is_directory(char *FileName)
 {
+  __android_log_print(ANDROID_LOG_INFO, __FUNCTION__, " %s ",FileName);
 #ifdef _WIN32
   char s[YAP_FILENAME_MAX+1];
   char *s0 = FileName;
diff --git a/config.h.in b/config.h.in
index 74f1a76aa..37104f216 100644
--- a/config.h.in
+++ b/config.h.in
@@ -48,6 +48,9 @@
 /* use Barts idea of allocating extra memory */
 #undef GC_NO_TAGS
 
+/* Define if gethostname() is provided */
+#undef HAS_GETHOSTNAME
+
 /* Define to 1 if you have the `access' function. */
 #undef HAVE_ACCESS
 
@@ -387,6 +390,9 @@
 /* Define to 1 if you have the `stdc++' library (-lstdc++). */
 #undef HAVE_LIBSTDC__
 
+/* Whether we have libunicode.a */
+#undef HAVE_LIBUNICODE
+
 /* Define to 1 if you have the `ws2_32' library (-lws2_32). */
 #undef HAVE_LIBWS2_32
 
@@ -697,6 +703,9 @@
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
+/* Define to 1 if you have the `strcasecmp' function. */
+#undef HAVE_STRCASECMP
+
 /* Define to 1 if you have the `strcasestr' function. */
 #undef HAVE_STRCASESTR
 
@@ -718,6 +727,9 @@
 /* Define to 1 if you have the `strlwr' function. */
 #undef HAVE_STRLWR
 
+/* Define to 1 if you have the `strncasecmp' function. */
+#undef HAVE_STRNCASECMP
+
 /* Define to 1 if you have the `strncat' function. */
 #undef HAVE_STRNCAT
 
@@ -922,6 +934,12 @@
 /* Define as the return type of signal handlers (`int' or `void'). */
 #undef RETSIGTYPE
 
+/* Specify package */
+#undef RFC2045PKG
+
+/* Specify version */
+#undef RFC2045VER
+
 /* The size of `double', as computed by sizeof. */
 #undef SIZEOF_DOUBLE
 
@@ -1000,6 +1018,15 @@
 /* threaded emulator */
 #undef USE_THREADED_CODE
 
+/* Whether daylight savings time offset is set via the altzone variable */
+#undef USE_TIME_ALTZONE
+
+/* Whether daylight savings time offset is set via the tm_isdst member */
+#undef USE_TIME_DAYLIGHT
+
+/* Whether time offset is specified via the tm_gmtoff member */
+#undef USE_TIME_GMTOFF
+
 /* Define to name of the UUID header file. */
 #undef UUID_H
 
@@ -1060,8 +1087,20 @@
 /* compiling for Windows */
 #undef __WINDOWS__
 
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
+
 /* Define to `__inline__' or `__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */
 #ifndef __cplusplus
 #undef inline
 #endif
+
+/* Define to `long int' if <sys/types.h> does not define. */
+#undef off_t
+
+/* Define to `int' if <sys/types.h> does not define. */
+#undef pid_t
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+#undef size_t
diff --git a/configure b/configure
index 960dd4a1d..5b19ac4ab 100755
--- a/configure
+++ b/configure
@@ -652,7 +652,6 @@ LIBOBJS
 RAPTOR_CPPFLAGS
 RAPTOR_LDFLAGS
 PKG_RAPTOR
-LTX_PL
 _ACJNI_JAVAC
 JAVADOC
 JAR
@@ -698,6 +697,9 @@ CLIB_CRYPTLIBS
 CLIB_NETLIBS
 CLIB_PLTARGETS
 CLIB_TARGETS
+RFC2045_CFLAGS
+RFC2045CHARSET
+rfc822includedir
 PKG_MYDDAS
 EXTRA_LIBS_FOR_SWIDLLS
 CLIB_PTHREADS
@@ -729,8 +731,6 @@ PKG_SEMWEB
 PKG_RDF
 PKG_R
 PKG_PLUNIT
-PKG_PLDOC
-PKG_LTX2HTM
 PKG_JPL
 PKG_HTTP
 PKG_CLPQR
@@ -881,6 +881,9 @@ with_max_threads
 enable_myddas
 enable_myddas_stats
 enable_myddas_top_level
+with_rfc2045_package
+with_rfc2045_version
+enable_mimecharset
 with_time
 with_odbc
 with_cudd
@@ -1548,6 +1551,7 @@ Optional Features:
  --enable-myddas[=DIR]      enable the MYDDAS library
  --enable-myddas-stats      enable the MYDDAS library statistics support
  --enable-myddas-top-level  enable the MYDDAS top-level support to MySQL
+  --enable-mimecharset=charset   Default MIME charset to set on new messages
  --enable-bddlib           dynamic bdd library
  --enable-cplint=DIR       enable the cplint library using the CUDD library in DIR/lib
  --enable-gecode            install gecode library
@@ -1567,6 +1571,7 @@ Optional Packages:
  --with-trail-space=space default trail size in Kbytes
  --with-max-workers=integer maximum number of or-parallel processes
  --with-max-threads=integer maximum number of or-parallel processes
+
   --without-time		  Exclude alarm library
   --with-odbc=<dir>	  Location of ODBC include/lib
  --with-cudd=DIR           use CUDD package in DIR
@@ -2764,7 +2769,7 @@ if test "${with_sysroot+set}" = set; then :
 		CXXFLAGS="$CXXFLAGS --sysroot=$SYSROOT"
 		LDFLAGS="$LDFLAGS --sysroot=$SYSROOT"
 fi
-∫
+
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -6191,6 +6196,7 @@ fi
           prefix="$SYSTEMDRIVE/Yap"
         fi
 	i_am_cross_compiling=yes
+	PRE_INSTALL_ENV="wine "
  	;;
       **)
       if test "$target_cpu" = "x86_64"
@@ -7060,7 +7066,7 @@ else
 fi
 
 if test -e "$srcdir"/packages/clib/Makefile.in; then
-  PKG_CLIB="packages/clib"
+  PKG_CLIB="packages/clib/maildrop/rfc2045 packages/clib/maildrop/rfc822 packages/clib"
 else
   PKG_CLIB=""
 fi
@@ -7071,12 +7077,6 @@ else
   PKG_HTTP=""
 fi
 
-if test -e "$srcdir"/packages/pldoc/Makefile.in; then
-  PKG_PLDOC="packages/pldoc"
-else
-  PKG_PLDOC=""
-fi
-
 if test -e "$srcdir"/packages/plunit/Makefile.in; then
   PKG_PLUNIT="packages/plunit"
 else
@@ -7101,12 +7101,6 @@ else
   PKG_RDF=""
 fi
 
-if test -e "$srcdir"/packages/ltx2htm/Makefile.in; then
-  PKG_LTX2HTM="packages/ltx2htm"
-else
-  PKG_LTX2HTM=""
-fi
-
 if test -e "$srcdir"/packages/semweb/Makefile.in; then
   PKG_SEMWEB="packages/semweb"
 else
@@ -7378,7 +7372,7 @@ fi
 	           EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
 	           INSTALL_ENV="YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
 	        fi
-	        PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:$LD_LIBRARY_PATH"
+	        PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:$LD_LIBRARY_PATH $PRE_INSTALL_ENV"
 		;;
 	      *sunos4*)
 		    M4="/usr/5bin/m4"
@@ -7393,7 +7387,7 @@ fi
 	        DYNYAPLIB=libYap."$SO"
 		    SONAMEFLAG=""
 	        EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
-	        PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:$LD_LIBRARY_PATH"
+	        PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:$LD_LIBRARY_PATH  $PRE_INSTALL_ENV"
 	        INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
 		;;
 	      *hpux*)
@@ -7440,7 +7434,7 @@ $as_echo "#define MPI_AVOID_REALLOC 1" >>confdefs.h
         DYNYAPLIB=libYap."$SO"
 	SONAMEFLAG=""
         EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
-        PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir) YAPLIBDIR=\$(abs_top_builddir):\$(abs_top_builddir)/library/system"
+        PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir) YAPLIBDIR=\$(abs_top_builddir):\$(abs_top_builddir)/library/system  $PRE_INSTALL_ENV"
         INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
 	;;
       *aix*)
@@ -7454,7 +7448,7 @@ $as_echo "#define MPI_AVOID_REALLOC 1" >>confdefs.h
         DYNYAPLIB=libYap."$SO"
 	SONAMEFLAG=""
         EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,\$(LIBDIR)"
-        PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:$LD_LIBRARY_PATH"
+        PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:$LD_LIBRARY_PATH  $PRE_INSTALL_ENV"
         INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
 	;;
       *osf*)
@@ -7512,7 +7506,7 @@ fi
         DYNYAPLIB=libYap."$SO"
 	SONAMEFLAG=""
         EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
-        PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:$LD_LIBRARY_PATH"
+        PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:$LD_LIBRARY_PATH  $PRE_INSTALL_ENV"
         INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
 	;;
       *irix6*)
@@ -7528,7 +7522,7 @@ fi
         DYNYAPLIB=libYap."$SO"
 	SONAMEFLAG=""
         EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
-        PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:$LD_LIBRARY_PATH"
+        PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:$LD_LIBRARY_PATH  $PRE_INSTALL_ENV"
         INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
 	;;
       *darwin*)
@@ -7614,7 +7608,7 @@ fi
         DYNYAPLIB=libYap."$YAP_VERSION.$SO"
 	    SONAMEFLAG="-Wl,-install_name,$prefix/lib/libYap.$YAP_MAJOR_VERSION.$SO -Wl,-compatibility_version,$YAP_MAJOR_VERSION.$YAP_MINOR_VERSION -Wl,-current_version,$YAP_VERSION"
         YAPLIB_LD="$CC -dynamiclib"
-        PRE_INSTALL_ENV="DYLD_LIBRARY_PATH=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:$DYLD_LIBRARY_PATH"
+        PRE_INSTALL_ENV="DYLD_LIBRARY_PATH=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:$DYLD_LIBRARY_PATH  $PRE_INSTALL_ENV"
         EXTRAYAPLIBS="libYap.$SO libYap.$YAP_MAJOR_VERSION.$SO"
 	;;
       *netbsd*|*openbsd*|*freebsd*|*dragonfly*)
@@ -7642,7 +7636,7 @@ fi
         YAPLIB_LD=$SHLIB_LD
         SONAMEFLAG="-Wl,--soname=$DYNYAPLIB"
         EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -Wl,-R,\$(YAPLIBDIR)"
-        PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:$LD_LIBRARY_PATH"
+        PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:$LD_LIBRARY_PATH  $PRE_INSTALL_ENV"
         INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
 	;;
       *solaris*)
@@ -7663,11 +7657,10 @@ fi
         then
            YAPLIB_LD="\$(CC)"
            EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
-           PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:$LD_LIBRARY_PATH"
+           PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:$LD_LIBRARY_PATH  $PRE_INSTALL_ENV"
            INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
         else
            EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
-           PRE_INSTALL_ENV=""
            YAPLIB_LD="\$(CC) -shared"
            INSTALL_ENV="YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
         fi
@@ -7695,7 +7688,6 @@ fi
 	MERGE_DLL_OBJS=""
         IN_UNIX="#"
         YAPLIB_LD="\$(CC) -shared -Wl,--export-all-symbols"
-        PRE_INSTALL_ENV=""
         INSTALL_ENV="YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
 	;;
       *)
@@ -7761,12 +7753,12 @@ fi
         DYNYAPLIB=libYap."$SO"
 	SONAMEFLAG=""
         EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
-        PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:$LD_LIBRARY_PATH"
+        PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:$LD_LIBRARY_PATH  $PRE_INSTALL_ENV"
         INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
 	;;
 esac
 
-PRE_INSTALL_ENV="$PRE_INSTALL_ENV YAPLIBDIR=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:\$(abs_top_builddir)/packages/clib "
+PRE_INSTALL_ENV="YAPLIBDIR=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:\$(abs_top_builddir)/packages/clib $PRE_INSTALL_ENV "
 
 if test "$dynamic_loading" = "yes"
 then
@@ -8858,8 +8850,6 @@ CMDEXT=sh
 
 
 
-
-
 
 
 
@@ -10305,6 +10295,632 @@ then
 
 
 
+#rfc2045 checking.
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for missing gethostname prototype" >&5
+$as_echo_n "checking for missing gethostname prototype... " >&6; }
+if ${rfc2045_cv_SYS_GETHOSTNAME+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if HAVE_UNISTD_H
+#include	<unistd.h>
+#endif
+
+extern int gethostname(int,int);
+
+int
+main ()
+{
+
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  rfc2045_cv_SYS_GETHOSTNAME=yes
+else
+  rfc2045_cv_SYS_GETHOSTNAME=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rfc2045_cv_SYS_GETHOSTNAME" >&5
+$as_echo "$rfc2045_cv_SYS_GETHOSTNAME" >&6; }
+
+if test $rfc2045_cv_SYS_GETHOSTNAME = "no"
+then
+
+cat >>confdefs.h <<_ACEOF
+#define HAS_GETHOSTNAME 1
+_ACEOF
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
+if ${ac_cv_c_const+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+#ifndef __cplusplus
+  /* Ultrix mips cc rejects this sort of thing.  */
+  typedef int charset[2];
+  const charset cs = { 0, 0 };
+  /* SunOS 4.1.1 cc rejects this.  */
+  char const *const *pcpcc;
+  char **ppc;
+  /* NEC SVR4.0.2 mips cc rejects this.  */
+  struct point {int x, y;};
+  static struct point const zero = {0,0};
+  /* AIX XL C 1.02.0.0 rejects this.
+     It does not let you subtract one const X* pointer from another in
+     an arm of an if-expression whose if-part is not a constant
+     expression */
+  const char *g = "string";
+  pcpcc = &g + (g ? g-g : 0);
+  /* HPUX 7.0 cc rejects these. */
+  ++pcpcc;
+  ppc = (char**) pcpcc;
+  pcpcc = (char const *const *) ppc;
+  { /* SCO 3.2v4 cc rejects this sort of thing.  */
+    char tx;
+    char *t = &tx;
+    char const *s = 0 ? (char *) 0 : (char const *) 0;
+
+    *t++ = 0;
+    if (s) return 0;
+  }
+  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
+    int x[] = {25, 17};
+    const int *foo = &x[0];
+    ++foo;
+  }
+  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
+    typedef const int *iptr;
+    iptr p = 0;
+    ++p;
+  }
+  { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
+       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
+    struct s { int j; const int *ap[3]; } bx;
+    struct s *b = &bx; b->j = 5;
+  }
+  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+    const int foo = 10;
+    if (!foo) return 0;
+  }
+  return !cs[0] && !zero.x;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_const=yes
+else
+  ac_cv_c_const=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
+$as_echo "$ac_cv_c_const" >&6; }
+if test $ac_cv_c_const = no; then
+
+$as_echo "#define const /**/" >>confdefs.h
+
+fi
+
+ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
+if test "x$ac_cv_type_off_t" = xyes; then :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+#define off_t long int
+_ACEOF
+
+fi
+
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = xyes; then :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+#define size_t unsigned int
+_ACEOF
+
+fi
+
+ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
+if test "x$ac_cv_type_pid_t" = xyes; then :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+#define pid_t int
+_ACEOF
+
+fi
+
+
+
+RFC2045_CFLAGS="$CFLAGS"
+ac_fn_c_check_func "$LINENO" "strncasecmp" "ac_cv_func_strncasecmp"
+if test "x$ac_cv_func_strncasecmp" = xyes; then :
+
+else
+  RFC2045_CFLAGS="$RFC2045_CFLAGS -Dstrncasecmp=strnicmp"
+fi
+
+ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp"
+if test "x$ac_cv_func_strcasecmp" = xyes; then :
+
+else
+  RFC2045_CFLAGS="$RFC2045_CFLAGS -Dstrcasecmp=stricmp"
+fi
+
+
+
+# Check whether --with-rfc2045-package was given.
+if test "${with_rfc2045_package+set}" = set; then :
+  withval=$with_rfc2045_package; rfc2045-package="$withval"
+else
+
+    package="$PACKAGE"
+    ac_configure_args="$ac_configure_args --with-rfc2045-package=$PACKAGE"
+
+fi
+
+
+
+# Check whether --with-rfc2045-version was given.
+if test "${with_rfc2045_version+set}" = set; then :
+  withval=$with_rfc2045_version; rfc2045-version="$withval"
+else
+
+    rfc2045-version="$VERSION"
+    ac_configure_args="$ac_configure_args --with-rfc2045-version=$VERSION"
+
+fi
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define RFC2045PKG "$rfc2045-package"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define RFC2045VER "$rfc2045-version"
+_ACEOF
+
+
+# Check whether --enable-mimecharset was given.
+if test "${enable_mimecharset+set}" = set; then :
+  enableval=$enable_mimecharset; RFC2045CHARSET="$enableval"
+else
+  RFC2045CHARSET="us-ascii"
+fi
+
+
+CFLAGS="$CFLAGS -I${srcdir}/.."
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdc=yes
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
+if ${ac_cv_c_const+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+#ifndef __cplusplus
+  /* Ultrix mips cc rejects this sort of thing.  */
+  typedef int charset[2];
+  const charset cs = { 0, 0 };
+  /* SunOS 4.1.1 cc rejects this.  */
+  char const *const *pcpcc;
+  char **ppc;
+  /* NEC SVR4.0.2 mips cc rejects this.  */
+  struct point {int x, y;};
+  static struct point const zero = {0,0};
+  /* AIX XL C 1.02.0.0 rejects this.
+     It does not let you subtract one const X* pointer from another in
+     an arm of an if-expression whose if-part is not a constant
+     expression */
+  const char *g = "string";
+  pcpcc = &g + (g ? g-g : 0);
+  /* HPUX 7.0 cc rejects these. */
+  ++pcpcc;
+  ppc = (char**) pcpcc;
+  pcpcc = (char const *const *) ppc;
+  { /* SCO 3.2v4 cc rejects this sort of thing.  */
+    char tx;
+    char *t = &tx;
+    char const *s = 0 ? (char *) 0 : (char const *) 0;
+
+    *t++ = 0;
+    if (s) return 0;
+  }
+  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
+    int x[] = {25, 17};
+    const int *foo = &x[0];
+    ++foo;
+  }
+  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
+    typedef const int *iptr;
+    iptr p = 0;
+    ++p;
+  }
+  { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
+       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
+    struct s { int j; const int *ap[3]; } bx;
+    struct s *b = &bx; b->j = 5;
+  }
+  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+    const int foo = 10;
+    if (!foo) return 0;
+  }
+  return !cs[0] && !zero.x;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_const=yes
+else
+  ac_cv_c_const=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
+$as_echo "$ac_cv_c_const" >&6; }
+if test $ac_cv_c_const = no; then
+
+$as_echo "#define const /**/" >>confdefs.h
+
+fi
+
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = xyes; then :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+#define size_t unsigned int
+_ACEOF
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
+$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
+if ${ac_cv_struct_tm+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <time.h>
+
+int
+main ()
+{
+struct tm tm;
+				     int *p = &tm.tm_sec;
+				     return !p;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_struct_tm=time.h
+else
+  ac_cv_struct_tm=sys/time.h
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
+$as_echo "$ac_cv_struct_tm" >&6; }
+if test $ac_cv_struct_tm = sys/time.h; then
+
+$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
+
+fi
+
+
+
+for ac_func in strcasecmp strncasecmp
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to calculate alternate timezone" >&5
+$as_echo_n "checking how to calculate alternate timezone... " >&6; }
+if ${librfc822_cv_SYS_TIMEZONE+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include	<time.h>
+
+int
+main ()
+{
+
+int main()
+{
+time_t	t=altzone;
+int	offset = -timezone;
+
+	return (0);
+}
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  librfc822_cv_SYS_TIMEZONE=altzone
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include	<time.h>
+
+int
+main ()
+{
+
+int main()
+{
+int	n=daylight;
+int	offset = -timezone;
+
+	return (0);
+}
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  librfc822_cv_SYS_TIMEZONE=daylight
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include	<time.h>
+
+extern struct tm dummy;
+
+int
+main ()
+{
+
+int main()
+{
+long	n=dummy.tm_gmtoff;
+
+	return (0);
+}
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  librfc822_cv_SYS_TIMEZONE=tm_gmtoff
+else
+  librfc822_cv_SYS_TIMEZONE=unknown
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $librfc822_cv_SYS_TIMEZONE" >&5
+$as_echo "$librfc822_cv_SYS_TIMEZONE" >&6; }
+
+case $librfc822_cv_SYS_TIMEZONE in
+tm_gmtoff)
+
+cat >>confdefs.h <<_ACEOF
+#define USE_TIME_GMTOFF 1
+_ACEOF
+
+	;;
+altzone)
+
+cat >>confdefs.h <<_ACEOF
+#define USE_TIME_ALTZONE 1
+_ACEOF
+
+	;;
+daylight)
+
+cat >>confdefs.h <<_ACEOF
+#define USE_TIME_DAYLIGHT 1
+_ACEOF
+
+	;;
+*)
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot figure out how to calculate the alternate timezone" >&5
+$as_echo "$as_me: WARNING: Cannot figure out how to calculate the alternate timezone" >&2;}
+	;;
+esac
+
+if test -d "$srcdir"/../unicode
+then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBUNICODE 1
+_ACEOF
+
+fi
+
+
+
+
 
 
 
@@ -10703,18 +11319,6 @@ case "$CPP" in
 	*) ACPP="$CPP"
 esac
 
-(
-  CC=$ACC; LD=$ALD; CPP=$ACPP; CFLAGS=$SHLIB_CFLAGS; LDFLAGS=$LDFLAGS;
-  export CC LD CFLAGS LDFLAGS;
-  mkdir -p packages/clib/maildrop/rfc822;
-  mkdir -p packages/clib/maildrop/rfc2045;
-  MIME_DIR=`dirname "$srcdir"/packages/clib/maildrop`
-  MIME_DIR=`cd $MIME_DIR && pwd`
-  ( cd packages/clib/maildrop/rfc822  && $CONFIG_SHELL "$MIME_DIR"/maildrop/rfc822/configure --host=$host_alias)
-  ( cd packages/clib/maildrop/rfc2045  && $CONFIG_SHELL "$MIME_DIR"/maildrop/rfc2045/configure --host=$host_alias))
-
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking h_errno" >&5
 $as_echo_n "checking h_errno... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10974,7 +11578,6 @@ fi
 
 
 
-
 fi
 
 if test "$PKG_LIBARCHIVE" != ""
@@ -12634,7 +13237,7 @@ else
 JAVA_TEST=Test.java
 CLASS_TEST=Test.class
 cat << \EOF > $JAVA_TEST
-/* #line 12637 "configure" */
+/* #line 13240 "configure" */
 public class Test {
 }
 EOF
@@ -12810,7 +13413,7 @@ EOF
 if uudecode$EXEEXT Test.uue; then
         ac_cv_prog_uudecode_base64=yes
 else
-        echo "configure: 12813: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
+        echo "configure: 13416: 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
@@ -12941,7 +13544,7 @@ else
 JAVA_TEST=Test.java
 CLASS_TEST=Test.class
 cat << \EOF > $JAVA_TEST
-/* #line 12944 "configure" */
+/* #line 13547 "configure" */
 public class Test {
 }
 EOF
@@ -12976,7 +13579,7 @@ JAVA_TEST=Test.java
 CLASS_TEST=Test.class
 TEST=Test
 cat << \EOF > $JAVA_TEST
-/* [#]line 12979 "configure" */
+/* [#]line 13582 "configure" */
 public class Test {
 public static void main (String args[]) {
         System.exit (0);
@@ -13640,33 +14243,6 @@ fi
 
 
 
-fi
-
-if test -e "$srcdir"/packages/ltx2htm/Makefile.in
-then
-   PKG_LTX22HTM="packages/ltx2htm"
-
-
-
-
-
-  LTX_PL=yap
-
-
-
-
-
-ac_config_commands="$ac_config_commands exe"
-
-
-
-
-
-
-
-
-else
-    PKG_LTX2HTM=""
 fi
 
 if test -e "$srcdir"/packages/raptor/Makefile.in
@@ -14355,7 +14931,6 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
-config_commands="$ac_config_commands"
 
 _ACEOF
 
@@ -14385,9 +14960,6 @@ $config_files
 Configuration headers:
 $config_headers
 
-Configuration commands:
-$config_commands
-
 Report bugs to <yap-users@sf.net>."
 
 _ACEOF
@@ -14525,7 +15097,6 @@ do
     "packages/cplint/Makefile") CONFIG_FILES="$CONFIG_FILES packages/cplint/Makefile" ;;
     "packages/cplint/approx/simplecuddLPADs/Makefile") CONFIG_FILES="$CONFIG_FILES packages/cplint/approx/simplecuddLPADs/Makefile" ;;
     "packages/cplint/slipcase/Makefile") CONFIG_FILES="$CONFIG_FILES packages/cplint/slipcase/Makefile" ;;
-    "exe") CONFIG_COMMANDS="$CONFIG_COMMANDS exe" ;;
     "packages/raptor/raptor_config.h") CONFIG_HEADERS="$CONFIG_HEADERS packages/raptor/raptor_config.h" ;;
     "packages/raptor/Makefile") CONFIG_FILES="$CONFIG_FILES packages/raptor/Makefile" ;;
 
@@ -14541,7 +15112,6 @@ done
 if $ac_need_defaults; then
   test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
   test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
 fi
 
 # Have a temporary directory for convenience.  Make it in the build tree
@@ -14838,7 +15408,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_HEADERS"
 
 
-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    "
 shift
 for ac_tag
 do
@@ -15076,17 +15646,9 @@ $as_echo "$as_me: $ac_file is unchanged" >&6;}
   fi
  ;;
 
-  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
-
-
-  case $ac_file$ac_mode in
-    "exe":C)  chmod +x packages/ltx2htm/latex2html
-		    ;;
 
   esac
+
 done # for ac_tag
 
 
@@ -16079,13 +16641,10 @@ mkdir -p  packages/jpl/src/java/jpl/fli
 mkdir -p  packages/jpl/src/java/jpl/test
 mkdir -p  packages/jpl/examples
 mkdir -p  packages/jpl/examples/java
-mkdir -p  packages/ltx2htm
 mkdir -p  packages/meld
 mkdir -p  packages/myddas
 mkdir -p  packages/PLStream
 mkdir -p  packages/PLStream/libtai
-mkdir -p  packages/pldoc
-mkdir -p  packages/pldoc/server
 mkdir -p  packages/plunit
 mkdir -p  packages/prism
 mkdir -p  packages/prism/src
@@ -16153,6 +16712,16 @@ ac_config_files="$ac_config_files packages/chr/Makefile"
 fi
 
 if test "$PKG_CLIB" != ""; then
+ac_config_files="$ac_config_files packages/clib/maildrop/rfc2045/Makefile"
+
+ac_config_files="$ac_config_files packages/clib/maildrop/rfc2045/config.h"
+
+ac_config_files="$ac_config_files packages/clib/maildrop/rfc2045/rfc2045charset.h"
+
+ac_config_files="$ac_config_files packages/clib/maildrop/rfc822/Makefile"
+
+ac_config_files="$ac_config_files packages/clib/maildrop/rfc822/config.h"
+
 ac_config_files="$ac_config_files packages/clib/Makefile"
 
 fi
@@ -16172,18 +16741,6 @@ ac_config_files="$ac_config_files packages/jpl/Makefile packages/jpl/src/java/Ma
 
 fi
 
-if test "$PKG_LTX2HTM" != ""; then
-ac_config_files="$ac_config_files packages/ltx2htm/Makefile packages/ltx2htm/latex2html"
-
-fi
-
-if test "$PKG_PLDOC" != ""; then
-ac_config_files="$ac_config_files packages/pldoc/Makefile"
-
-ac_config_files="$ac_config_files packages/pldoc/server/man_server.pl"
-
-fi
-
 if test "$PKG_PLUNIT" != ""; then
 ac_config_files="$ac_config_files packages/plunit/Makefile"
 
@@ -16798,7 +17355,6 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
-config_commands="$ac_config_commands"
 
 _ACEOF
 
@@ -16828,9 +17384,6 @@ $config_files
 Configuration headers:
 $config_headers
 
-Configuration commands:
-$config_commands
-
 Report bugs to <yap-users@sf.net>."
 
 _ACEOF
@@ -16968,7 +17521,6 @@ do
     "packages/cplint/Makefile") CONFIG_FILES="$CONFIG_FILES packages/cplint/Makefile" ;;
     "packages/cplint/approx/simplecuddLPADs/Makefile") CONFIG_FILES="$CONFIG_FILES packages/cplint/approx/simplecuddLPADs/Makefile" ;;
     "packages/cplint/slipcase/Makefile") CONFIG_FILES="$CONFIG_FILES packages/cplint/slipcase/Makefile" ;;
-    "exe") CONFIG_COMMANDS="$CONFIG_COMMANDS exe" ;;
     "packages/raptor/raptor_config.h") CONFIG_HEADERS="$CONFIG_HEADERS packages/raptor/raptor_config.h" ;;
     "packages/raptor/Makefile") CONFIG_FILES="$CONFIG_FILES packages/raptor/Makefile" ;;
     "library/matlab/Makefile") CONFIG_FILES="$CONFIG_FILES library/matlab/Makefile" ;;
@@ -16995,15 +17547,16 @@ do
     "swi/library/Makefile") CONFIG_FILES="$CONFIG_FILES swi/library/Makefile" ;;
     "swi/library/clp/Makefile") CONFIG_FILES="$CONFIG_FILES swi/library/clp/Makefile" ;;
     "packages/chr/Makefile") CONFIG_FILES="$CONFIG_FILES packages/chr/Makefile" ;;
+    "packages/clib/maildrop/rfc2045/Makefile") CONFIG_FILES="$CONFIG_FILES packages/clib/maildrop/rfc2045/Makefile" ;;
+    "packages/clib/maildrop/rfc2045/config.h") CONFIG_FILES="$CONFIG_FILES packages/clib/maildrop/rfc2045/config.h" ;;
+    "packages/clib/maildrop/rfc2045/rfc2045charset.h") CONFIG_FILES="$CONFIG_FILES packages/clib/maildrop/rfc2045/rfc2045charset.h" ;;
+    "packages/clib/maildrop/rfc822/Makefile") CONFIG_FILES="$CONFIG_FILES packages/clib/maildrop/rfc822/Makefile" ;;
+    "packages/clib/maildrop/rfc822/config.h") CONFIG_FILES="$CONFIG_FILES packages/clib/maildrop/rfc822/config.h" ;;
     "packages/clib/Makefile") CONFIG_FILES="$CONFIG_FILES packages/clib/Makefile" ;;
     "packages/clpqr/Makefile") CONFIG_FILES="$CONFIG_FILES packages/clpqr/Makefile" ;;
     "packages/http/Makefile") CONFIG_FILES="$CONFIG_FILES packages/http/Makefile" ;;
     "packages/jpl/Makefile") CONFIG_FILES="$CONFIG_FILES packages/jpl/Makefile" ;;
     "packages/jpl/src/java/Makefile") CONFIG_FILES="$CONFIG_FILES packages/jpl/src/java/Makefile" ;;
-    "packages/ltx2htm/Makefile") CONFIG_FILES="$CONFIG_FILES packages/ltx2htm/Makefile" ;;
-    "packages/ltx2htm/latex2html") CONFIG_FILES="$CONFIG_FILES packages/ltx2htm/latex2html" ;;
-    "packages/pldoc/Makefile") CONFIG_FILES="$CONFIG_FILES packages/pldoc/Makefile" ;;
-    "packages/pldoc/server/man_server.pl") CONFIG_FILES="$CONFIG_FILES packages/pldoc/server/man_server.pl" ;;
     "packages/plunit/Makefile") CONFIG_FILES="$CONFIG_FILES packages/plunit/Makefile" ;;
     "packages/R/Makefile") CONFIG_FILES="$CONFIG_FILES packages/R/Makefile" ;;
     "packages/RDF/Makefile") CONFIG_FILES="$CONFIG_FILES packages/RDF/Makefile" ;;
@@ -17035,7 +17588,6 @@ done
 if $ac_need_defaults; then
   test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
   test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
 fi
 
 # Have a temporary directory for convenience.  Make it in the build tree
@@ -17332,7 +17884,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_HEADERS"
 
 
-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    "
 shift
 for ac_tag
 do
@@ -17570,17 +18122,9 @@ $as_echo "$as_me: $ac_file is unchanged" >&6;}
   fi
  ;;
 
-  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
-
-
-  case $ac_file$ac_mode in
-    "exe":C)  chmod +x packages/ltx2htm/latex2html
-		    ;;
 
   esac
+
 done # for ac_tag
 
 
diff --git a/configure.in b/configure.in
index 1f51ce6bb..7b72ec78f 100755
--- a/configure.in
+++ b/configure.in
@@ -47,7 +47,7 @@ AC_ARG_WITH(sysroot,
 		CFLAGS="$CFLAGS --sysroot=$SYSROOT"
 		CXXFLAGS="$CXXFLAGS --sysroot=$SYSROOT"
 		LDFLAGS="$LDFLAGS --sysroot=$SYSROOT" ],
-	[])∫
+	[])
 
 AC_PROG_CC
 AC_PROG_CPP
@@ -64,7 +64,7 @@ AC_ARG_ENABLE(abi,
 AC_CONFIG_HEADER(config.h)
 AC_CONFIG_HEADER(YapTermConfig.h)
 
-dnl store the environment's compilation flags
+dnl store the environments compilation flags
 mycflags="$CFLAGS"
 
 AC_PROG_AWK
@@ -575,6 +575,7 @@ then
           prefix="$SYSTEMDRIVE/Yap"
         fi
 	i_am_cross_compiling=yes
+	PRE_INSTALL_ENV="wine "
  	;;
       **)
       if test "$target_cpu" = "x86_64"
@@ -730,7 +731,7 @@ else
 fi
 
 if test -e "$srcdir"/packages/clib/Makefile.in; then
-  PKG_CLIB="packages/clib"
+  PKG_CLIB="packages/clib/maildrop/rfc2045 packages/clib/maildrop/rfc822 packages/clib"
 else
   PKG_CLIB=""
 fi
@@ -741,12 +742,6 @@ else
   PKG_HTTP=""
 fi
 
-if test -e "$srcdir"/packages/pldoc/Makefile.in; then
-  PKG_PLDOC="packages/pldoc"
-else
-  PKG_PLDOC=""
-fi
-
 if test -e "$srcdir"/packages/plunit/Makefile.in; then
   PKG_PLUNIT="packages/plunit"
 else
@@ -771,12 +766,6 @@ else
   PKG_RDF=""
 fi
 
-if test -e "$srcdir"/packages/ltx2htm/Makefile.in; then
-  PKG_LTX2HTM="packages/ltx2htm"
-else
-  PKG_LTX2HTM=""
-fi
-
 if test -e "$srcdir"/packages/semweb/Makefile.in; then
   PKG_SEMWEB="packages/semweb"
 else
@@ -874,7 +863,7 @@ fi
 	     fi
 	     if test "$have_nsl" = yes
 		 then
-		    LIBS="$LIBS -lnsl"						
+		    LIBS="$LIBS -lnsl"
 	     fi
 	        if test "$dynamic_loading" = "yes"
 	        then
@@ -886,7 +875,7 @@ fi
 	           EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
 	           INSTALL_ENV="YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
 	        fi
-	        PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:$LD_LIBRARY_PATH"
+	        PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:$LD_LIBRARY_PATH $PRE_INSTALL_ENV"
 		;;
 	      *sunos4*)
 		    M4="/usr/5bin/m4"
@@ -901,7 +890,7 @@ fi
 	        DYNYAPLIB=libYap."$SO"
 		    SONAMEFLAG=""
 	        EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
-	        PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:$LD_LIBRARY_PATH"
+	        PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:$LD_LIBRARY_PATH  $PRE_INSTALL_ENV"
 	        INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
 		;;
 	      *hpux*)
@@ -940,7 +929,7 @@ fi
         DYNYAPLIB=libYap."$SO"
 	SONAMEFLAG=""
         EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
-        PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir) YAPLIBDIR=\$(abs_top_builddir):\$(abs_top_builddir)/library/system"
+        PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir) YAPLIBDIR=\$(abs_top_builddir):\$(abs_top_builddir)/library/system  $PRE_INSTALL_ENV"
         INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
 	;;
       *aix*)
@@ -954,7 +943,7 @@ fi
         DYNYAPLIB=libYap."$SO"
 	SONAMEFLAG=""
         EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,\$(LIBDIR)"
-        PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:$LD_LIBRARY_PATH"
+        PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:$LD_LIBRARY_PATH  $PRE_INSTALL_ENV"
         INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
 	;;
       *osf*)
@@ -974,7 +963,7 @@ dnl Linux has both elf and a.out, in this case we found elf
         DYNYAPLIB=libYap."$SO"
 	SONAMEFLAG=""
         EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
-        PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:$LD_LIBRARY_PATH"
+        PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:$LD_LIBRARY_PATH  $PRE_INSTALL_ENV"
         INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
 	;;
       *irix6*)
@@ -990,7 +979,7 @@ dnl Linux has both elf and a.out, in this case we found elf
         DYNYAPLIB=libYap."$SO"
 	SONAMEFLAG=""
         EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
-        PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:$LD_LIBRARY_PATH"
+        PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:$LD_LIBRARY_PATH  $PRE_INSTALL_ENV"
         INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
 	;;
       *darwin*)
@@ -1037,7 +1026,7 @@ dnl Linux has both elf and a.out, in this case we found elf
         DYNYAPLIB=libYap."$YAP_VERSION.$SO"
 	    SONAMEFLAG="-Wl,-install_name,$prefix/lib/libYap.$YAP_MAJOR_VERSION.$SO -Wl,-compatibility_version,$YAP_MAJOR_VERSION.$YAP_MINOR_VERSION -Wl,-current_version,$YAP_VERSION"
         YAPLIB_LD="$CC -dynamiclib"
-        PRE_INSTALL_ENV="DYLD_LIBRARY_PATH=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:$DYLD_LIBRARY_PATH"
+        PRE_INSTALL_ENV="DYLD_LIBRARY_PATH=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:$DYLD_LIBRARY_PATH  $PRE_INSTALL_ENV"
         EXTRAYAPLIBS="libYap.$SO libYap.$YAP_MAJOR_VERSION.$SO"
 	;;
       *netbsd*|*openbsd*|*freebsd*|*dragonfly*)
@@ -1065,7 +1054,7 @@ dnl Linux has both elf and a.out, in this case we found elf
         YAPLIB_LD=$SHLIB_LD
         SONAMEFLAG="-Wl,--soname=$DYNYAPLIB"
         EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -Wl,-R,\$(YAPLIBDIR)"
-        PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:$LD_LIBRARY_PATH"
+        PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:$LD_LIBRARY_PATH  $PRE_INSTALL_ENV"
         INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
 	;;
       *solaris*)
@@ -1086,11 +1075,10 @@ dnl Linux has both elf and a.out, in this case we found elf
         then
            YAPLIB_LD="\$(CC)"
            EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
-           PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:$LD_LIBRARY_PATH"
+           PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:$LD_LIBRARY_PATH  $PRE_INSTALL_ENV"
            INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
         else
            EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
-           PRE_INSTALL_ENV=""
            YAPLIB_LD="\$(CC) -shared"
            INSTALL_ENV="YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
         fi
@@ -1118,7 +1106,6 @@ dnl Linux has both elf and a.out, in this case we found elf
 	MERGE_DLL_OBJS=""
         IN_UNIX="#"
         YAPLIB_LD="\$(CC) -shared -Wl,--export-all-symbols"
-        PRE_INSTALL_ENV=""
         INSTALL_ENV="YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
 	;;
       *)
@@ -1145,13 +1132,13 @@ dnl Linux has both elf and a.out, in this case we found elf
         DYNYAPLIB=libYap."$SO"
 	SONAMEFLAG=""
         EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
-        PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:$LD_LIBRARY_PATH"
+        PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:$LD_LIBRARY_PATH  $PRE_INSTALL_ENV"
         INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
 	;;
 esac
 
 dnl use the current files, even if older
-PRE_INSTALL_ENV="$PRE_INSTALL_ENV YAPLIBDIR=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:\$(abs_top_builddir)/packages/clib "
+PRE_INSTALL_ENV="YAPLIBDIR=\$(abs_top_builddir):\$(abs_top_builddir)/library/system:\$(abs_top_builddir)/packages/clib $PRE_INSTALL_ENV "
 
 if test "$dynamic_loading" = "yes"
 then
@@ -1419,8 +1406,6 @@ AC_SUBST(PKG_CLIB)
 AC_SUBST(PKG_CLPQR)
 AC_SUBST(PKG_HTTP)
 AC_SUBST(PKG_JPL)
-AC_SUBST(PKG_LTX2HTM)
-AC_SUBST(PKG_PLDOC)
 AC_SUBST(PKG_PLUNIT)
 AC_SUBST(PKG_R)
 AC_SUBST(PKG_RDF)
@@ -1909,6 +1894,8 @@ m4_include([packages/myddas/configure.in])
 if test "$PKG_CLIB" != ""
 then
 
+m4_include([packages/clib/maildrop/rfc2045/configure.in])
+m4_include([packages/clib/maildrop/rfc822/configure.in])
 m4_include([packages/clib/configure.in])
 
 fi
@@ -1988,15 +1975,6 @@ then
 
 fi
 
-if test -e "$srcdir"/packages/ltx2htm/Makefile.in
-then
-   PKG_LTX22HTM="packages/ltx2htm"
-
-   m4_include([packages/ltx2htm/configure.in])
-else
-    PKG_LTX2HTM=""
-fi
-
 if test -e "$srcdir"/packages/raptor/Makefile.in
 then
   PKG_RAPTOR="packages/raptor"
@@ -2078,13 +2056,10 @@ mkdir -p  packages/jpl/src/java/jpl/fli
 mkdir -p  packages/jpl/src/java/jpl/test
 mkdir -p  packages/jpl/examples
 mkdir -p  packages/jpl/examples/java
-mkdir -p  packages/ltx2htm
 mkdir -p  packages/meld
 mkdir -p  packages/myddas
 mkdir -p  packages/PLStream
 mkdir -p  packages/PLStream/libtai
-mkdir -p  packages/pldoc
-mkdir -p  packages/pldoc/server
 mkdir -p  packages/plunit
 mkdir -p  packages/prism
 mkdir -p  packages/prism/src
@@ -2134,6 +2109,11 @@ AC_CONFIG_FILES([packages/chr/Makefile])
 fi
 
 if test "$PKG_CLIB" != ""; then
+AC_CONFIG_FILES([packages/clib/maildrop/rfc2045/Makefile])
+AC_CONFIG_FILES([packages/clib/maildrop/rfc2045/config.h])
+AC_CONFIG_FILES([packages/clib/maildrop/rfc2045/rfc2045charset.h])
+AC_CONFIG_FILES([packages/clib/maildrop/rfc822/Makefile])
+AC_CONFIG_FILES([packages/clib/maildrop/rfc822/config.h])
 AC_CONFIG_FILES([packages/clib/Makefile])
 fi
 
@@ -2149,15 +2129,6 @@ if test "$PKG_JPL" != ""; then
 AC_CONFIG_FILES([packages/jpl/Makefile packages/jpl/src/java/Makefile ])
 fi
 
-if test "$PKG_LTX2HTM" != ""; then
-AC_CONFIG_FILES([ packages/ltx2htm/Makefile packages/ltx2htm/latex2html])
-fi
-
-if test "$PKG_PLDOC" != ""; then
-AC_CONFIG_FILES([packages/pldoc/Makefile])
-AC_CONFIG_FILES([packages/pldoc/server/man_server.pl])
-fi
-
 if test "$PKG_PLUNIT" != ""; then
 AC_CONFIG_FILES([packages/plunit/Makefile])
 fi
diff --git a/misc/mkwin b/misc/mkwin
index f0839c4dd..fda7837d3 100755
--- a/misc/mkwin
+++ b/misc/mkwin
@@ -1,188 +1,182 @@
-#!/bin/sh
-#
-# script for compiling and installing YAP under msys. Uses a mingw64
-# compiler, msys shell and nsis to do the installing
-# Please read the script before trying to execute it.
-# Legal arguments for the script are
-#  'threads' - enable threads
-#  'no_threads', 
-#  '32', '64'  - compile for 32 or 64 bit architecture.
-# By default threads are turned off and we use 64 bits.
-#
-# please check if you have gcc 64 bits in your path and a clone
-# of msys shell like smartgit:
-#
-# http://sourceforge.net/projects/mingwbuilds/
-#   PS: don't install in the default location.
-#   mingw should avoid space in its directory,
-#   it freaks winres out.
-# http://nsis.sourceforge.net/Main_Page
-#
-#
-VERSION=6.3.4
-THREADS=no
-ABI=64
-ROOTS=/l/work/noth/git
-ROOTS_WIN=L:\\work\\noth\\git
-TARGET=$ROOTS/yap
-
-if test $# = 1; then
-  if test $1 = threads; then
-     THREADS=yes
-  elif test $1 = no_threads; then
-     THREADS=no
-  elif test $1 = 32; then
-     ABI=32
-  elif test $1 = 64; then
-     ABI=64
-  else
-     echo "received \"$1\", should be one of threads, no_threads, 32, 64"
-  fi
-else
-  if test $1 = threads; then
-     THREADS=yes
-  elif test $1 = no_threads; then
-     THREADS=no
-  elif test $1 = 32; then
-     ABI=32
-  elif test $1 = 64; then
-     ABI=64
-  else
-     echo "received 1=\"$1\", should be one of threads, no_threads, 32, 64"
-  fi
-  if test $2 = threads; then
-     THREADS=yes
-  elif test $2 = no_threads; then
-     THREADS=no
-  elif test $2 = 32; then
-     ABI=32
-  elif test $2 = 64; then
-     ABI=64
-  else
-     echo "received 1=\"$2\", should be one of threads, no_threads, 32, 64"
-  fi
-fi
-
-# srcdir comes from here, please avoid relative paths
-CONFIGURE=$ROOTS/yap-6.3/configure
-
-# debugging setup
-do_compile=true
-do_install=true
-
-# HOME WIN64 configuration
-
-DOCS_DIR=/l/work/noth/yapdocs
-if test "$THREADS" = yes; then
-  FULL_VERSION="$VERSION"-threads
-else
-  FULL_VERSION="$VERSION"
-fi
-
-if test $ABI = 64; then
-GCC_PATH=/l/Work/noth/mingw-w64/x86_64-4.9.0-posix-seh-rt_v3-rev1/mingw64
-HOST="--host=x86_64-w64-mingw32"
-# ok.
-
-CUDD=no # BDD compiler package. Get version that compiles on Windows from Vitor!
-GECODE=no  #does not link with mingw64, VC++ trouble
-GMP=yes    # Compile it for infinite precision numbers and rationals 
-JAVA=no    # for JPL only
-PYTHON=no  # does not work in Windows anyway (currently)
-REAL=no    # interface to R
-
-  # it seems python2.7 does not support mingw64
-  PYTHON_PATH="/c/Python33-64"
-  export PATH="$GCC_PATH"/bin:"$PATH"
-  GECODE_PATH="/c/Program Files/Gecode"
-  GMP=/l/Work/noth/msys/1.0/local
-  CUDD_PATH=/c/cygwin/Yap/cudd-2.5.0-mingw64
-  JAVA_PATH="/c/Program Files/Java/jdk1.7.0_51"
-  R_PATH="/c/Program Files/R/R-3.0.2"
-  if test $THREADS = yes
-  then
-    cp "$GCC_PATH/x86_64-w64-mingw32/lib/libwinpthread-1.dll" .  # interface from posix threads to windows native threads
-    cp libwinpthread-1.dll pthreadGC2.dll
-  fi
-fi
-
-# HOME WIN32 configuration
-if test $ABI = 32; then
-GCC_PATH="/c/TDM-GCC-64"
-
-CUDD=yes
-GECODE=no # install only allows one of 32 or 64 bits
-GMP=yes
-JAVA=yes
-PYTHON=no
-REAL=yes
-
-  PYTHON_PATH="/c/Python27"
-  export PATH="$GCC_PATH"/bin:$PATH
-  GECODE_PATH="/c/Program Files/Gecode"
-  GMP=/c/cygwin/Yap/win32
-  CUDD_PATH=/c/cygwin/Yap/cudd-2.5.0-mingw32
-  JAVA_PATH="/c/Program Files (x86)/Java/jdk1.7.0_51"
-  R_PATH="/c/Program Files/R/R-3.0.2"
-  HOST="--enable-abi=32"
-
-  cp $GCC_PATH/bin/libwinpthread-1.dll .
-  cp libwinpthread-1.dll pthreadGC2.dll
-fi
-
-
-if test $CUDD = yes
-then
-  CUDD="$CUDD_PATH"
-  BDDLIB="--enable-bddlib"
-else
-  BDDLIB=""
-fi
-if test $GECODE = yes
-then
-  export PATH="$PATH":"$GECODE_PATH"/bin
-fi
-if test $JAVA = yes
-then
-  export PATH="$PATH":"$JAVA_PATH"/bin
-fi
-if test $PYTHON = yes
-then
-  export PATH="$PATH":"$PYTHON_PATH"
-fi
-if test $REAL = yes
-then
-  if test $ABI = 32; then
-    R_ABI=i386
-  else
-    R_ABI=x64
-  fi
-  export PATH="$PATH":"$R_PATH"/bin/"$R_ABI"
-fi
-
-export INSTALL_SH=$ROOTS/yap-6.3/install.sh
-# avoid using relativ paths
-if test "$do_compile" = true; then
-"$CONFIGURE" $HOST \
-    --prefix=$TARGET \
-	--with-R="$REAL" \
-	--with-java="$JAVA" \
-	--with-gmp="$GMP" \
-	--with-python="$PYTHON" \
-	--with-cudd="$CUDD" "$BDDLIB" \
-	--enable-gecode="$GECODE" \
-	--enable-threads="$THREADS"  --enable-pthread-locking \
-	 --enable-debug-yap --enable-low-level-tracer
-make -j 4 install
-fi
-if test "$do_install" = true; then
-if test $ABI = 64; then
-  cp $DOCS_DIR/*html $TARGET/share/doc/Yap
-  cp $DOCS_DIR/*pdf $TARGET/share/doc/Yap
-  "/l/Program Files (x86)/NSIS/makensis" -DREGKEY=SOFTWARE\\YAP\\Prolog64 -DROOTDIR=$TARGET -DABI="$ABI" -DVERSION="$FULL_VERSION" -DOPTIONS="$ROOTS_WIN\\yap-6.3\\misc\\options.ini" -DOUT_DIR=".." -D"WIN64=1" -NOCD $ROOTS/yap-6.3/misc/Yap.nsi
-else
-  cp $DOCS_DIR/*html $TARGET/share/doc/Yap
-  cp $DOCS_DIR/*pdf $TARGET/share/doc/Yap
-  "/l/Program Files (x86)/NSIS/makensis" -DREGKEY=SOFTWARE\\YAP\\Prolog -DROOTDIR=$TARGET -DABI="$ABI" -DVERSION="$FULL_VERSION" -DOPTIONS="$ROOTS_WIN\\yap-6.3\\misc\\options.ini" -DOUT_DIR=".." -NOCD $ROOTS/yap-6.3/misc/Yap.nsi
-fi
-fi
+#!/bin/sh
+#
+# script for compiling and installing YAP under msys. Uses a mingw64
+# compiler, msys shell and nsis to do the installing
+# Please read the script before trying to execute it.
+# Legal arguments for the script are
+#  'threads' - enable threads
+#  'no_threads',
+#  '32', '64'  - compile for 32 or 64 bit architecture.
+# By default threads are turned off and we use 64 bits.
+#
+# please check if you have gcc 64 bits in your path and a clone
+# of msys shell like smartgit:
+#
+# http://sourceforge.net/projects/mingwbuilds/
+#   PS: don't install in the default location.
+#   mingw should avoid space in its directory,
+#   it freaks winres out.
+# http://nsis.sourceforge.net/Main_Page
+#
+#
+VERSION=6.3.4
+# by default, compile without threads
+THREADS=no
+# use 64 bits
+ABI=64
+#SRC=/l/work/noth/git
+#SRC_WIN=L:\\work\\noth\\git
+SRC="$HOME"/git/yap-6.3
+TARGET=/c/Yap64
+NSIS="/c/Program Files (x86)/NSIS/makensis"
+# by default, ""
+PREFIX_CMD=wine
+
+I=$#
+while test $I -gt 0
+do
+  if test $1 = threads
+  then
+     THREADS=yes
+  elif test $1 = no_threads
+  then
+     THREADS=no
+  elif test $1 = 32
+  then
+     ABI=32
+  elif test $1 = 64
+  then
+     ABI=64
+  else
+     echo "received \"$1\", should be one of threads, no_threads, 32, 64"
+  fi
+  I=$(( $I - 1 ))
+done
+
+# srcdir comes from here, please avoid relative paths
+CONFIGURE=$SRC/configure
+
+# debugging setup
+do_compile=true
+do_install=true
+
+# HOME WIN64 configuration
+
+# DOCS_DIR=/l/work/noth/yapdocs
+DOCS_DIR=$HOME/Yap/bins/threads
+if test "$THREADS" = yes; then
+  FULL_VERSION="$VERSION"-threads
+else
+  FULL_VERSION="$VERSION"
+fi
+
+if test $ABI = 64; then
+#GCC_PATH=/l/Work/noth/mingw-w64/x86_64-4.9.0-posix-seh-rt_v3-rev1/mingw64
+GCC_PATH=$HOME/mxe/usr/bin
+PATH=$PATH:$GCC_PATH
+HOST="--host=x86_64-w64-mingw32"
+# ok.
+
+CUDD=no # BDD compiler package. Get version that compiles on Windows from Vitor!
+GECODE=no  #does not link with mingw64, VC++ trouble
+GMP=yes    # Compile it for infinite precision numbers and rationals
+JAVA=no    # for JPL only
+PYTHON=no  # does not work in Windows anyway (currently)
+REAL=no    # interface to R
+
+  # it seems python2.7 does not support mingw64
+  PYTHON_PATH="/c/Python33-64"
+  export PATH="$GCC_PATH"/bin:"$PATH"
+  GECODE_PATH="/c/Program Files/Gecode"
+#  GMP=/l/Work/noth/msys/1.0/local
+  GMP=yes
+  CUDD_PATH=/c/cygwin/Yap/cudd-2.5.0-mingw64
+  JAVA_PATH="/c/Program Files/Java/jdk1.7.0_51"
+  R_PATH="/c/Program Files/R/R-3.1.0"
+  if test $THREADS = yes
+  then
+    cp "$GCC_PATH/x86_64-w64-mingw32/lib/libwinpthread-1.dll" .  # interface from posix threads to windows native threads
+    cp libwinpthread-1.dll pthreadGC2.dll
+  fi
+fi
+
+# HOME WIN32 configuration
+if test $ABI = 32; then
+GCC_PATH="/c/TDM-GCC-64"
+
+CUDD=yes
+GECODE=no # install only allows one of 32 or 64 bits
+GMP=yes
+JAVA=yes
+PYTHON=no
+REAL=yes
+
+  PYTHON_PATH="/c/Python27"
+  export PATH="$GCC_PATH"/bin:$PATH
+  GECODE_PATH="/c/Program Files/Gecode"
+  GMP=/c/cygwin/Yap/win32
+  CUDD_PATH=/c/cygwin/Yap/cudd-2.5.0-mingw32
+  JAVA_PATH="/c/Program Files (x86)/Java/jdk1.7.0_51"
+  R_PATH="/c/Program Files/R/R-3.0.2"
+  HOST="--enable-abi=32"
+
+  cp $GCC_PATH/bin/libwinpthread-1.dll .
+  cp libwinpthread-1.dll pthreadGC2.dll
+fi
+
+
+if test $CUDD = yes
+then
+  CUDD="$CUDD_PATH"
+  BDDLIB="--enable-bddlib"
+else
+  BDDLIB=""
+fi
+if test $GECODE = yes
+then
+  export PATH="$PATH":"$GECODE_PATH"/bin
+fi
+if test $JAVA = yes
+then
+  export PATH="$PATH":"$JAVA_PATH"/bin
+fi
+if test $PYTHON = yes
+then
+  export PATH="$PATH":"$PYTHON_PATH"
+fi
+if test $REAL = yes
+then
+  if test $ABI = 32; then
+    R_ABI=i386
+  else
+    R_ABI=x64
+  fi
+  export PATH="$PATH":"$R_PATH"/bin/"$R_ABI"
+fi
+
+export INSTALL_SH=$SRC/yap-6.3/install.sh
+# avoid using relative paths
+if test "$do_compile" = true; then
+"$CONFIGURE" $HOST \
+    --prefix=$TARGET \
+	--with-R="$REAL" \
+	--with-java="$JAVA" \
+	--with-gmp="$GMP" \
+	--with-python="$PYTHON" \
+	--with-cudd="$CUDD" "$BDDLIB" \
+	--enable-gecode="$GECODE" \
+	--enable-threads="$THREADS"  --enable-pthread-locking \
+	 --enable-debug-yap --enable-low-level-tracer
+make -j 4 install
+fi
+if test "$do_install" = true; then
+if test $ABI = 64; then
+  cp $DOCS_DIR/*html $TARGET/share/doc/Yap
+  cp $DOCS_DIR/*pdf $TARGET/share/doc/Yap
+  "$NSIS" -DREGKEY=SOFTWARE\\YAP\\Prolog64 -DROOTDIR=$TARGET -DABI="$ABI" -DVERSION="$FULL_VERSION" -DOPTIONS="$SRC_WIN\\yap-6.3\\misc\\options.ini" -DOUT_DIR=".." -D"WIN64=1" -NOCD $SRC/yap-6.3/misc/Yap.nsi
+else
+  cp $DOCS_DIR/*html $TARGET/share/doc/Yap
+  cp $DOCS_DIR/*pdf $TARGET/share/doc/Yap
+  "$NSIS" -DREGKEY=SOFTWARE\\YAP\\Prolog -DROOTDIR=$TARGET -DABI="$ABI" -DVERSION="$FULL_VERSION" -DOPTIONS="$SRC_WIN\\yap-6.3\\misc\\options.ini" -DOUT_DIR=".." -NOCD $SRC/yap-6.3/misc/Yap.nsi
+fi
+fi
diff --git a/os/pl-os.c b/os/pl-os.c
index fe1daa359..f860bd201 100755
--- a/os/pl-os.c
+++ b/os/pl-os.c
@@ -1649,6 +1649,8 @@ ChDir(const char *path)
   char tmp[MAXPATHLEN];
   int hyper_path = FALSE;
 
+  __android_log_print(ANDROID_LOG_INFO, __FUNCTION__, " %s ",ospath);
+
   OsPath(path, ospath);
 
   if ( path[0] == EOS || streq(path, ".") ||
@@ -1656,7 +1658,6 @@ ChDir(const char *path)
     succeed;
 
   AbsoluteFile(path, tmp);
-  __android_log_print(ANDROID_LOG_INFO, __FUNCTION__, " %s ",ospath);
 #if __ANDROID__
   /* treat "/assets" as a directory (actually as a mounted file system).
    *
diff --git a/packages/swig/android/SwigSimple.java b/packages/swig/android/SwigSimple.java
index adaf94b74..03e6c4ceb 100644
--- a/packages/swig/android/SwigSimple.java
+++ b/packages/swig/android/SwigSimple.java
@@ -184,7 +184,6 @@ class JavaCallback extends YAPCallback
   
   public void run(String s)
   {
-    System.out.println("JavaCallback.run() ");
     Log.i(TAG, "java callback ");
     output.append(s);
  }
diff --git a/pl/absf.yap b/pl/absf.yap
index 007cee6d4..3ac9c76a6 100755
--- a/pl/absf.yap
+++ b/pl/absf.yap
@@ -117,7 +117,7 @@ swapped, making the call
 absolute_file_name(File,TrueFileName,Opts) :- ( var(TrueFileName) ->
 	true ; atom(TrueFileName), TrueFileName \= [] ), !,
 	absolute_file_name(File,Opts,TrueFileName).
-	absolute_file_name(File,Opts,TrueFileName) :-
+absolute_file_name(File,Opts,TrueFileName) :-
 	'$absolute_file_name'(File,Opts,TrueFileName,absolute_file_name(File,Opts,TrueFileName)).
 
 /**
@@ -316,14 +316,6 @@ absolute_file_name(File0,File) :-
 	'$check_file'(F0, Type, Access, F).
 
 '$check_file'(F, _Type, none, F) :- !.
-'$check_file'(F0, _Type, _Access, F0) :-
-%	format('IN ~w~n', [F0]),
-	yap_flag( c_cc, Flag),
-	sub_atom( Flag, _, _, _, android),
-	sub_atom( F0, 0, _, _, '/assets'),
-	catch( open( F0, Access, S ), _, fail ),
-%	format('~w~n', [F0]),
-	!.
 '$check_file'(F0, Type, Access, F0) :-
 	access_file(F0, Access),
 	(Type == directory ->
diff --git a/pl/init.yap b/pl/init.yap
index 7eff9c3e9..548585b4f 100755
--- a/pl/init.yap
+++ b/pl/init.yap
@@ -31,8 +31,8 @@
 	'$do_log_upd_clause'/6,
         '$do_log_upd_clause0'/6,
         '$do_log_upd_clause_erase'/6,
-        '$do_static_clause'/5,
-        '$system_module'/1], []).
+        '$do_static_clause'/5], [
+        '$system_module'/1]).
 
 :- use_system_module( '$_boot', ['$cut_by'/1]).
 
@@ -167,9 +167,6 @@ version(yap,[6,3]).
 :- use_module('../swi/library/menu.pl').
 
 
-'$system_module'('$swi').
-'$system_module'('$win_menu').
-
 
 yap_hacks:cut_by(CP) :- '$$cut_by'(CP).
 
diff --git a/pl/modules.yap b/pl/modules.yap
index 2b2db1e32..c4d52b6e3 100755
--- a/pl/modules.yap
+++ b/pl/modules.yap
@@ -1087,3 +1087,9 @@ ls_imports :-
 ls_imports.
 
 
+'$system_module'('$swi').
+'$system_module'('$win_menu').
+'$system_module'('prolog').
+'$system_module'('system').
+'$system_module'('$attributes').
+