From b815e6474094185191aba0dc393689be5207a8df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= <vsc@dcc.fc.up.pt>
Date: Tue, 11 Mar 2014 11:24:10 +0000
Subject: [PATCH] README -> add TXT file.

---
 Makefile.in                             |   4 +-
 README => README.TXT                    | 104 +++++----
 configure                               | 280 +++++++++++++++++++-----
 misc/Yap.spec                           |   2 +-
 misc/yap.nsi                            |   8 +-
 packages/ProbLog/simplecudd/Makefile.in |   2 +-
 packages/real                           |   2 +-
 7 files changed, 279 insertions(+), 123 deletions(-)
 rename README => README.TXT (65%)

diff --git a/Makefile.in b/Makefile.in
index 00fd4d5f9..7bdc7ecc4 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -598,7 +598,7 @@ install_unix: startup.yss @YAPLIB@
 	  $(LN_S) -f $(DESTDIR)$(LIBDIR)/@YAPLIB@ $(DESTDIR)$(LIBDIR)/$$p; \
 	done
 	$(INSTALL) $(srcdir)/Artistic $(DESTDIR)$(DOCSDIR)
-	$(INSTALL) $(srcdir)/README $(DESTDIR)$(DOCSDIR)
+	$(INSTALL) $(srcdir)/README.TXT $(DESTDIR)$(DOCSDIR)
 	$(INSTALL) $(srcdir)/COPYING $(DESTDIR)$(DOCSDIR)
 	for f in $(PL_SOURCES); do $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(SHAREDIR)/Yap/pl; done
 	for h in $(INTERFACE_HEADERS); do $(INSTALL) $(srcdir)/$$h $(DESTDIR)$(INCLUDEDIR); done
@@ -699,7 +699,7 @@ install_docs:
 	$(MAKE) html
 	$(INSTALL_DATA) yap.html* $(DESTDIR)$(DOCSDIR)
 	$(INSTALL_DATA) yap.pdf $(DESTDIR)$(DOCSDIR)
-	$(INSTALL_DATA) README $(DESTDIR)$(DOCSDIR)
+	$(INSTALL_DATA) README.TXT $(DESTDIR)$(DOCSDIR)
 	$(INSTALL_DATA) Artistic $(DESTDIR)$(DOCSDIR)
 	$(INSTALL_DATA) COPYING $(DESTDIR)$(DOCSDIR)
 	$(INSTALL_DATA) changes4.3.html $(DESTDIR)$(DOCSDIR)
diff --git a/README b/README.TXT
similarity index 65%
rename from README
rename to README.TXT
index bdfa1136a..d4de07905 100644
--- a/README
+++ b/README.TXT
@@ -3,29 +3,30 @@
 			README for YAP6
 
 
-This directory contains a release of the YAP 6.0.* Prolog system,
+This directory contains a release of the YAP 6.3.* Prolog system,
 originally developed at the Universidade do Porto by Luis Damas and
-Vitor Santos Costa, with contributions from the Edinburgh Prolog
+Vitor Santos Costa. YAP contains the SWI-Prolog I/O library anad a
+number of SWI-Prolog packages, originally developed by Jan Wielemaker
+and other. It includes contributions from the Edinburgh Prolog
 library, the C-Prolog manual authors, Ricardo Lopes, Ricardo Rocha,
 M. Hermenegildo, D. Cabeza, Eric Alphonse, Paulo Moura, Nuno Fonseca,
-Jan Wielemaker, Paul Singleton, Fred Dushin, Jan Wielemaker, Markus
-Triska, and many others. You should read the rest of this file for
-information on what YAP is and for instructions on how to build it.
+Jan Wielemaker, Paul Singleton, Fred Dushin, Markus Triska, and many
+others. You should read the rest of this file for information on what
+YAP is and for instructions on how to build it.
 
 YAP 6 has been built with several versions on GCC on a variety of
-Linux, MacOSX. It has been built on Windows XP and VISTA using the
-mingw toolkit and cygwin from Cygnus Solutions.
+Linux, BDS, and MacOSX configurations. It has been built on Windows7
+using the mingw toolkit and cygwin from Cygnus Solutions.
 
 The main core of the YAP distribution is distributed under a dual
 license: the Perl Artistic license 2 and the FSF's LGPL. The YAP
 distribution also contains files distributed under the LGPL
 exclusively, and under the GPL.
 
-The YAP distribution includes several packages ported to YAP, such as
-Pillow, JPL, CLP(R) and CHR. We would like to take the opportunity to
-thank the developers of these packages for their generosity in
-allowing YAP to distribute these packages. Any bugs in these packages
-are probably our fault.
+The YAP distribution includes several packages ported to YAP. We would
+like to take the opportunity to thank the developers of these packages
+for their generosity in allowing YAP to distribute these packages. Any
+bugs in these packages are probably our fault.
 
 If you have a question about this software, desire to add code, found
 a bug, want to request a feature, or wonder how to get further
@@ -71,11 +72,11 @@ with SICStus Prolog.
 YAP is now being maintained using the git source management system. A
 public repository is available at 
 
-http://gitorious.org/projects/yap-git
+http://sourceforge.net/p/yap/yap-6.3/ci/master/tree/
 
 Please use
 
-git clone git://gitorious.org/yap-git/mainline.git
+git clone git://git.code.sf.net/p/yap/yap-6.3
 
 to obtain a copy of the current YAP tree.
 
@@ -116,8 +117,7 @@ the --exec-prefix option to set the EROOTDIR macro (for
 architecture-dependent files). EROOTDIR defaults to ROOTDIR.
 
   o The main executable is placed at BINDIR, which defaults at
-$(EROOTDIR)/bin. This executable is actually a script that calls the
-Prolog engine, stored at YAPLIBDIR.
+$(EROOTDIR)/bin.
 
   o SHAREDIR is the directory where the Prolog libraries are stored.
 Its default value is $(ROOTDIR)/share. The Prolog libraries are
@@ -144,13 +144,14 @@ following options to configure:
 
 Compilation options:
 
+ o --enable-tablingt=yes allows tabled evaluation (default option)
+
  o --enable-depth-limit=yes allows depth limited evaluation, say for
 implementing iterative deepening. It is required by the ILP system
-Aleph.
+Aleph. (default option)
 
  o --enable-use-malloc=yes makes YAP use the system's C-library
- allocation routines for all memory allocation. It is not compatible
- with save and restore.
+ allocation routines for all memory allocation (default).
 
  o --enable-threads=yes enables POSIX thread support.
 
@@ -167,59 +168,52 @@ useful for normal users.
  o --enable-or-parallelism={env-copy,sba,a-cow} allows or-parallelism
 supported by one of these three forms. This is still experimental.
 
- o --enable-tabling=yes allows tabling support.
-
  o --enable-dynamic-loading compile YAP as as a shared library.
 
- o --enable-win64 compile YAP as a WIN64 application (still experimental).
-
  o --enable-cygwin compile YAP as a CYGWIN environment application, and not as stand-alone application.
 
- o --with-cudd=CUDD_PATH enable support of the CUDD library, used by
- packages such as ProbLog. Usually CUDD has to compiled from source
- (http://vlsi.colorado.edu/~fabio/CUDD/), but Fedora and MacPorts have
- cudd packages. In the case of Fedora, install cudd-dev and use
- --with-cud=/usr, in the case of MacPorts install cudd-dev and use
- --with-cud=/opt/local.
-
- o --with-gmp=GMP_PATH provide a path for GMP, in case GMP is not
+ o --with-gmp[=GMP_PATH] provide a path for GMP, in case GMP is not
  installed in the system. In a Linux machine, make sure you have
  installed the gmp-dev package. Binary versions of GMP are available
  for WIN32.
 
-Functionality options:
+ o --enable-condor compile YAP as a static program that can be run by
+ condor. condor_compile must be in the system path.
 
- o --with-java=JAVA_PATH activates the Java Interface Library JPL. In
- Linux and WIN32 you have to provide a path to the Java library, in
- OSX it is sufficient to say yes.
+Packages and Interface Libraries
 
- o --enable-condor compile YAP as a static program that can be run by condor
+ o --with-cudd[=CUDD_PATH] enables compilation of the CUDD library,
+ used by packages such as PFL/CLP(BN) and ProbLog. The source of the
+ CUDD package is availablr from:
 
- o --enable-chr install CHR (enabled by default, if CHR is available)
+  http://vlsi.colorado.edu/~fabio/CUDD
 
- o --enable-clpqr install CLPQR (enabled by default, if CLPQR is available)
+ Fedora Linux and MacPorts have cudd packages. In the case of Fedora,
+ install cudd-devel. Ask vsc@dcc.fc.up.pt for a WIN32/WIN64 port 
 
- o --enable-myddas install the MYDDAS MYSQL and/or ODBC interface
- package. YAP tries to compile this by default, if the odbc or MySql
- development files can be found.
+ o --with-java[=JAVA_PATH] enables the Java Interface Library JPL.
 
- o --with-matlab install the MATLAB interface (not default). You need
- to provide the full path of the MATLAB install.
+ o --enable-chr installs the Leuven CHR language implementation
+ (enabled by default, if package/chr exists)
 
- o --with-mpi install the MPICH based MPI interface. This is default,
+ o --enable-clpqr installs the Leuven CLPQR port, originally developed
+ for SWI-Prolog (enabled by default, if Cpackage/clpqe exists)
+
+ o --enable-myddas[=PATH] installs the MYDDAS MYSQL and/or ODBC interface
+ package (enabled by default, if ODBC and/or MySql
+ development files can be found). It also enables support for the
+ SWI-Prolog ODBC package.
+
+ o --with-matlab[=PATH] installs the MATLAB interface (not
+ default). You need to provide the full path of the MATLAB libraries.
+
+ o --with-mpi[=PATH] installs the  MPI interface. This is default,
  if the development libraries can be found.
 
- o --with-mpe install the MPE interface.
-
- o --with-lam install the MPI LAM-based interface.
-
-
-3.3 Porting YAP
-
-The system has been mainly tested with GCC, but we have been able to
-compile older versions of YAP under lcc in Linux, Sun's cc compiler,
-IBM's xlc, SGI's cc, HP's cc, and Microsoft's Visual C++ 6.0. Recent
-versions of YAP have also been compiled using Intel's lcc.
+ o --with-gecode[=PATH] installs the  GeCode Solver interface. This is default,
+ if gecode libraries can be found.
 
+ o --with-R[=PATH] installs the Real interface to the R language.
 
+ o --with-python[=PATH] installs a Python interface
 
diff --git a/configure b/configure
index 25e63ccc6..3a19588b6 100755
--- a/configure
+++ b/configure
@@ -780,8 +780,10 @@ build_cpu
 build
 C_PARSER_FLAGS
 C_INTERF_FLAGS
+RCFLAGS
 GCC
 AWK
+RC
 ac_ct_CXX
 CXXFLAGS
 CXX
@@ -834,6 +836,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+enable_abi
 enable_tabling
 enable_or_parallelism
 enable_depth_limit
@@ -1510,6 +1513,7 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+ --enable-abi           support an ABI
  --enable-tabling           support tabling
  --enable-or-parallelism    support or-parallelism as: copy,sba,a-cow,threads
  --enable-depth-limit       support depth-bound computation
@@ -2694,13 +2698,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 DOC_VERSION=4.2.9
 
-ac_config_headers="$ac_config_headers config.h"
-
-ac_config_headers="$ac_config_headers YapTermConfig.h"
-
-
-mycflags="$CFLAGS"
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3884,6 +3881,117 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
+set dummy ${ac_tool_prefix}windres; 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_RC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RC"; then
+  ac_cv_prog_RC="$RC" # 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_RC="${ac_tool_prefix}windres"
+    $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
+RC=$ac_cv_prog_RC
+if test -n "$RC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RC" >&5
+$as_echo "$RC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_RC"; then
+  ac_ct_RC=$RC
+  # Extract the first word of "windres", so it can be a program name with args.
+set dummy windres; 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_RC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_RC"; then
+  ac_cv_prog_ac_ct_RC="$ac_ct_RC" # 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_RC="windres"
+    $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_RC=$ac_cv_prog_ac_ct_RC
+if test -n "$ac_ct_RC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RC" >&5
+$as_echo "$ac_ct_RC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_RC" = x; then
+    RC=":"
+  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
+    RC=$ac_ct_RC
+  fi
+else
+  RC="$ac_cv_prog_RC"
+fi
+
+
+# if we are trying to use -m32 in a WIN32/mingw setup then
+# we cannot trust lpthread
+# we cannot trust RC
+# Check whether --enable-abi was given.
+if test "${enable_abi+set}" = set; then :
+  enableval=$enable_abi;  CC="$CC -m$enableval"; CPP="$CPP -m$enableval"; CXX="$CXX -m$enableval"; RCFLAGS="--output-format=coff --target=pe-i386" ; pthreadlib="`pwd`/pthreadGC2.dll"; win_abi="$enableval"
+else
+  win_abi=no
+fi
+
+
+ac_config_headers="$ac_config_headers config.h"
+
+ac_config_headers="$ac_config_headers YapTermConfig.h"
+
+
+mycflags="$CFLAGS"
+
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -3929,6 +4037,8 @@ done
 
 
 
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5240,6 +5350,9 @@ then
   then
     # locale complaints without this.
     if test "$threads" = yes; then
+      if test $win_abi = 32; then
+        LIBS="$LIBS $pthreadlib"
+      else
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lpthread" >&5
 $as_echo_n "checking for main in -lpthread... " >&6; }
@@ -5280,6 +5393,7 @@ _ACEOF
 
 fi
 
+      fi
     fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lmscrt" >&5
 $as_echo_n "checking for main in -lmscrt... " >&6; }
@@ -5760,6 +5874,51 @@ fi
     LIBS="-lcygwin"
     EXTRA_LIBS_FOR_DLLS="\$(abs_top_builddir)/yap.dll"
     EXTRA_INCLUDES_FOR_WIN32="-I\$(srcdir)/packages/PLStream/windows"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
+$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
+if ${ac_cv_lib_pthread_pthread_create+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpthread  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pthread_create ();
+int
+main ()
+{
+return pthread_create ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_pthread_pthread_create=yes
+else
+  ac_cv_lib_pthread_pthread_create=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
+$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
+if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBPTHREAD 1
+_ACEOF
+
+  LIBS="-lpthread $LIBS"
+
+fi
+
   fi
 else
   if test "$prefix" = "NONE"
@@ -6147,6 +6306,51 @@ _ACEOF
 
   LIBS="-lresolv $LIBS"
 
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
+$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
+if ${ac_cv_lib_pthread_pthread_create+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpthread  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pthread_create ();
+int
+main ()
+{
+return pthread_create ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_pthread_pthread_create=yes
+else
+  ac_cv_lib_pthread_pthread_create=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
+$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
+if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBPTHREAD 1
+_ACEOF
+
+  LIBS="-lpthread $LIBS"
+
 fi
 
 fi
@@ -6334,51 +6538,6 @@ fi
 
 if test "$threads" = yes
 then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
-$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
-if ${ac_cv_lib_pthread_pthread_create+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pthread_create ();
-int
-main ()
-{
-return pthread_create ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_pthread_pthread_create=yes
-else
-  ac_cv_lib_pthread_pthread_create=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
-$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBPTHREAD 1
-_ACEOF
-
-  LIBS="-lpthread $LIBS"
-
-fi
-
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
@@ -9420,8 +9579,11 @@ CHR_TARGETS=chr_support."$SO"
 
 
 
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
+# use the lib directly in mingw setups
+if test "$win_abi" = "32"; then
+  CLIB_PTHREADS="$pthreadlib"
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
 $as_echo_n "checking for pthread_create in -lpthread... " >&6; }
 if ${ac_cv_lib_pthread_pthread_create+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -9463,7 +9625,7 @@ else
   CLIB_PTHREADS=""
 fi
 
-
+fi
 
 
 ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "
@@ -12176,7 +12338,7 @@ else
 JAVA_TEST=Test.java
 CLASS_TEST=Test.class
 cat << \EOF > $JAVA_TEST
-/* #line 12179 "configure" */
+/* #line 12341 "configure" */
 public class Test {
 }
 EOF
@@ -12352,7 +12514,7 @@ EOF
 if uudecode$EXEEXT Test.uue; then
         ac_cv_prog_uudecode_base64=yes
 else
-        echo "configure: 12355: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
+        echo "configure: 12517: 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
@@ -12483,7 +12645,7 @@ else
 JAVA_TEST=Test.java
 CLASS_TEST=Test.class
 cat << \EOF > $JAVA_TEST
-/* #line 12486 "configure" */
+/* #line 12648 "configure" */
 public class Test {
 }
 EOF
@@ -12518,7 +12680,7 @@ JAVA_TEST=Test.java
 CLASS_TEST=Test.class
 TEST=Test
 cat << \EOF > $JAVA_TEST
-/* [#]line 12521 "configure" */
+/* [#]line 12683 "configure" */
 public class Test {
 public static void main (String args[]) {
         System.exit (0);
diff --git a/misc/Yap.spec b/misc/Yap.spec
index 2948cebb9..f14db39b7 100644
--- a/misc/Yap.spec
+++ b/misc/Yap.spec
@@ -54,7 +54,7 @@ rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/file.list.%{name}
 
 %files
 %defattr(-,root,root,-)
-%doc README*
+%doc README.TXT
 %doc INSTALL
 %doc changes-6.0.html
 %doc changes-5.1.html
diff --git a/misc/yap.nsi b/misc/yap.nsi
index 9bbcecc96..404782f58 100755
--- a/misc/yap.nsi
+++ b/misc/yap.nsi
@@ -76,7 +76,7 @@ Section "Base system (required)"
   File c:\${ROOTDIR}\share\doc\Yap\yap.pdf
 ;  File c:\${ROOTDIR}\share\doc\Yap\yap.info
   File c:\${ROOTDIR}\share\doc\Yap\Artistic
-  File c:\${ROOTDIR}\share\doc\Yap\README
+  File c:\${ROOTDIR}\share\doc\Yap\README.TXT
   File c:\${ROOTDIR}\share\doc\Yap\COPYING
 
   WriteRegStr HKLM ${REGKEY} "home" "$INSTDIR"
@@ -116,8 +116,8 @@ Section "Start Menu shortcuts"
 		 "$INSTDIR\bin\yap.exe" \
 		 0
   CreateShortCut "$SMPROGRAMS\${GRP}\Readme.lnk" \
-  		  "$INSTDIR\share\doc\Yap\README" "" \
-		  "$INSTDIR\share\doc\Yap\README" 0 \
+  		  "$INSTDIR\share\doc\Yap\README.TXT" "" \
+		  "$INSTDIR\share\doc\Yap\README.TXT" 0 \
 		  "SW_SHOWNORMAL" "" "View readme"
   CreateShortCut "$SMPROGRAMS\${GRP}\Manual Html.lnk" \
   		  "$INSTDIR\share\doc\Yap\yap.html" "" \
@@ -318,7 +318,7 @@ FunctionEnd
 
 Function .onInstSuccess
   MessageBox MB_YESNO "Installation complete. View readme?" IDNO NoReadme
-  ExecShell "open" "$INSTDIR\share\doc\Yap\README"
+  ExecShell "open" "$INSTDIR\share\doc\Yap\README.TXT"
   NoReadme:
 FunctionEnd
 
diff --git a/packages/ProbLog/simplecudd/Makefile.in b/packages/ProbLog/simplecudd/Makefile.in
index 29950bab5..7e8035af8 100755
--- a/packages/ProbLog/simplecudd/Makefile.in
+++ b/packages/ProbLog/simplecudd/Makefile.in
@@ -59,7 +59,7 @@ clean:
 	rm -f *.o problogbdd
 
 install: default
-	$(INSTALL_PROGRAM) problogbdd $(DESTDIR)$(BINDIR)/Yap
+	$(INSTALL_PROGRAM) problogbdd $(DESTDIR)$(BINDIR)
 
 install-examples:
 
diff --git a/packages/real b/packages/real
index 34cac46db..613b935b6 160000
--- a/packages/real
+++ b/packages/real
@@ -1 +1 @@
-Subproject commit 34cac46db62cad37386ea3321de37c0349eb9852
+Subproject commit 613b935b686beccf33e0ff0e92c920ed9baad687