diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change to support autoheaders

Browse Source
This commit is contained in:
Vítor Santos Costa 2014-02-16 13:03:09 +00:00
parent 9214f50eb5
commit 6a1302221c
9 changed files with 1779 additions and 818 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
H/Yap.h
View File

@ -38,6 +38,53 @@
#endif /* THREADS && (YAPOR_COW || YAPOR_SBA || YAPOR_COPY) */
#include "config.h"
#define ALIGN_LONGS 1
#define LOW_ABSMI 0
#define MSHIFTOFFS 1
#undef USE_DL_MALLOC
#undef USE_MALLOC
#undef USE_SYSTEM_MALLOC
#define USE_MMAP (HAVE_MMAP & !USE_MALLOC & !USE_SYSTEM_MALLOC)
#define USE_SHM (HAVE_SHMAT & !HAVE_MMAP & !USE_MALLOC & !USE_SYSTEM_MALLOC)
#define USE_SBRK (HAVE_SBRK & !HAVE_MMAP & !HAVE_SHMAT & !USE_MALLOC & !USE_SYSTEM_MALLOC)
#if __MINGW32__
#define __WINDOWS__ 1
#endif
#if (HAVE_SOCKET || defined(__MINGW32__)) && !defined(SIMICS)
#define USE_SOCKET 1
#endif
#define FunAdr(X) X
#if HAVE_GMP_H && HAVE_LIBGMP
#define USE_GMP 1
#endif
#if HAVE_JUDY_H && HAVE_LIBJUDY
#define USE_JUDY 1
#endif
/* Should we use MPI ? */
#if defined(HAVE_MPI_H) && (defined(HAVE_LIBMPI) || defined(HAVE_LIBMPICH))
#define HAVE_MPI 1
#else
#define HAVE_MPI 0
#endif
/* Should we use MPE ? */
#if defined(HAVE_MPI_H) && HAVE_LIBMPE && HAVE_MPI
#define HAVE_MPE 1
#else
#define HAVE_MPE 0
#endif
#define CELLSIZE SIZEOF_VOID_P
#include "inline-only.h"
#if defined(YAPOR) || defined(TABLING)
#include "opt.config.h"

3
H/pl-incl.h
View File

@ -34,7 +34,7 @@
/* include all stuff that is exported to yap */
#include "pl-shared.h"
#define PLVERSION YAP_VERSION
#define PLVERSION YAP_NUMERIC_VERSION
#define PLNAME "yap"
#define SWIP "swi_"
@ -62,7 +62,6 @@ typedef struct pred_entry * Procedure; /* predicate */
// used by swi
#ifdef SIZEOF_INT_P
#define SIZEOF_VOIDP SIZEOF_INT_P
#define SIZEOF_LONG SIZEOF_LONG_INT
#else
bad config
#endif

6
H/pl-shared.h
View File

@ -56,7 +56,7 @@
#endif
#endif
#include <SWI-Stream.h>
#include <SWI-Prolog.h>
#define COMMON(X) extern X
@ -128,7 +128,7 @@ typedef int bool;
typedef struct redir_context
{ int magic; /* REDIR_MAGIC */
IOSTREAM *stream; /* temporary output */
struct io_stream *stream; /* temporary output */
int is_stream; /* redirect to stream */
int redirected; /* output is redirected */
term_t term; /* redirect target */
@ -298,7 +298,7 @@ atom_t YAP_SWIAtomFromAtom(Atom at);
static inline Functor
SWIFunctorToFunctor(functor_t f)
{
if ((CELL)(f) & 2 && ((CELL)f) < N_SWI_FUNCTORS*4+2)
if (((CELL)(f) & 2) && ((CELL)f) < N_SWI_FUNCTORS*4+2)
return SWI_Functors[((CELL)f)/4];
return (Functor)f;
}

1395
config.h.in Executable file → Normal file
View File

File diff suppressed because it is too large Load Diff

464
configure vendored
View File

@ -621,7 +621,8 @@ ac_includes_default="\
# include <unistd.h>
#endif"
ac_subst_vars='PKG_ODBC
ac_subst_vars='SED
PKG_ODBC
PKG_LIBARCHIVE
GECODE_EXTRALIBS
GECODE_VERSION
@ -763,9 +764,6 @@ INSTALL_DATA
INSTALL_SCRIPT
INSTALL_PROGRAM
LN_S
DefTrailSpace
DefStackSpace
DefHeapSpace
target_os
target_vendor
target_cpu
@ -855,7 +853,7 @@ enable_chr
enable_clpqr
enable_april
enable_dlcompat
enable_clpbn_bp
enable_clpbn_horus
with_gmp
with_R
with_judy
@ -1531,7 +1529,7 @@ Optional Features:
--enable-clpqr install clpqr library
--enable-april compile Yap to support April ILP system
--enable-dlcompat use dlcompat library for dynamic loading on Mac OS X
--enable-clpbn-bp enable belief propagation solver in CLPBN.
--enable-clpbn-horus enable CLPBN HORUS library.
--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
@ -1546,7 +1544,7 @@ Optional Packages:
--with-R=DIR interface to R language
--with-judy=DIR UDI needs judy library
--enable-minisat use minisat interface
--with-java=JAVA_HOME use Java instalation in JAVA_HOME
--with-java=JAVA_HOME use JPL with Java setup in JAVA_HOME
--with-readline=DIR use GNU Readline Library in DIR
--with-heap-space=space default heap size in Kbytes
--with-stack-space=space default stack size in Kbytes
@ -2691,6 +2689,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
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"
@ -4074,6 +4075,7 @@ test -n "$target_alias" &&
program_prefix=${target_alias}-
cat >>confdefs.h <<_ACEOF
#define HOST_ALIAS "${target}"
_ACEOF
@ -4081,6 +4083,9 @@ _ACEOF
case "$target_cpu" in
i*86*)
YAP_TARGET=i386
@ -4247,11 +4252,11 @@ else
fi
# Check whether --enable-clpbn-bp was given.
if test "${enable_clpbn_bp+set}" = set; then :
enableval=$enable_clpbn_bp; yap_cv_clpbn_bp="$enableval"
# Check whether --enable-clpbn-horus was given.
if test "${enable_clpbn_horus+set}" = set; then :
enableval=$enable_clpbn_horus; yap_cv_clpbn_horus="$enableval"
else
yap_cv_clpbn_bp=yes
horus=yes
fi
@ -4274,6 +4279,7 @@ else
fi
# Check whether --with-R was given.
if test "${with_R+set}" = set; then :
withval=$with_R; if test "$withval" = yes; then
@ -4433,22 +4439,19 @@ else
fi
if test "$orparallelism" = no
then
$as_echo "#define MinHeapSpace (1000*SIZEOF_INT_P)" >>confdefs.h
$as_echo "#define MinStackSpace (300*SIZEOF_INT_P)" >>confdefs.h
$as_echo "#define MinHeapSpace (2048*SIZEOF_INT_P)" >>confdefs.h
$as_echo "#define MinTrailSpace ( 48*SIZEOF_INT_P)" >>confdefs.h
$as_echo "#define MinStackSpace (1024*SIZEOF_INT_P)" >>confdefs.h
$as_echo "#define MinTrailSpace (256*SIZEOF_INT_P)" >>confdefs.h
$as_echo "#define MAX_WORKERS 1" >>confdefs.h
else
$as_echo "#define MinHeapSpace (2000*SIZEOF_INT_P)" >>confdefs.h
$as_echo "#define MinStackSpace (600*SIZEOF_INT_P)" >>confdefs.h
$as_echo "#define MinTrailSpace (100*SIZEOF_INT_P)" >>confdefs.h
if test "$orparallelism" = no
then
cat >>confdefs.h <<_ACEOF
#define MAX_WORKERS $yap_cv_max_workers
@ -4462,36 +4465,33 @@ _ACEOF
then
threads="yes"
fi
tabling="no"
fi
cat >>confdefs.h <<_ACEOF
#define DefHeapSpace $yap_cv_heap_space
_ACEOF
cat >>confdefs.h <<_ACEOF
#define DefStackSpace $yap_cv_stack_space
_ACEOF
cat >>confdefs.h <<_ACEOF
#define DefTrailSpace $yap_cv_trail_space
_ACEOF
if test "$threads" = no
then
$as_echo "#define MAX_THREADS 1" >>confdefs.h
yap_cv_max_threads=1
fi
else
cat >>confdefs.h <<_ACEOF
#define MAX_THREADS $yap_cv_max_threads
_ACEOF
fi
if test "$yap_cv_prism" = no
@ -4559,6 +4559,7 @@ then
CC="condor_compile $CC"
CXX="condor_compile $CXX"
yap_cv_readline="no"
$as_echo "#define SUPPORT_CONDOR 1" >>confdefs.h
yap_cv_minisat=no
@ -5561,7 +5562,6 @@ fi
;;
esac
fi
echo $prefix
WINDOWS=""
PKG_WINCONSOLE="swi/console"
else
@ -5572,6 +5572,23 @@ fi
EXTRA_INCLUDES_FOR_WIN32="-I\$(srcdir)/packages/PLStream/windows"
fi
else
if test "$prefix" = "NONE"
then
prefix=/usr/local
fi
if test -d "${prefix}/lib64" -a "$YAP_TARGET" = amd64
then
LDFLAGS="$LDFLAGS -L${prefix}/lib64"
fi
LDFLAGS="$LDFLAGS -L${prefix}/lib"
CPPFLAGS="$CPPFLAGS -I${prefix}/include"
if test "$exec_prefix" != "NONE" -a "$exec_prefix" != "$prefix"
then
if test -d "${exec_prefix}/lib64" -a "$YAP_TARGET" = amd64; then
LDFLAGS="$LDFLAGS -L${exec_prefix}/lib64"
fi
LDFLAGS="$LDFLAGS -L${exec_prefix}/lib"
fi
INSTALL_COMMAND="install_unix"
WINDOWS="#"
PKG_WINCONSOLE=""
@ -5942,19 +5959,6 @@ _ACEOF
fi
if test "$prefix" != "NONE"; then
if test -d "${prefix}/lib64" -a "$YAP_TARGET" = amd64; then
LDFLAGS="$LDFLAGS -L${prefix}/lib64"
fi
LDFLAGS="$LDFLAGS -L${prefix}/lib"
CPPFLAGS="$CPPFLAGS -I${prefix}/include"
fi
if test "$exec_prefix" != "NONE"; then
if test -d "${exec_prefix}/lib64" -a "$YAP_TARGET" = amd64; then
LDFLAGS="$LDFLAGS -L${exec_prefix}/lib64"
fi
LDFLAGS="$LDFLAGS -L${exec_prefix}/lib"
fi
fi
if test "$yap_cv_readline" != "no"
@ -6471,6 +6475,7 @@ done
if test "$pthreadlocking" = yes
then
$as_echo "#define USE_PTHREAD_LOCKING 1" >>confdefs.h
fi
@ -6487,6 +6492,7 @@ fi
CMFLAGS=-fpic
CIFLAGS=-I.
if test "$use_prism" = no; then
PKG_PRISM=""
else
@ -6590,7 +6596,7 @@ fi
if test "$cross_compiling" = "yes"
then
YAP_EXTRAS=
YAP_EXTRAS=""
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
@ -6827,6 +6833,7 @@ fi
;;
*hpux*)
#do not use the first memory quadrant
$as_echo "#define FORCE_SECOND_QUADRANT 1" >>confdefs.h
M4="/usr/bin/m4"
@ -6847,8 +6854,10 @@ fi
# If the xnet library was found, turn on X/Open networking
if test "$ac_cv_lib_xnet_getsockname" = yes
then
$as_echo "#define _XOPEN_SOURCE 1" >>confdefs.h
$as_echo "#define _XOPEN_SOURCE_EXTENDED 1" >>confdefs.h
fi
@ -6856,9 +6865,9 @@ fi
INSTALL_DLLS="no"
fi
fi
#do not use realloc() from HP-UX 10.20 together with MPI
if test ${target_os} = hpux10.20
then
$as_echo "#define MPI_AVOID_REALLOC 1" >>confdefs.h
fi
@ -7187,7 +7196,7 @@ else
YAPLIB_CFLAGS="$CFLAGS"
fi
YAP_EXTRAS="$YAP_EXTRAS -DCOROUTINING=1 -DRATIONAL_TREES=1"
YAP_EXTRAS="$YAP_EXTRAS -DCOROUTINING=1 -DRATIONAL_TREES=1 -DTABLING=1"
if test "$debugyap" = "yes"
then
@ -7254,10 +7263,6 @@ else
esac
fi
if test "$tabling" = "yes"
then
YAP_EXTRAS="$YAP_EXTRAS -DTABLING=1"
fi
@ -7690,6 +7695,40 @@ _ACEOF
fi
done
if ${yap_cv_rl_catch+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <readline/readline.h>
int
main ()
{
printf("Signal value is %d\n", rl_catch_signal);
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
yap_cv_rl_catch=yes
else
yap_cv_rl_catch=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $yap_cv_rl_catch" >&5
$as_echo "$yap_cv_rl_catch" >&6; }
if test "$yap_cv_rl_catch" = yes
then
$as_echo "#define HAVE_RL_CATCH_SIGNAL 1" >>confdefs.h
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
@ -8000,6 +8039,39 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
# The cast to long int works around a bug in the HP C Compiler
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
$as_echo_n "checking size of void *... " >&6; }
if ${ac_cv_sizeof_void_p+:} false; then :
$as_echo_n "(cached) " >&6
else
if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default"; then :
else
if test "$ac_cv_type_void_p" = yes; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "cannot compute sizeof (void *)
See \`config.log' for more details" "$LINENO" 5; }
else
ac_cv_sizeof_void_p=0
fi
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5
$as_echo "$ac_cv_sizeof_void_p" >&6; }
cat >>confdefs.h <<_ACEOF
#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
_ACEOF
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for type of malloc" >&5
$as_echo_n "checking for type of malloc... " >&6; }
@ -8034,9 +8106,15 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $yap_cv_malloct *" >&5
$as_echo "$yap_cv_malloct *" >&6; }
if test "$yap_cv_malloct" = void
then $as_echo "#define MALLOC_T void *" >>confdefs.h
then
cat >>confdefs.h <<_ACEOF
#define MALLOC_T void *
_ACEOF
else $as_echo "#define MALLOC_T char *" >>confdefs.h
else
cat >>confdefs.h <<_ACEOF
#define MALLOC_T char *
_ACEOF
fi
@ -8073,12 +8151,11 @@ $as_echo "$yap_cv_gcc" >&6; }
if test "$yap_cv_gcc" = yes
then
M4GENHDRS=m4/gcc_genhdrs.m4
$as_echo "#define HAVE_GCC 1" >>confdefs.h
else
M4GENHDRS=m4/cc_genhdrs.m4
$as_echo "#define HAVE_GCC 0" >>confdefs.h
fi
@ -8184,12 +8261,11 @@ fi
$as_echo "$yap_cv_threaded_code" >&6; }
if test "$yap_cv_threaded_code" = yes && test "$yap_cv_gcc" = yes
then
$as_echo "#define USE_THREADED_CODE 1" >>confdefs.h
M4GENABSMI=gen_gcc.m4
else
$as_echo "#define USE_THREADED_CODE 0" >>confdefs.h
M4GENABSMI=gen_ansi.m4
fi
@ -8230,10 +8306,8 @@ fi
$as_echo "$yap_cv_ffieee" >&6; }
if test "$yap_cv_ffieee" = yes
then
$as_echo "#define FFIEEE 1" >>confdefs.h
else
$as_echo "#define FFIEEE 0" >>confdefs.h
$as_echo "#define FFIEEE 1" >>confdefs.h
fi
@ -8270,10 +8344,8 @@ fi
$as_echo "$yap_cv_sigsetjmp" >&6; }
if test "$yap_cv_sigsetjmp" = yes
then
$as_echo "#define HAVE_SIGSETJMP 1" >>confdefs.h
else
$as_echo "#define HAVE_SIGSETJMP 0" >>confdefs.h
$as_echo "#define HAVE_SIGSETJMP 1" >>confdefs.h
fi
@ -8309,10 +8381,8 @@ fi
$as_echo "$yap_cv_sigsegv" >&6; }
if test "$yap_cv_sigsegv" = yes
then
$as_echo "#define HAVE_SIGSEGV 1" >>confdefs.h
else
$as_echo "#define HAVE_SIGSEGV 0" >>confdefs.h
$as_echo "#define HAVE_SIGSEGV 1" >>confdefs.h
fi
@ -8348,10 +8418,8 @@ fi
$as_echo "$yap_cv_sigprof" >&6; }
if test "$yap_cv_sigsegv" = yes
then
$as_echo "#define HAVE_SIGPROF 1" >>confdefs.h
else
$as_echo "#define HAVE_SIGPROF 0" >>confdefs.h
$as_echo "#define HAVE_SIGPROF 1" >>confdefs.h
fi
@ -8387,10 +8455,8 @@ fi
$as_echo "$yap_cv_siginfo" >&6; }
if test "$yap_cv_siginfo" = yes
then
$as_echo "#define HAVE_SIGINFO 1" >>confdefs.h
else
$as_echo "#define HAVE_SIGINFO 0" >>confdefs.h
$as_echo "#define HAVE_SIGINFO 1" >>confdefs.h
fi
@ -8440,7 +8506,7 @@ ac_fn_c_check_member "$LINENO" "struct tm" "tm_gmtoff" "ac_cv_member_struct_tm_t
"
if test "x$ac_cv_member_struct_tm_tm_gmtoff" = xyes; then :
$as_echo "#define HAVE_STRUCT_TIME_TM_GMTOFF /**/" >>confdefs.h
$as_echo "#define HAVE_STRUCT_TIME_TM_GMTOFF 1" >>confdefs.h
fi
@ -8474,6 +8540,7 @@ rm -f core conftest.err conftest.$ac_objext \
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $union_wait_ok" >&5
$as_echo "$union_wait_ok" >&6; }
if test "$union_wait_ok" = no; then
$as_echo "#define NO_UNION_WAIT 1" >>confdefs.h
fi
@ -8503,6 +8570,7 @@ rm -f core conftest.err conftest.$ac_objext \
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $environ_ok" >&5
$as_echo "$environ_ok" >&6; }
if test "$environ_ok" = yes; then
$as_echo "#define HAVE_ENVIRON 1" >>confdefs.h
fi
@ -8899,10 +8967,8 @@ fi
$as_echo "$yap_cv_mpz_xor" >&6; }
if test "$yap_cv_mpz_xor" = yes
then
$as_echo "#define HAVE_MPZ_XOR 1" >>confdefs.h
else
$as_echo "#define HAVE_MPZ_XOR 0" >>confdefs.h
$as_echo "#define HAVE_MPZ_XOR 1" >>confdefs.h
fi
@ -8911,6 +8977,7 @@ then
maxmemory="no"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if fflush(NULL) clobbers input pipes" >&5
$as_echo_n "checking if fflush(NULL) clobbers input pipes... " >&6; }
if ${yap_cv_broken_fflush_null+:} false; then :
@ -8971,30 +9038,24 @@ $as_echo "failed" >&6; }
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $yap_cv_broken_fflush_null" >&5
$as_echo "$yap_cv_broken_fflush_null" >&6; }
if test "$yap_cv_broken_fflush_null" = no
if test "$yap_cv_broken_fflush_null" = yes
then
$as_echo "#define BROKEN_FFLUSH_NULL 0" >>confdefs.h
else
$as_echo "#define BROKEN_FFLUSH_NULL 1" >>confdefs.h
$as_echo "#define BROKEN_FFLUSH_NULL /**/" >>confdefs.h
fi
if test "$use_malloc" = yes
if test "$use_malloc" = yes -o "$maxmemory" = yes
then
$as_echo "#define USE_SYSTEM_MALLOC 1" >>confdefs.h
$as_echo "#define GC_NO_TAGS 1" >>confdefs.h
fi
if test "$maxmemory" = yes
then
$as_echo "#define GC_NO_TAGS 1" >>confdefs.h
$as_echo "#define USE_DL_MALLOC 1" >>confdefs.h
fi
PROLOG_SYSTEM=yap
IN_YAP=
@ -9133,7 +9194,7 @@ ac_fn_c_check_member "$LINENO" "struct tm" "tm_gmtoff" "ac_cv_member_struct_tm_t
"
if test "x$ac_cv_member_struct_tm_tm_gmtoff" = xyes; then :
$as_echo "#define HAVE_STRUCT_TIME_TM_GMTOFF /**/" >>confdefs.h
$as_echo "#define HAVE_STRUCT_TIME_TM_GMTOFF 1" >>confdefs.h
fi
@ -9192,13 +9253,20 @@ if test "x$PLARCH" = "x"; then
PLARCH=`echo $host | sed 's/\(^-*\)-^-*-\(^-*\)-gnu/\1-\2/'`
;;
*)
PLARCH=`echo $host | sed 's/\(^-*\)-^-*-\(^-*\)/\1-\2/'`
PLARCH=`echo $host | sed 's/\(^-*\)-^-*-\(^-*\)/\1-\2/'` #'
;;
esac
fi
MYDDAS_VERSION=0.9.1
cat >>confdefs.h <<_ACEOF
#define MYDDAS_VERSION $MYDDAS_VERSION
_ACEOF
# Check whether --enable-myddas was given.
if test "${enable_myddas+set}" = set; then :
enableval=$enable_myddas; if test "$enableval" = yes; then
@ -11327,6 +11395,7 @@ fi
if test "$PKG_ZLIB" != ""
then
@ -11536,9 +11605,12 @@ else
PKG_REAL=""
fi
if test "$yap_cv_java" = no; then
if test "$yap_cv_java" = no
then
PKG_JPL=""
elif test -e "$srcdir"/packages/jpl/Makefile.in; then
elif test -e "$srcdir"/packages/jpl/Makefile.in
then
PKG_JPL="packages/jpl"
if test "$yap_cv_java" != "yes"; then
JAVA_HOME=$yap_cv_java
@ -11754,7 +11826,7 @@ else
JAVA_TEST=Test.java
CLASS_TEST=Test.class
cat << \EOF > $JAVA_TEST
/* #line 11757 "configure" */
/* #line 11829 "configure" */
public class Test {
}
EOF
@ -11930,7 +12002,7 @@ EOF
if uudecode$EXEEXT Test.uue; then
ac_cv_prog_uudecode_base64=yes
else
echo "configure: 11933: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
echo "configure: 12005: 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
@ -12061,7 +12133,7 @@ else
JAVA_TEST=Test.java
CLASS_TEST=Test.class
cat << \EOF > $JAVA_TEST
/* #line 12064 "configure" */
/* #line 12136 "configure" */
public class Test {
}
EOF
@ -12096,7 +12168,7 @@ JAVA_TEST=Test.java
CLASS_TEST=Test.class
TEST=Test
cat << \EOF > $JAVA_TEST
/* [#]line 12099 "configure" */
/* [#]line 12171 "configure" */
public class Test {
public static void main (String args[]) {
System.exit (0);
@ -12762,7 +12834,8 @@ fi
fi
if test -e "$srcdir"/packages/ltx2htm/Makefile.in; then
if test -e "$srcdir"/packages/ltx2htm/Makefile.in
then
PKG_LTX22HTM="packages/ltx2htm"
@ -12788,7 +12861,8 @@ else
PKG_LTX2HTM=""
fi
if test -e "$srcdir"/packages/raptor/Makefile.in; then
if test -e "$srcdir"/packages/raptor/Makefile.in
then
PKG_RAPTOR="packages/raptor"
@ -14487,9 +14561,11 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mpe_MPE_Init_log" >&5
$as_echo "$ac_cv_lib_mpe_MPE_Init_log" >&6; }
if test "x$ac_cv_lib_mpe_MPE_Init_log" = xyes; then :
$as_echo "#define HAVE_LIBMPE 1" >>confdefs.h
else
$as_echo "#define HAVE_LIBMPE 0" >>confdefs.h
fi
@ -15040,6 +15116,198 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
$as_echo_n "checking for a sed that does not truncate output... " >&6; }
if ${ac_cv_path_SED+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
for ac_i in 1 2 3 4 5 6 7; do
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
{ ac_script=; unset ac_script;}
if test -z "$SED"; then
ac_path_SED_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
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_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
as_fn_executable_p "$ac_path_SED" || continue
# Check for GNU ac_path_SED and select it if it is found.
# Check for GNU $ac_path_SED
case `"$ac_path_SED" --version 2>&1` in
*GNU*)
ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
*)
ac_count=0
$as_echo_n 0123456789 >"conftest.in"
while :
do
cat "conftest.in" "conftest.in" >"conftest.tmp"
mv "conftest.tmp" "conftest.in"
cp "conftest.in" "conftest.nl"
$as_echo '' >> "conftest.nl"
"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
as_fn_arith $ac_count + 1 && ac_count=$as_val
if test $ac_count -gt ${ac_path_SED_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_SED="$ac_path_SED"
ac_path_SED_max=$ac_count
fi
# 10*(2^10) chars as input seems more than enough
test $ac_count -gt 10 && break
done
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
$ac_path_SED_found && break 3
done
done
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_SED"; then
as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
fi
else
ac_cv_path_SED=$SED
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
YAP_VERSION="$PACKAGE_VERSION"
YAP_MAJOR_VERSION=`echo "$PACKAGE_VERSION" | $SED 's/\([^.][^.]*\).*/\1/'`
YAP_MINOR_VERSION=`echo "$PACKAGE_VERSION" | $SED 's/[^.][^.]*.\([^.][^.]*\).*/\1/'`
YAP_POINT_VERSION=`echo "$PACKAGE_VERSION" | $SED 's/[^.][^.]*.[^.][^.]*.\(.*\)/\1/'`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Major version" >&5
$as_echo_n "checking Major version... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $YAP_MAJOR_VERSION" >&5
$as_echo "$YAP_MAJOR_VERSION" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Minor version" >&5
$as_echo_n "checking Minor version... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $YAP_MINOR_VERSION" >&5
$as_echo "$YAP_MINOR_VERSION" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Point version" >&5
$as_echo_n "checking Point version... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $YAP_POINT_VERSION" >&5
$as_echo "$YAP_POINT_VERSION" >&6; }
cat >>confdefs.h <<_ACEOF
#define YAP_STARTUP "$yap_startup"
_ACEOF
yap_timestamp=`date`
yap_nversion=`expr $YAP_MAJOR_VERSION \* 10000 + $YAP_MINOR_VERSION \* 100 + $YAP_POINT_VERSION`
yap_startup=startup.yss
cat >>confdefs.h <<_ACEOF
#define C_CC "$CC"
_ACEOF
cat >>confdefs.h <<_ACEOF
#define C_CFLAGS "$CFLAGS $YAP_EXTRAS $DEFS -D_YAP_NOT_INSTALLED_=1 $CPPFLAGS -I. -I$srcdir/H -I$srcdir/include -I$srcdir/os -I$srcdir/OPTYap -I$srcdir/BEAM"
_ACEOF
cat >>confdefs.h <<_ACEOF
#define C_LDFLAGS "$LDFLAGS"
_ACEOF
cat >>confdefs.h <<_ACEOF
#define C_LIBS "$LIBS"
_ACEOF
cat >>confdefs.h <<_ACEOF
#define C_LIBPLSO "$LIBS $EXTRA_LIBS_FOR_DLLS"
_ACEOF
cat >>confdefs.h <<_ACEOF
#define SO_EXT "$SO"
_ACEOF
cat >>confdefs.h <<_ACEOF
#define SO_PATH "$YAPLIBDIR"
_ACEOF
cat >>confdefs.h <<_ACEOF
#define YAP_ARCH "$ARCH"
_ACEOF
cat >>confdefs.h <<_ACEOF
#define YAP_BINDIR "$prefix/bin"
_ACEOF
cat >>confdefs.h <<_ACEOF
#define YAP_FULL_VERSION "YAP $YAP_VERSION ($ARCH): $yap_timestamp"
_ACEOF
cat >>confdefs.h <<_ACEOF
#define YAP_LIBDIR "$prefix/lib/Yap"
_ACEOF
cat >>confdefs.h <<_ACEOF
#define YAP_NUMERIC_VERSION $yap_nversion
_ACEOF
cat >>confdefs.h <<_ACEOF
#define YAP_PL_SRCDIR "$prefix/share/Yap/pl"
_ACEOF
cat >>confdefs.h <<_ACEOF
#define YAP_ROOTDIR "$prefix"
_ACEOF
cat >>confdefs.h <<_ACEOF
#define YAP_SHAREDIR "$prefix/share/Yap"
_ACEOF
cat >>confdefs.h <<_ACEOF
#define YAP_TIMESTAMP "$yap_timestamp"
_ACEOF
cat >>confdefs.h <<_ACEOF
#define YAP_VERSION "$YAP_VERSION"
_ACEOF
cat >>confdefs.h <<_ACEOF
#define YAP_YAPLIB "$YAPLIB"
_ACEOF
mkdir -p library/matrix
mkdir -p library/mpi
mkdir -p library/random

237
configure.in
View File

@ -37,6 +37,9 @@ dnl EXTRA_LIBS_FOR_SWIDLLS= libs that are required when lding a SWI so
AC_INIT(YAP, 6.3.4, yap-users@sf.net, yap )
DOC_VERSION=4.2.9
AC_CONFIG_HEADER(config.h)
AC_CONFIG_HEADER(YapTermConfig.h)
@ -54,10 +57,25 @@ AC_LANG(C)
AC_CANONICAL_SYSTEM
AC_DEFINE_UNQUOTED(HOST_ALIAS,"${target}")
AC_DEFINE_UNQUOTED(HOST_ALIAS,"${target}",[what is the configure host name])
m4_define([HAS_TOP])
AC_DEFUN([AX_SPLIT_VERSION],[
AC_REQUIRE([AC_PROG_SED])
YAP_VERSION="$PACKAGE_VERSION"
YAP_MAJOR_VERSION=`echo "$PACKAGE_VERSION" | $SED 's/\([[^.]][[^.]]*\).*/\1/'`
YAP_MINOR_VERSION=`echo "$PACKAGE_VERSION" | $SED 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'`
YAP_POINT_VERSION=`echo "$PACKAGE_VERSION" | $SED 's/[[^.]][[^.]]*.[[^.]][[^.]]*.\(.*\)/\1/'`
AC_MSG_CHECKING([Major version])
AC_MSG_RESULT([$YAP_MAJOR_VERSION])
AC_MSG_CHECKING([Minor version])
AC_MSG_RESULT([$YAP_MINOR_VERSION])
AC_MSG_CHECKING([Point version])
AC_MSG_RESULT([$YAP_POINT_VERSION])
])
case "$target_cpu" in
i*86*)
YAP_TARGET=i386
@ -140,9 +158,9 @@ AC_ARG_ENABLE(dlcompat,
[ --enable-dlcompat use dlcompat library for dynamic loading on Mac OS X],
use_dlcompat="$enableval", use_dlcompat=no)
AC_ARG_ENABLE(clpbn-bp,
[ --enable-clpbn-bp enable belief propagation solver in CLPBN. ],
yap_cv_clpbn_bp="$enableval", yap_cv_clpbn_bp=yes)
AC_ARG_ENABLE(clpbn-horus,
[ --enable-clpbn-horus enable CLPBN HORUS library. ],
yap_cv_clpbn_horus="$enableval", horus=yes)
AC_ARG_WITH(gmp,
[ --with-gmp[=DIR] use GNU Multiple Precision in DIR],
@ -158,6 +176,7 @@ AC_ARG_WITH(gmp,
CFLAGS="$CFLAGS -I${yap_cv_gmp}/include"
fi,
[yap_cv_gmp=yes])
AC_ARG_WITH(R,
[ --with-R[=DIR] interface to R language],
if test "$withval" = yes; then
@ -192,7 +211,7 @@ AC_ARG_WITH(minisat,
[yap_cv_minisat=yes])
AC_ARG_WITH(java,
[ --with-java=JAVA_HOME use Java instalation in JAVA_HOME],
[ --with-java=JAVA_HOME use JPL with Java setup in JAVA_HOME],
if test "$withval" = yes; then
yap_cv_java=yes
dynamic_loading=yes
@ -280,17 +299,13 @@ AC_ARG_WITH(max-threads,
fi,
[yap_cv_max_threads="1024"])
AC_DEFINE(MinHeapSpace, (2048*SIZEOF_INT_P), [at least 2M Cells for Heap])
AC_DEFINE(MinStackSpace,(1024*SIZEOF_INT_P), [at least 1M Cells for Stack])
AC_DEFINE(MinTrailSpace,(256*SIZEOF_INT_P), [at least 1/2M Cells for Trail])
AC_DEFINE(MAX_WORKERS,1)
if test "$orparallelism" = no
then
AC_DEFINE(MinHeapSpace, (1000*SIZEOF_INT_P))
AC_DEFINE(MinStackSpace,(300*SIZEOF_INT_P))
AC_DEFINE(MinTrailSpace,( 48*SIZEOF_INT_P))
AC_DEFINE(MAX_WORKERS,1)
else
AC_DEFINE(MinHeapSpace, (2000*SIZEOF_INT_P))
AC_DEFINE(MinStackSpace,(600*SIZEOF_INT_P))
AC_DEFINE(MinTrailSpace,(100*SIZEOF_INT_P))
AC_DEFINE_UNQUOTED(MAX_WORKERS,$yap_cv_max_workers)
AC_DEFINE_UNQUOTED(MAX_WORKERS,$yap_cv_max_workers,[maximum amount of or-parallelism])
if test "$orparallelism" = copy -o "$orparallelism" = yes
then
use_malloc="no"
@ -299,23 +314,17 @@ else
then
threads="yes"
fi
tabling="no"
fi
AC_DEFINE_UNQUOTED(DefHeapSpace,$yap_cv_heap_space)
AC_DEFINE_UNQUOTED(DefStackSpace,$yap_cv_stack_space)
AC_DEFINE_UNQUOTED(DefTrailSpace,$yap_cv_trail_space)
AC_SUBST(DefHeapSpace)
AC_SUBST(DefStackSpace)
AC_SUBST(DefTrailSpace)
AC_DEFINE_UNQUOTED(DefHeapSpace,$yap_cv_heap_space, [Default Heap Space.])
AC_DEFINE_UNQUOTED(DefStackSpace,$yap_cv_stack_space, [Default Global+Local Space.])
AC_DEFINE_UNQUOTED(DefTrailSpace,$yap_cv_trail_space, [Default Trail Space.])
if test "$threads" = no
then
AC_DEFINE(MAX_THREADS,1)
else
AC_DEFINE_UNQUOTED(MAX_THREADS,$yap_cv_max_threads)
yap_cv_max_threads=1
fi
AC_DEFINE_UNQUOTED(MAX_THREADS,$yap_cv_max_threads,[max number of threads, default 1 or 1024])
if test "$yap_cv_prism" = no
@ -357,7 +366,7 @@ then
CXX="condor_compile $CXX"
dnl no readline with condor.
yap_cv_readline="no"
AC_DEFINE(SUPPORT_CONDOR, 1)
AC_DEFINE(SUPPORT_CONDOR, 1, [enable condor distributed execution, static compilation])
dnl and it disables minisat
yap_cv_minisat=no
STATIC_MODE=""
@ -531,7 +540,6 @@ then
;;
esac
fi
echo $prefix
WINDOWS=""
PKG_WINCONSOLE="swi/console"
else
@ -542,6 +550,23 @@ then
EXTRA_INCLUDES_FOR_WIN32="-I\$(srcdir)/packages/PLStream/windows"
fi
else
if test "$prefix" = "NONE"
then
prefix=/usr/local
fi
if test -d "${prefix}/lib64" -a "$YAP_TARGET" = amd64
then
LDFLAGS="$LDFLAGS -L${prefix}/lib64"
fi
LDFLAGS="$LDFLAGS -L${prefix}/lib"
CPPFLAGS="$CPPFLAGS -I${prefix}/include"
if test "$exec_prefix" != "NONE" -a "$exec_prefix" != "$prefix"
then
if test -d "${exec_prefix}/lib64" -a "$YAP_TARGET" = amd64; then
LDFLAGS="$LDFLAGS -L${exec_prefix}/lib64"
fi
LDFLAGS="$LDFLAGS -L${exec_prefix}/lib"
fi
INSTALL_COMMAND="install_unix"
WINDOWS="#"
PKG_WINCONSOLE=""
@ -558,19 +583,6 @@ else
AC_CHECK_LIB(nss_files,main)
AC_CHECK_LIB(nss_dns,main)
AC_CHECK_LIB(resolv,main)
if test "$prefix" != "NONE"; then
if test -d "${prefix}/lib64" -a "$YAP_TARGET" = amd64; then
LDFLAGS="$LDFLAGS -L${prefix}/lib64"
fi
LDFLAGS="$LDFLAGS -L${prefix}/lib"
CPPFLAGS="$CPPFLAGS -I${prefix}/include"
fi
if test "$exec_prefix" != "NONE"; then
if test -d "${exec_prefix}/lib64" -a "$YAP_TARGET" = amd64; then
LDFLAGS="$LDFLAGS -L${exec_prefix}/lib64"
fi
LDFLAGS="$LDFLAGS -L${exec_prefix}/lib"
fi
fi
if test "$yap_cv_readline" != "no"
@ -605,7 +617,7 @@ then
AC_CHECK_FUNCS(pthread_mutexattr_setkind_np pthread_mutexattr_settype)
if test "$pthreadlocking" = yes
then
AC_DEFINE(USE_PTHREAD_LOCKING, 1)
AC_DEFINE(USE_PTHREAD_LOCKING, 1, [do not use our own locking routines])
fi
use_malloc=yes
fi
@ -620,6 +632,8 @@ fi
CMFLAGS=-fpic
CIFLAGS=-I.
dnl Packages
if test "$use_prism" = no; then
PKG_PRISM=""
else
@ -723,7 +737,7 @@ fi
if test "$cross_compiling" = "yes"
then
YAP_EXTRAS=
YAP_EXTRAS=""
else
AC_SYS_RESTARTABLE_SYSCALLS
fi
@ -814,7 +828,7 @@ case "$target_os" in
;;
*hpux*)
#do not use the first memory quadrant
AC_DEFINE(FORCE_SECOND_QUADRANT)
AC_DEFINE(FORCE_SECOND_QUADRANT, 1, [old HP-UX VM magic, should be irrelevant now])
M4="/usr/bin/m4"
if test ${use_condor} = no
then
@ -833,17 +847,16 @@ case "$target_os" in
# If the xnet library was found, turn on X/Open networking
if test "$ac_cv_lib_xnet_getsockname" = yes
then
AC_DEFINE(_XOPEN_SOURCE)
AC_DEFINE(_XOPEN_SOURCE_EXTENDED,1)
AC_DEFINE(_XOPEN_SOURCE, 1, [HP-UX old socket stuff])
AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, [HP-UX old socket stuff])
fi
else
INSTALL_DLLS="no"
fi
fi
#do not use realloc() from HP-UX 10.20 together with MPI
if test ${target_os} = hpux10.20
then
AC_DEFINE(MPI_AVOID_REALLOC,1)
AC_DEFINE(MPI_AVOID_REALLOC,1,[o not use realloc() from HP-UX 10.20 together with MPI])
fi
LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)"
DYNYAPLIB=libYap."$SO"
@ -1055,7 +1068,7 @@ else
YAPLIB_CFLAGS="$CFLAGS"
fi
YAP_EXTRAS="$YAP_EXTRAS -DCOROUTINING=1 -DRATIONAL_TREES=1"
YAP_EXTRAS="$YAP_EXTRAS -DCOROUTINING=1 -DRATIONAL_TREES=1 -DTABLING=1"
if test "$debugyap" = "yes"
then
@ -1120,10 +1133,6 @@ else
esac
fi
if test "$tabling" = "yes"
then
YAP_EXTRAS="$YAP_EXTRAS -DTABLING=1"
fi
AC_SUBST(INSTALL_ENV)
AC_SUBST(PRE_INSTALL_ENV)
@ -1159,6 +1168,19 @@ then
AC_CHECK_HEADERS( readline/readline.h)
AC_CHECK_HEADERS( readline/history.h)
AC_CHECK_FUNCS( rl_completion_matches rl_clear_pending_input rl_cleanup_after_signal rl_event_hook rl_filename_completion_function rl_free_line_state rl_insert_close rl_set_prompt rl_state_initialized )
AC_CACHE_VAL(yap_cv_rl_catch,[
AC_TRY_COMPILE(
#include <readline/readline.h>
,
printf("Signal value is %d\n", rl_catch_signal);
,
yap_cv_rl_catch=yes,yap_cv_rl_catch=no ) ] )
AC_MSG_RESULT($yap_cv_rl_catch)
if test "$yap_cv_rl_catch" = yes
then
AC_DEFINE(HAVE_RL_CATCH_SIGNAL, 1, [Defined if you can turn off readline's signal handling.])
fi
fi
dnl Checks for typedefs, structures, and compiler characteristics.
@ -1171,6 +1193,7 @@ AC_CHECK_SIZEOF(long int,4)
AC_CHECK_SIZEOF(long long int,8)
AC_CHECK_SIZEOF(float,4)
AC_CHECK_SIZEOF(double,8)
AC_CHECK_SIZEOF(void *,4)
dnl check type of malloc (i.e. char * or void *)
AC_MSG_CHECKING(for type of malloc)
@ -1186,8 +1209,8 @@ AC_TRY_RUN(
yap_cv_malloct=char,yap_cv_malloct=void,yap_cv_malloct=void)])
AC_MSG_RESULT($yap_cv_malloct *)
if test "$yap_cv_malloct" = void
then AC_DEFINE(MALLOC_T,void *)
else AC_DEFINE(MALLOC_T,char *)
then AC_DEFINE_UNQUOTED(MALLOC_T,void *,[malloc_t])
else AC_DEFINE_UNQUOTED(MALLOC_T,char *,[malloc_t])
fi
@ -1204,10 +1227,9 @@ AC_MSG_RESULT($yap_cv_gcc)
if test "$yap_cv_gcc" = yes
then
M4GENHDRS=m4/gcc_genhdrs.m4
AC_DEFINE(HAVE_GCC,1)
AC_DEFINE(HAVE_GCC,1,[Old m4 auto-heder generation, not really useful now])
else
M4GENHDRS=m4/cc_genhdrs.m4
AC_DEFINE(HAVE_GCC,0)
fi
AC_SUBST(M4)
AC_SUBST(M4GENHDRS)
@ -1310,10 +1332,9 @@ AC_TRY_RUN(
AC_MSG_RESULT($yap_cv_threaded_code)
if test "$yap_cv_threaded_code" = yes && test "$yap_cv_gcc" = yes
then
AC_DEFINE(USE_THREADED_CODE,1)
AC_DEFINE(USE_THREADED_CODE,1,[threaded emulator])
M4GENABSMI=gen_gcc.m4
else
AC_DEFINE(USE_THREADED_CODE,0)
M4GENABSMI=gen_ansi.m4
fi
@ -1335,9 +1356,7 @@ AC_TRY_RUN(
AC_MSG_RESULT($yap_cv_ffieee)
if test "$yap_cv_ffieee" = yes
then
AC_DEFINE(FFIEEE,1)
else
AC_DEFINE(FFIEEE,0)
AC_DEFINE(FFIEEE,1,[IEEE floating-point, basically everyone except old VAXEN])
fi
dnl check for sigsetjmp
@ -1354,9 +1373,7 @@ AC_TRY_COMPILE(
AC_MSG_RESULT($yap_cv_sigsetjmp)
if test "$yap_cv_sigsetjmp" = yes
then
AC_DEFINE(HAVE_SIGSETJMP,1)
else
AC_DEFINE(HAVE_SIGSETJMP,0)
AC_DEFINE(HAVE_SIGSETJMP,1,[support for sigsetjmp])
fi
dnl check for sigsegv
@ -1372,9 +1389,7 @@ AC_TRY_COMPILE(
AC_MSG_RESULT($yap_cv_sigsegv)
if test "$yap_cv_sigsegv" = yes
then
AC_DEFINE(HAVE_SIGSEGV,1)
else
AC_DEFINE(HAVE_SIGSEGV,0)
AC_DEFINE(HAVE_SIGSEGV,1,[UNIX signal SEGV])
fi
dnl check for sigsegv
@ -1390,9 +1405,7 @@ AC_TRY_COMPILE(
AC_MSG_RESULT($yap_cv_sigprof)
if test "$yap_cv_sigsegv" = yes
then
AC_DEFINE(HAVE_SIGPROF,1)
else
AC_DEFINE(HAVE_SIGPROF,0)
AC_DEFINE(HAVE_SIGPROF,1, [UNIX Signal SIGPROF])
fi
dnl check for siginfo
@ -1408,9 +1421,7 @@ AC_TRY_COMPILE(
AC_MSG_RESULT($yap_cv_siginfo)
if test "$yap_cv_siginfo" = yes
then
AC_DEFINE(HAVE_SIGINFO,1)
else
AC_DEFINE(HAVE_SIGINFO,0)
AC_DEFINE(HAVE_SIGINFO,1, [Unix SIGINFO])
fi
AC_MSG_CHECKING("variable timezone in tzset")
@ -1440,7 +1451,7 @@ AC_MSG_RESULT(no),
AC_MSG_RESULT(assuming no))
AC_CHECK_MEMBER(struct tm.tm_gmtoff,
AC_DEFINE(HAVE_STRUCT_TIME_TM_GMTOFF, [],
AC_DEFINE(HAVE_STRUCT_TIME_TM_GMTOFF, 1,
[Define is struct tm has tm_gmtoff]),
[],
[#include <time.h>])
@ -1457,7 +1468,7 @@ WIFEXITED(x); /* Generates compiler error if WIFEXITED
], union_wait_ok=yes, union_wait_ok=no)
AC_MSG_RESULT($union_wait_ok)
if test "$union_wait_ok" = no; then
AC_DEFINE(NO_UNION_WAIT)
AC_DEFINE(NO_UNION_WAIT, 1, [compile wait in UNIX])
fi
dnl check whether the system supports the environ variable
@ -1467,7 +1478,7 @@ extern char **environ;
], environ_ok=yes, environ_ok=no)
AC_MSG_RESULT($environ_ok)
if test "$environ_ok" = yes; then
AC_DEFINE(HAVE_ENVIRON)
AC_DEFINE(HAVE_ENVIRON, 1,[environment access])
fi
dnl Checks for library functions.
@ -1524,9 +1535,7 @@ AC_TRY_LINK(
AC_MSG_RESULT($yap_cv_mpz_xor)
if test "$yap_cv_mpz_xor" = yes
then
AC_DEFINE(HAVE_MPZ_XOR,1)
else
AC_DEFINE(HAVE_MPZ_XOR,0)
AC_DEFINE(HAVE_MPZ_XOR,1,[Older versions of MPZ didn't have XOR])
fi
if test "$use_malloc" = "yes" -a "$maxmemory" = "yes"
@ -1535,8 +1544,9 @@ then
fi
dnl On some systems doing a fflush(NULL) to flush all output streams
dnl has the side-effect of makeing all charactes waiting in input
dnl has the side-effect of making all charactes waiting in input
dnl pipes disapear.
AC_CACHE_CHECK(
[if fflush(NULL) clobbers input pipes],
[yap_cv_broken_fflush_null],
@ -1581,28 +1591,21 @@ EOF
yap_cv_broken_fflush_null=failed
fi
rm -f conftest.$ac_ext conftest.$ac_objext conftest$ac_exeext conftest.out ])
if test "$yap_cv_broken_fflush_null" = no
if test "$yap_cv_broken_fflush_null" = yes
then
AC_DEFINE(BROKEN_FFLUSH_NULL,0)
else
dnl be conservative: if the test failed, assume fflush(NULL) is
dnl not working properly
AC_DEFINE(BROKEN_FFLUSH_NULL,1)
AC_DEFINE([BROKEN_FFLUSH_NULL],[],[if fflush(NULL) clobbers input pipes]1)
fi
dnl disable smart memory management
if test "$use_malloc" = yes
if test "$use_malloc" = yes -o "$maxmemory" = yes
then
AC_DEFINE(USE_SYSTEM_MALLOC,1)
AC_DEFINE(GC_NO_TAGS,1)
AC_DEFINE(USE_SYSTEM_MALLOC,1,[use OS malloc])
AC_DEFINE(GC_NO_TAGS,1,[use Barts idea of allocating extra memory])
fi
dnl large memory configuration, don't trust Yap allocation routines
if test "$maxmemory" = yes
then
AC_DEFINE(GC_NO_TAGS,1)
AC_DEFINE(USE_DL_MALLOC,1)
fi
dnl SWI compatibility support!
PROLOG_SYSTEM=yap
@ -1666,7 +1669,7 @@ AC_MSG_RESULT(no),
AC_MSG_RESULT(assuming no))
AC_CHECK_MEMBER(struct tm.tm_gmtoff,
AC_DEFINE(HAVE_STRUCT_TIME_TM_GMTOFF, [],
AC_DEFINE(HAVE_STRUCT_TIME_TM_GMTOFF, 1,
[Define is struct tm has tm_gmtoff]),
[],
[#include <time.h>])
@ -1708,7 +1711,7 @@ if test "x$PLARCH" = "x"; then
PLARCH=`echo $host | sed 's/\([^-]*\)-[^-]*-\([^-]*\)-gnu/\1-\2/'`
;;
*)
PLARCH=`echo $host | sed 's/\([^-]*\)-[^-]*-\([^-]*\)/\1-\2/'`
PLARCH=`echo $host | sed 's/\([^-]*\)-[^-]*-\([^-]*\)/\1-\2/'` #'
;;
esac
fi
@ -1754,6 +1757,7 @@ fi
m4_include([packages/bdd/configure.in])
dnl zlib
if test "$PKG_ZLIB" != ""
then
@ -1778,9 +1782,12 @@ fi
dnl
dnl java is hard
dnl
if test "$yap_cv_java" = no; then
if test "$yap_cv_java" = no
then
PKG_JPL=""
elif test -e "$srcdir"/packages/jpl/Makefile.in; then
elif test -e "$srcdir"/packages/jpl/Makefile.in
then
PKG_JPL="packages/jpl"
if test "$yap_cv_java" != "yes"; then
JAVA_HOME=$yap_cv_java
@ -1793,7 +1800,8 @@ elif test -e "$srcdir"/packages/jpl/Makefile.in; then
fi
if test -e "$srcdir"/packages/ltx2htm/Makefile.in; then
if test -e "$srcdir"/packages/ltx2htm/Makefile.in
then
PKG_LTX22HTM="packages/ltx2htm"
m4_include([packages/ltx2htm/configure.in])
@ -1801,7 +1809,8 @@ else
PKG_LTX2HTM=""
fi
if test -e "$srcdir"/packages/raptor/Makefile.in; then
if test -e "$srcdir"/packages/raptor/Makefile.in
then
PKG_RAPTOR="packages/raptor"
m4_include([packages/raptor/configure.in])
@ -1825,6 +1834,36 @@ AC_SUBST(PKG_LIBARCHIVE)
AC_SUBST(PKG_ODBC)
dnl parms.h
AX_SPLIT_VERSION
AC_DEFINE_UNQUOTED(YAP_STARTUP, [ "$yap_startup" ], [saved state file])
yap_timestamp=`date`
yap_nversion=`expr $YAP_MAJOR_VERSION \* 10000 + $YAP_MINOR_VERSION \* 100 + $YAP_POINT_VERSION`
yap_startup=startup.yss
AC_DEFINE_UNQUOTED( C_CC, [ "$CC" ], [c-compiler used])
AC_DEFINE_UNQUOTED( C_CFLAGS, ["$CFLAGS $YAP_EXTRAS $DEFS -D_YAP_NOT_INSTALLED_=1 $CPPFLAGS -I. -I$srcdir/H -I$srcdir/include -I$srcdir/os -I$srcdir/OPTYap -I$srcdir/BEAM" ], [compilation flags])
AC_DEFINE_UNQUOTED( C_LDFLAGS, [ "$LDFLAGS" ], [linking flags])
AC_DEFINE_UNQUOTED( C_LIBS, [ "$LIBS" ], [main libs for YAP])
AC_DEFINE_UNQUOTED( C_LIBPLSO, [ "$LIBS $EXTRA_LIBS_FOR_DLLS" ], [libs for linking with DLLs])
AC_DEFINE_UNQUOTED( SO_EXT, [ "$SO" ], [relocable objects])
AC_DEFINE_UNQUOTED( SO_PATH, [ "$YAPLIBDIR" ], [libraries])
AC_DEFINE_UNQUOTED( YAP_ARCH, [ "$ARCH" ], [architecture])
AC_DEFINE_UNQUOTED( YAP_BINDIR, [ "$prefix/bin" ], [where the yap executable lives])
AC_DEFINE_UNQUOTED( YAP_FULL_VERSION, [ "YAP $YAP_VERSION ($ARCH): $yap_timestamp" ], [YAP version string])
AC_DEFINE_UNQUOTED( YAP_LIBDIR, [ "$prefix/lib/Yap" ], [where to look for shared libraries])
AC_DEFINE_UNQUOTED( YAP_NUMERIC_VERSION, [ $yap_nversion ], [numerical version])
AC_DEFINE_UNQUOTED( YAP_PL_SRCDIR, [ "$prefix/share/Yap/pl" ], [where to look for Prolog sources])
AC_DEFINE_UNQUOTED( YAP_ROOTDIR, [ "$prefix" ], [where YAP lives])
AC_DEFINE_UNQUOTED( YAP_SHAREDIR, [ "$prefix/share/Yap" ], [where to look for the Prolog library])
AC_DEFINE_UNQUOTED( YAP_TIMESTAMP, [ "$yap_timestamp" ], [date of compilation])
AC_DEFINE_UNQUOTED( YAP_VERSION, [ "$YAP_VERSION" ], [yap version])
AC_DEFINE_UNQUOTED( YAP_YAPLIB, [ "$YAPLIB" ], [name of YAP library])
mkdir -p library/matrix
mkdir -p library/mpi
mkdir -p library/random

4
library/lammpi/configure.in
View File

@ -53,8 +53,8 @@ if test "$yap_cv_mpi" != "no" -a "$INSTALL_DLLS" != "no"; then
OLD_CC=${CC}
CC=${MPI_CC}
AC_CHECK_LIB(mpe,MPE_Init_log,
[AC_DEFINE(HAVE_LIBMPE, 1)],
[AC_DEFINE(HAVE_LIBMPE, 0)])
[AC_DEFINE(HAVE_LIBMPE, 1, [MPI Debugging on])],
[AC_DEFINE(HAVE_LIBMPE, 0, [MPI Debugging off])])
if test "$ac_cv_lib_mpe_MPE_Init_log" = yes
then
MPI_1LIBS="-lmpe"

10
os/pl-rl.c
View File

@ -521,18 +521,18 @@ Sread_readline(void *handle, char *buf, size_t size)
static int
prolog_complete(int ignore, int key)
{ if ( rl_point > 0 && rl_line_buffer[rl_point-1] != ' ' )
{ rl_begin_undo_group();
{
#if HAVE_RL_CATCH_SIGNAL /* actually version >= 1.2, or true readline */
rl_begin_undo_group();
rl_complete(ignore, key);
if ( rl_point > 0 && rl_line_buffer[rl_point-1] == ' ' )
{
#ifdef HAVE_RL_INSERT_CLOSE /* actually version >= 1.2 */
rl_delete_text(rl_point-1, rl_point);
rl_point -= 1;
#else
rl_delete(-1, key);
#endif
}
rl_end_undo_group();
#endif
} else
rl_complete(ignore, key);
@ -592,7 +592,9 @@ PL_install_readline(void)
#endif
alevel = setAccessLevel(ACCESS_LEVEL_SYSTEM);
#if HAVE_RL_CATCH_SIGNAL
rl_catch_signals = 0;
#endif
rl_readline_name = "Prolog";
rl_attempted_completion_function = prolog_completion;
#ifdef __WINDOWS__

3
packages/myddas/configure.in
View File

@ -1,3 +1,6 @@
MYDDAS_VERSION=0.9.1
AC_DEFINE_UNQUOTED(MYDDAS_VERSION, $MYDDAS_VERSION, [myddas release])
AC_ARG_ENABLE(myddas,
[ --enable-myddas[[=DIR]] enable the MYDDAS library],
if test "$enableval" = yes; then