diff --git a/H/Yap.h b/H/Yap.h index 1c555b85b..76f0252b2 100755 --- a/H/Yap.h +++ b/H/Yap.h @@ -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" diff --git a/H/pl-incl.h b/H/pl-incl.h index fc7df5436..9f770865e 100755 --- a/H/pl-incl.h +++ b/H/pl-incl.h @@ -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 diff --git a/H/pl-shared.h b/H/pl-shared.h index 8cb912aa8..3aef164d5 100755 --- a/H/pl-shared.h +++ b/H/pl-shared.h @@ -56,7 +56,7 @@ #endif #endif - +#include #include #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; } diff --git a/config.h.in b/config.h.in old mode 100755 new mode 100644 index 486f52575..8957c5904 --- a/config.h.in +++ b/config.h.in @@ -1,407 +1,1010 @@ +/* config.h.in. Generated from configure.in by autoheader. */ -#ifndef YAP_CONFIG_H +/* Define if building universal (internal helper macro) */ +#undef AC_APPLE_UNIVERSAL_BUILD -#define YAP_CONFIG_H - -#include "parms.h" - -/* are dynamic arrays supported? */ -#undef HAVE_DYNARRAY - -/* are we using gcc */ -#undef HAVE_GCC - -/* should we use gcc threaded code (i.e. goto *adrs) */ -#undef USE_THREADED_CODE - -/* Should we use lib readline ? */ -#undef HAVE_LIBREADLINE - -/* Should we use lib readline ? */ -#undef HAVE_LIBSOCKET -#undef HAVE_LIBNSL - -/* Should we use gmp ? */ -#undef HAVE_LIBGMP - -#undef HAVE_LIBJUDY - -/* What MPI libraries are there? */ -#define HAVE_LIBMPI 0 -#define HAVE_LIBMPICH - -/* Is there an MPE library? */ -#define HAVE_LIBMPE 0 - -/* does the compiler support inline ? */ -#undef inline - -/* Do we have Ansi headers ? */ -#undef STDC_HEADERS - -/* Host Name ? */ -#undef HOST_ALIAS - -#undef SUPPORT_CONDOR -#undef USE_PTHREAD_LOCKING - -#undef HAVE_SYS_WAIT_H -#undef NO_UNION_WAIT - -#undef HAVE_ALLOCA_H -#undef HAVE_ARPA_INET_H -#undef HAVE_CTYPE_H -#undef HAVE_CRYPT_H -#undef HAVE_CRTDBG_H -#undef HAVE_CUDD_H -#undef HAVE_CUDDINT_H -#undef HAVE_CUDD_CUDD_H -#undef HAVE_CUDD_CUDDINT_H -#undef HAVE_CUDD_UTIL_H -#undef HAVE_DIRECT_H -#undef HAVE_DIRENT_H -#undef HAVE_DLFCN_H -#undef HAVE_ERRNO_H -#undef HAVE_EXECINFO_H -#undef HAVE_FCNTL_H -#undef HAVE_FENV_H -#undef HAVE_FLOAT_H -#undef HAVE_FPU_CONTROL_H -#undef HAVE_GMP_H -#undef HAVE_IEEEFP_H -#undef HAVE_IO_H -#undef HAVE_JUDY_H -#undef HAVE_LIMITS_H -#undef HAVE_LOCALE_H -#undef HAVE_MACH_O_DYLD_H -#undef HAVE_MALLOC_H -#undef HAVE_MATH_H -#undef HAVE_MEMORY_H -#undef HAVE_MPE_H -#undef HAVE_MPI_H -#undef HAVE_NETDB_H -#undef HAVE_NETINET_IN_H -#undef HAVE_NETINET_TCP_H -#undef HAVE_PTHREAD_H -#undef HAVE_PWD_H -#undef HAVE_READLINE_READLINE_H -#undef HAVE_READLINE_HISTORY_H -#undef HAVE_REGEX_H -#undef HAVE_RINTERFACE_H -#undef HAVE_SHLOBJ_H -#undef HAVE_SIGINFO_H -#undef HAVE_SIGNAL_H -#undef HAVE_STDARG_H -#undef HAVE_STDINT_H -#undef HAVE_STRING_H -#undef HAVE_STROPTS_H -#undef HAVE_SYS_CONF_H -#undef HAVE_SYS_DIR_H -#undef HAVE_SYS_FILE_H -#undef HAVE_SYS_MMAN_H -#undef HAVE_SYS_NDIR_H -#undef HAVE_SYS_PARAM_H -#undef HAVE_SYS_RESOURCE_H -#undef HAVE_SYS_SELECT_H -#undef HAVE_SYS_SHM_H -#undef HAVE_SYS_SOCKET_H -#undef HAVE_SYS_STAT_H -#undef HAVE_SYS_TIME_H -#undef HAVE_SYS_TIMES_H -#undef HAVE_SYS_TYPES_H -#undef HAVE_SYS_UCONTEXT_H -#undef HAVE_SYS_UN_H -#undef HAVE_SYS_WAIT_H -#undef HAVE_TIME_H -#undef HAVE_UNISTD_H -#undef HAVE_UTIME_H -#undef HAVE_UTIL_H -#undef HAVE_WCTYPE_H -#undef HAVE_WINSOCK_H -#undef HAVE_WINSOCK2_H -#undef HAVE_WINSOCK2_H -#undef HAVE_LIBLOADERAPI_H - -#undef UUID_H - -#if __MINGW32__ -#define __WINDOWS__ 1 -#endif - -/* Do we have restartable syscalls */ -#undef HAVE_RESTARTABLE_SYSCALLS - -/* is 'tms' defined in ? */ -#undef TM_IN_SYS_TIME - -/* define type of prt returned by malloc: char or void */ -#undef MALLOC_T - -/* Define byte order */ -#undef WORDS_BIGENDIAN - -#include "YapTermConfig.h" - -/* Define representation of floats */ -/* only one of the following shoud be set */ -/* to add a new representation you must edit FloatOfTerm and MkFloatTerm - in adtdefs.c -*/ -#define FFIEEE 1 -/*manual */ -#undef FFVAX - -/* Define the standard type of a float argument to a function */ -/*manual */ -#define FAFloat double - -/* Set the minimum and default heap, trail and stack size */ -#undef MinTrailSpace -#undef MinStackSpace -#undef MinHeapSpace - -#undef DefTrailSpace -#undef DefStackSpace -#undef DefHeapSpace - - -/* Define return type for signal */ -#undef RETSIGTYPE - -#undef HAVE__CHSIZE_S -#undef HAVE__NSGETENVIRON -#undef HAVE_ACCESS -#undef HAVE_ACOSH -#undef HAVE_ALARM -#undef HAVE_ALLOCA -#undef HAVE_ASINH -#undef HAVE_ATANH -#undef HAVE_CHDIR -#undef HAVE_CLOCK -#undef HAVE_CLOCK_GETTIME -#undef HAVE_CTIME -#undef HAVE_DLOPEN -#undef HAVE_DUP2 -#undef HAVE_ERF -#undef HAVE_FECLEAREXCEPT -#undef HAVE_FESETTRAPENABLE -#undef HAVE_FETESTEXCEPT -#undef HAVE_FGETPOS -#undef HAVE_FINITE -#undef HAVE_FPCLASS -#undef HAVE_FTIME -#undef HAVE_FTRUNCATE -#undef HAVE_GETCWD -#undef HAVE_GETENV -#undef HAVE_GETEXECNAME -#undef HAVE_GETHOSTBYNAME -#undef HAVE_GETHOSTENT -#undef HAVE_GETHOSTID -#undef HAVE_GETHOSTNAME -#undef HAVE_GETHRTIME -#undef HAVE_GETPAGESIZE -#undef HAVE_GETPID -#undef HAVE_GETPWNAM -#undef HAVE_GETRUSAGE -#undef HAVE_GETTIMEOFDAY -#undef HAVE_GETWD -#undef HAVE_ISATTY -#undef HAVE_ISFINITE -#undef HAVE_ISINF -#undef HAVE_ISNAN -#undef HAVE_KILL -#undef HAVE_LABS -#undef HAVE_LGAMMA -#undef HAVE_LINK -#undef HAVE_LOCALECONV -#undef HAVE_LOCALTIME -#undef HAVE_LSTAT -#undef HAVE_MALLINFO -#undef HAVE_MBSCASECOLL -#undef HAVE_MBSCOLL -#undef HAVE_MBSNRTOWCS -#undef HAVE_MEMCPY -#undef HAVE_MEMMOVE -#undef HAVE_MKSTEMP -#undef HAVE_MKTEMP -#undef HAVE_MKTIME -#undef HAVE_MMAP -#undef HAVE_NANOSLEEP -#undef HAVE_NSLINKMODULE -#undef HAVE_OPENDIR -#undef HAVE_POPEN -#undef HAVE_PTHREAD_MUTEXATTR_SETKIND_NP -#undef HAVE_PTHREAD_MUTEXATTR_SETTYPE -#undef HAVE_PUTENV -#undef HAVE_RAND -#undef HAVE_RANDOM -#undef HAVE_READLINK -#undef HAVE_REGEXEC -#undef HAVE_RENAME -#undef HAVE_RINT -#undef HAVE_RL_CLEAR_PENDING_INPUT -#undef HAVE_RL_CLEANUP_AFTER_SIGNAL -#undef HAVE_RL_COMPLETION_MATCHES -#undef HAVE_RL_EVENT_HOOK -#undef HAVE_RL_FILENAME_COMPLETION_FUNCTION -#undef HAVE_RL_FREE_LINE_STATE -#undef HAVE_RL_INSERT_CLOSE -#undef HAVE_RL_SET_PROMPT -#undef HAVE_RL_STATE_INITIALIZED -#undef HAVE_SBRK -#undef HAVE_SELECT -#undef HAVE_SETBUF -#undef HAVE_SETITIMER -#undef HAVE_SETLINEBUF -#undef HAVE_SETLOCALE -#undef HAVE_SETSID -#undef HAVE_SHMAT -#undef HAVE_SIGACTION -#undef HAVE_SIGGETMASK -#undef HAVE_SIGINTERRUPT -#undef HAVE_SIGNAL -#undef HAVE_SIGPROCMASK -#undef HAVE_SIGSETJMP -#undef HAVE_SLEEP -#undef HAVE_SNPRINTF -#undef HAVE_SOCKET -#undef HAVE_SRAND -#undef HAVE_SRANDOM -#undef HAVE_STAT -#undef HAVE_STRCHR -#undef HAVE_STRERROR -#undef HAVE_STRICMP -#undef HAVE_STRLWR -#undef HAVE_STRNCAT -#undef HAVE_STRNCPY -#undef HAVE_STRTOD -#undef HAVE_SYSTEM -#undef HAVE_TIME -#undef HAVE_TIMES -#undef HAVE_TMPNAM -#undef HAVE_TTYNAME -#undef HAVE_USLEEP -#undef HAVE_VSNPRINTF -#undef HAVE_WAITPID -#undef HAVE_WCSDUP -#undef HAVE_MPZ_XOR - -#if HAVE_GETHOSTNAME==1 -#define HAS_GETHOSTNAME 1 -#endif - -#undef HAVE_SIGINFO -#undef HAVE_SIGSEGV -#undef HAVE_SIGPROF - -#undef HAVE_ENVIRON - -#undef HAVE_VAR_TIMEZONE - -#undef HAVE_STRUCT_TIME_TM_GMTOFF - -#define SELECT_TYPE_ARG1 -#define SELECT_TYPE_ARG234 -#define SELECT_TYPE_ARG5 - -#define TYPE_SELECT_ -#define MYTYPE(X) MYTYPE1#X - -#undef HAVE_VAR_TIMEZONE -#undef HAVE_STRUCT_TIME_TM_GMTOFF - -/* define how to pass the address of a function */ -#define FunAdr(Fn) Fn - -#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) - -/* for OSes that do not allow user access to the first - quadrant of the memory space */ -#undef FORCE_SECOND_QUADRANT - -#if (HAVE_SOCKET || defined(__MINGW32__)) && !defined(SIMICS) -#define USE_SOCKET 1 -#endif - -#if defined(__hpux) -/* HP-UX requires extra definitions for X/Open networking */ -#undef _XOPEN_SOURCE -#define _XOPEN_SOURCE_EXTENDED 0 -#endif - -#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 - -/* libarchive */ -#undef HAVE_ARCHIVE_READ_SUPPORT_COMPRESSION_BZIP2 -#undef HAVE_ARCHIVE_READ_SUPPORT_COMPRESSION_COMPRESS -#undef HAVE_ARCHIVE_READ_SUPPORT_COMPRESSION_GZIP -#undef HAVE_ARCHIVE_READ_SUPPORT_COMPRESSION_LZMA -#undef HAVE_ARCHIVE_READ_SUPPORT_COMPRESSION_NONE -#undef HAVE_ARCHIVE_READ_SUPPORT_COMPRESSION_XZ -#undef HAVE_ARCHIVE_READ_SUPPORT_FORMAT_AR -#undef HAVE_ARCHIVE_READ_SUPPORT_FORMAT_CPIO -#undef HAVE_ARCHIVE_READ_SUPPORT_FORMAT_EMPTY -#undef HAVE_ARCHIVE_READ_SUPPORT_FORMAT_ISO9660 -#undef HAVE_ARCHIVE_READ_SUPPORT_FORMAT_MTREE -#undef HAVE_ARCHIVE_READ_SUPPORT_FORMAT_RAW -#undef HAVE_ARCHIVE_READ_SUPPORT_FORMAT_TAR -#undef HAVE_ARCHIVE_READ_SUPPORT_FORMAT_ZIP - -/* SQL and ODBC support */ -#undef HAVE_SQL_H -#undef HAVE_GMTIME -#undef HAVE_TIMEGM -#undef HAVE_SQLLEN -#undef HAVE_SQLULEN - -/* should we avoid realloc() in mpi.c? */ -#define MPI_AVOID_REALLOC 0 - -/* Is fflush(NULL) clobbering input streams? */ +/* if fflush(NULL) clobbers input pipes1 */ #undef BROKEN_FFLUSH_NULL -/* sunpro cc */ -#ifdef __SUNPRO_CC -#ifdef HAVE_GCC -#undef HAVE_GCC -#endif -#endif +/* c-compiler used */ +#undef C_CC +/* compilation flags */ +#undef C_CFLAGS + +/* linking flags */ +#undef C_LDFLAGS + +/* libs for linking with DLLs */ +#undef C_LIBPLSO + +/* main libs for YAP */ +#undef C_LIBS + +/* "Define if _XOPEN_SOURCE is needed" */ +#undef DEFINE_XOPEN_SOURCE + +/* Default Heap Space. */ +#undef DefHeapSpace + +/* Default Global+Local Space. */ +#undef DefStackSpace + +/* Default Trail Space. */ +#undef DefTrailSpace + +/* IEEE floating-point, basically everyone except old VAXEN */ +#undef FFIEEE + +/* old HP-UX VM magic, should be irrelevant now */ +#undef FORCE_SECOND_QUADRANT + +/* use Barts idea of allocating extra memory */ #undef GC_NO_TAGS -#undef MAX_WORKERS +/* Define to 1 if you have the `access' function. */ +#undef HAVE_ACCESS +/* Define to 1 if you have the `acosh' function. */ +#undef HAVE_ACOSH + +/* Define to 1 if you have the `alarm' function. */ +#undef HAVE_ALARM + +/* Define to 1 if you have the `alloca' function. */ +#undef HAVE_ALLOCA + +/* Define to 1 if you have the header file. */ +#undef HAVE_ALLOCA_H + +/* Define to 1 if you have . */ +#undef HAVE_ARCHIVE_H + +/* Define to 1 if you have the `archive_read_support_compression_bzip2' + function. */ +#undef HAVE_ARCHIVE_READ_SUPPORT_COMPRESSION_BZIP2 + +/* Define to 1 if you have the `archive_read_support_compression_compress' + function. */ +#undef HAVE_ARCHIVE_READ_SUPPORT_COMPRESSION_COMPRESS + +/* Define to 1 if you have the `archive_read_support_compression_gzip' + function. */ +#undef HAVE_ARCHIVE_READ_SUPPORT_COMPRESSION_GZIP + +/* Define to 1 if you have the `archive_read_support_compression_lzma' + function. */ +#undef HAVE_ARCHIVE_READ_SUPPORT_COMPRESSION_LZMA + +/* Define to 1 if you have the `archive_read_support_compression_none' + function. */ +#undef HAVE_ARCHIVE_READ_SUPPORT_COMPRESSION_NONE + +/* Define to 1 if you have the `archive_read_support_compression_xz' function. + */ +#undef HAVE_ARCHIVE_READ_SUPPORT_COMPRESSION_XZ + +/* Define to 1 if you have the `archive_read_support_format_ar' function. */ +#undef HAVE_ARCHIVE_READ_SUPPORT_FORMAT_AR + +/* Define to 1 if you have the `archive_read_support_format_cpio' function. */ +#undef HAVE_ARCHIVE_READ_SUPPORT_FORMAT_CPIO + +/* Define to 1 if you have the `archive_read_support_format_empty' function. + */ +#undef HAVE_ARCHIVE_READ_SUPPORT_FORMAT_EMPTY + +/* Define to 1 if you have the `archive_read_support_format_iso9660' function. + */ +#undef HAVE_ARCHIVE_READ_SUPPORT_FORMAT_ISO9660 + +/* Define to 1 if you have the `archive_read_support_format_mtree' function. + */ +#undef HAVE_ARCHIVE_READ_SUPPORT_FORMAT_MTREE + +/* Define to 1 if you have the `archive_read_support_format_raw' function. */ +#undef HAVE_ARCHIVE_READ_SUPPORT_FORMAT_RAW + +/* Define to 1 if you have the `archive_read_support_format_tar' function. */ +#undef HAVE_ARCHIVE_READ_SUPPORT_FORMAT_TAR + +/* Define to 1 if you have the `archive_read_support_format_zip' function. */ +#undef HAVE_ARCHIVE_READ_SUPPORT_FORMAT_ZIP + +/* Define to 1 if you have the header file. */ +#undef HAVE_ARPA_INET_H + +/* Define to 1 if you have the `asinh' function. */ +#undef HAVE_ASINH + +/* Define to 1 if you have the `atanh' function. */ +#undef HAVE_ATANH + +/* Define to 1 if you have the `chdir' function. */ +#undef HAVE_CHDIR + +/* Define to 1 if you have the `clock' function. */ +#undef HAVE_CLOCK + +/* Define to 1 if you have the `clock_gettime' function. */ +#undef HAVE_CLOCK_GETTIME + +/* Define to 1 if you have the header file. */ +#undef HAVE_CRTDBG_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_CRT_EXTERNS_H + +/* "Define if you have the crypt function." */ +#undef HAVE_CRYPT + +/* Define to 1 if you have the header file. */ +#undef HAVE_CRYPT_H + +/* Define to 1 if you have the `ctime' function. */ +#undef HAVE_CTIME + +/* Define to 1 if you have the header file. */ +#undef HAVE_CTYPE_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_CUDDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_CUDD_CUDDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_CUDD_CUDD_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_CUDD_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_CUDD_UTIL_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_DIRECT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_DIRENT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_DLFCN_H + +/* Define to 1 if you have the `dlopen' function. */ +#undef HAVE_DLOPEN + +/* Define to 1 if you have the `dup2' function. */ +#undef HAVE_DUP2 + +/* Define if dynamic arrays are supported */ +#undef HAVE_DYNARRAY + +/* environment access */ +#undef HAVE_ENVIRON + +/* Define to 1 if you have the `erf' function. */ +#undef HAVE_ERF + +/* Define to 1 if you have the header file. */ +#undef HAVE_ERRNO_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_EXECINFO_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_FCNTL_H + +/* Define to 1 if you have the `feclearexcept' function. */ +#undef HAVE_FECLEAREXCEPT + +/* Define to 1 if you have the header file. */ +#undef HAVE_FENV_H + +/* Define to 1 if you have the `fesettrapenable' function. */ +#undef HAVE_FESETTRAPENABLE + +/* Define to 1 if you have the `fetestexcept' function. */ +#undef HAVE_FETESTEXCEPT + +/* Define to 1 if you have the `fgetpos' function. */ +#undef HAVE_FGETPOS + +/* Define to 1 if you have the `finite' function. */ +#undef HAVE_FINITE + +/* Define to 1 if you have the header file. */ +#undef HAVE_FLOAT_H + +/* Define to 1 if you have the `fpclass' function. */ +#undef HAVE_FPCLASS + +/* Define to 1 if you have the header file. */ +#undef HAVE_FPU_CONTROL_H + +/* Define to 1 if you have the `ftime' function. */ +#undef HAVE_FTIME + +/* Define to 1 if you have the `ftruncate' function. */ +#undef HAVE_FTRUNCATE + +/* Old m4 auto-heder generation, not really useful now */ +#undef HAVE_GCC + +/* Define to 1 if you have the `getcwd' function. */ +#undef HAVE_GETCWD + +/* Define to 1 if you have the `getenv' function. */ +#undef HAVE_GETENV + +/* Define to 1 if you have the `getexecname' function. */ +#undef HAVE_GETEXECNAME + +/* Define to 1 if you have the `gethostbyname' function. */ +#undef HAVE_GETHOSTBYNAME + +/* Define to 1 if you have the `gethostent' function. */ +#undef HAVE_GETHOSTENT + +/* Define to 1 if you have the `gethostid' function. */ +#undef HAVE_GETHOSTID + +/* Define to 1 if you have the `gethostname' function. */ +#undef HAVE_GETHOSTNAME + +/* Define to 1 if you have the `gethrtime' function. */ +#undef HAVE_GETHRTIME + +/* Define to 1 if you have the `getpagesize' function. */ +#undef HAVE_GETPAGESIZE + +/* Define to 1 if you have the `getpid' function. */ +#undef HAVE_GETPID + +/* Define to 1 if you have the `getpwnam' function. */ +#undef HAVE_GETPWNAM + +/* Define to 1 if you have the `getrlimit' function. */ +#undef HAVE_GETRLIMIT + +/* Define to 1 if you have the `getrusage' function. */ +#undef HAVE_GETRUSAGE + +/* Define to 1 if you have the `gettimeofday' function. */ +#undef HAVE_GETTIMEOFDAY + +/* Define to 1 if you have the `getwd' function. */ +#undef HAVE_GETWD + +/* Define to 1 if you have the header file. */ +#undef HAVE_GMP_H + +/* Define to 1 if you have the `gmtime' function. */ +#undef HAVE_GMTIME + +/* Define of h_errno is provided */ +#undef HAVE_H_ERRNO + +/* Define to 1 if you have the header file. */ +#undef HAVE_IEEEFP_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_IO_H + +/* Define to 1 if you have the `isatty' function. */ +#undef HAVE_ISATTY + +/* Define to 1 if you have the `isfinite' function. */ +#undef HAVE_ISFINITE + +/* Define to 1 if you have the `isinf' function. */ +#undef HAVE_ISINF + +/* Define to 1 if you have the `isnan' function. */ +#undef HAVE_ISNAN + +/* Define to 1 if you have the header file. */ +#undef HAVE_JUDY_H + +/* Define to 1 if you have the `kill' function. */ +#undef HAVE_KILL + +/* Define to 1 if you have the `labs' function. */ +#undef HAVE_LABS + +/* Define to 1 if you have the `lgamma' function. */ +#undef HAVE_LGAMMA + +/* Define to 1 if you have the `comdlg32' library (-lcomdlg32). */ +#undef HAVE_LIBCOMDLG32 + +/* Define to 1 if you have the `crypt' library (-lcrypt). */ +#undef HAVE_LIBCRYPT + +/* Define to 1 if you have the `gmp' library (-lgmp). */ +#undef HAVE_LIBGMP + +/* Define to 1 if you have the `Judy' library (-lJudy). */ +#undef HAVE_LIBJUDY + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIBLOADERAPI_H + +/* Define to 1 if you have the `m' library (-lm). */ +#undef HAVE_LIBM + +/* MPI Debugging off */ +#undef HAVE_LIBMPE + +/* "Define if you have the nsl library (-lnsl)." */ +#undef HAVE_LIBNSL + +/* Define to 1 if you have the `nss_dns' library (-lnss_dns). */ +#undef HAVE_LIBNSS_DNS + +/* Define to 1 if you have the `nss_files' library (-lnss_files). */ +#undef HAVE_LIBNSS_FILES + +/* Define to 1 if you have the `psapi' library (-lpsapi). */ +#undef HAVE_LIBPSAPI + +/* Define to 1 if you have the `pthread' library (-lpthread). */ +#undef HAVE_LIBPTHREAD + +/* Define to 1 if you have the `raptor' library (-lraptor). */ +#undef HAVE_LIBRAPTOR + +/* Define if you have libreadline */ +#undef HAVE_LIBREADLINE + +/* Define to 1 if you have the `resolv' library (-lresolv). */ +#undef HAVE_LIBRESOLV + +/* Define to 1 if you have the `shell32' library (-lshell32). */ +#undef HAVE_LIBSHELL32 + +/* "Define if you have the socket library (-lsocket)." */ +#undef HAVE_LIBSOCKET + +/* Define to 1 if you have the `stdc++' library (-lstdc++). */ +#undef HAVE_LIBSTDC__ + +/* Define to 1 if you have the `ws2_32' library (-lws2_32). */ +#undef HAVE_LIBWS2_32 + +/* Define to 1 if you have the `wsock32' library (-lwsock32). */ +#undef HAVE_LIBWSOCK32 + +/* Define to 1 if you have the `xnet' library (-lxnet). */ +#undef HAVE_LIBXNET + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIMITS_H + +/* Define to 1 if you have the `link' function. */ +#undef HAVE_LINK + +/* Define to 1 if you have the `localeconv' function. */ +#undef HAVE_LOCALECONV + +/* Define to 1 if you have the header file. */ +#undef HAVE_LOCALE_H + +/* Define to 1 if you have the `localtime' function. */ +#undef HAVE_LOCALTIME + +/* Define to 1 if the system has the type `long long'. */ +#undef HAVE_LONG_LONG + +/* Define to 1 if you have the `lstat' function. */ +#undef HAVE_LSTAT + +/* Define to 1 if you have the header file. */ +#undef HAVE_MACH_O_DYLD_H + +/* Define to 1 if you have the `mallinfo' function. */ +#undef HAVE_MALLINFO + +/* Define to 1 if you have the header file. */ +#undef HAVE_MALLOC_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_MATH_H + +/* Define to 1 if you have the `mbscasecoll' function. */ +#undef HAVE_MBSCASECOLL + +/* Define to 1 if you have the `mbscoll' function. */ +#undef HAVE_MBSCOLL + +/* Define to 1 if you have the `mbsnrtowcs' function. */ +#undef HAVE_MBSNRTOWCS + +/* Define to 1 if you have the `memcpy' function. */ +#undef HAVE_MEMCPY + +/* Define to 1 if you have the `memmove' function. */ +#undef HAVE_MEMMOVE + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the `mkstemp' function. */ +#undef HAVE_MKSTEMP + +/* Define to 1 if you have the `mktemp' function. */ +#undef HAVE_MKTEMP + +/* Define to 1 if you have the `mktime' function. */ +#undef HAVE_MKTIME + +/* Define to 1 if you have the `mmap' function. */ +#undef HAVE_MMAP + +/* Define to 1 if you have the header file. */ +#undef HAVE_MPE_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_MPI_H + +/* Older versions of MPZ didn't have XOR */ +#undef HAVE_MPZ_XOR + +/* Define to 1 if you have the header file. */ +#undef HAVE_MYSQL_MYSQL_H + +/* Define to 1 if you have the `nanosleep' function. */ +#undef HAVE_NANOSLEEP + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETDB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETINET_IN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETINET_TCP_H + +/* Define to 1 if you have the `NSLinkModule' function. */ +#undef HAVE_NSLINKMODULE + +/* Define to 1 if you have the `opendir' function. */ +#undef HAVE_OPENDIR + +/* Define to 1 if you have the `pipe2' function. */ +#undef HAVE_PIPE2 + +/* Define to 1 if you have the `popen' function. */ +#undef HAVE_POPEN + +/* Define to 1 if you have the header file. */ +#undef HAVE_PTHREAD_H + +/* Define to 1 if you have the `pthread_mutexattr_setkind_np' function. */ +#undef HAVE_PTHREAD_MUTEXATTR_SETKIND_NP + +/* Define to 1 if you have the `pthread_mutexattr_settype' function. */ +#undef HAVE_PTHREAD_MUTEXATTR_SETTYPE + +/* Define to 1 if you have the `putenv' function. */ +#undef HAVE_PUTENV + +/* Define to 1 if you have the header file. */ +#undef HAVE_PWD_H + +/* Define to 1 if you have the `rand' function. */ +#undef HAVE_RAND + +/* Define to 1 if you have the `random' function. */ +#undef HAVE_RANDOM + +/* Define to 1 if you have the header file. */ +#undef HAVE_RAPTOR2_RAPTOR2_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_RAPTOR_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_READLINE_HISTORY_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_READLINE_READLINE_H + +/* Define to 1 if you have the `readlink' function. */ +#undef HAVE_READLINK + +/* Define to 1 if you have the `regexec' function. */ +#undef HAVE_REGEXEC + +/* Define to 1 if you have the header file. */ +#undef HAVE_REGEX_H + +/* Define to 1 if you have the `rename' function. */ +#undef HAVE_RENAME + +/* Define to 1 if system calls automatically restart after interruption by a + signal. */ +#undef HAVE_RESTARTABLE_SYSCALLS + +/* Define to 1 if you have the `rint' function. */ +#undef HAVE_RINT + +/* Define to 1 if you have the header file. */ +#undef HAVE_RINTERFACE_H + +/* Defined if you can turn off readline's signal handling. */ +#undef HAVE_RL_CATCH_SIGNAL + +/* Define to 1 if you have the `rl_cleanup_after_signal' function. */ +#undef HAVE_RL_CLEANUP_AFTER_SIGNAL + +/* Define to 1 if you have the `rl_clear_pending_input' function. */ +#undef HAVE_RL_CLEAR_PENDING_INPUT + +/* Define to 1 if you have the `rl_completion_matches' function. */ +#undef HAVE_RL_COMPLETION_MATCHES + +/* Define to 1 if you have the `rl_event_hook' function. */ +#undef HAVE_RL_EVENT_HOOK + +/* Define to 1 if you have the `rl_filename_completion_function' function. */ +#undef HAVE_RL_FILENAME_COMPLETION_FUNCTION + +/* Define to 1 if you have the `rl_free_line_state' function. */ +#undef HAVE_RL_FREE_LINE_STATE + +/* Define to 1 if you have the `rl_insert_close' function. */ +#undef HAVE_RL_INSERT_CLOSE + +/* Define to 1 if you have the `rl_set_prompt' function. */ +#undef HAVE_RL_SET_PROMPT + +/* Define to 1 if you have the `rl_state_initialized' function. */ +#undef HAVE_RL_STATE_INITIALIZED + +/* Define to 1 if you have the `sbrk' function. */ +#undef HAVE_SBRK + +/* Define to 1 if you have the `select' function. */ +#undef HAVE_SELECT + +/* Define to 1 if you have the `setbuf' function. */ +#undef HAVE_SETBUF + +/* Define to 1 if you have the `setitimer' function. */ +#undef HAVE_SETITIMER + +/* Define to 1 if you have the `setlinebuf' function. */ +#undef HAVE_SETLINEBUF + +/* Define to 1 if you have the `setlocale' function. */ +#undef HAVE_SETLOCALE + +/* Define to 1 if you have the `setsid' function. */ +#undef HAVE_SETSID + +/* Define to 1 if you have the header file. */ +#undef HAVE_SHLOBJ_H + +/* Define to 1 if you have the `shmat' function. */ +#undef HAVE_SHMAT + +/* Define to 1 if you have the `sigaction' function. */ +#undef HAVE_SIGACTION + +/* Define to 1 if you have the `siggetmask' function. */ +#undef HAVE_SIGGETMASK + +/* Unix SIGINFO */ +#undef HAVE_SIGINFO + +/* Define to 1 if you have the header file. */ +#undef HAVE_SIGINFO_H + +/* Define to 1 if you have the `siginterrupt' function. */ +#undef HAVE_SIGINTERRUPT + +/* Define to 1 if you have the `signal' function. */ +#undef HAVE_SIGNAL + +/* Define to 1 if you have the header file. */ +#undef HAVE_SIGNAL_H + +/* Define to 1 if you have the `sigprocmask' function. */ +#undef HAVE_SIGPROCMASK + +/* UNIX Signal SIGPROF */ +#undef HAVE_SIGPROF + +/* UNIX signal SEGV */ +#undef HAVE_SIGSEGV + +/* support for sigsetjmp */ +#undef HAVE_SIGSETJMP + +/* Define to 1 if you have the `sleep' function. */ +#undef HAVE_SLEEP + +/* Define to 1 if you have the `snprintf' function. */ +#undef HAVE_SNPRINTF + +/* Define to 1 if you have the `socket' function. */ +#undef HAVE_SOCKET + +/* Define to 1 if the system has the type `socklen_t'. */ +#undef HAVE_SOCKLEN_T + +/* Define to 1 if the system has the type `SQLLEN'. */ +#undef HAVE_SQLLEN + +/* Define to 1 if the system has the type `SQLULEN'. */ +#undef HAVE_SQLULEN + +/* Define to 1 if you have the header file. */ +#undef HAVE_SQL_H + +/* Define to 1 if you have the `srand' function. */ +#undef HAVE_SRAND + +/* Define to 1 if you have the `srandom' function. */ +#undef HAVE_SRANDOM + +/* Define to 1 if the system has the type `ssize_t'. */ +#undef HAVE_SSIZE_T + +/* Define to 1 if you have the `stat' function. */ +#undef HAVE_STAT + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDARG_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the `strcasestr' function. */ +#undef HAVE_STRCASESTR + +/* Define to 1 if you have the `strchr' function. */ +#undef HAVE_STRCHR + +/* Define to 1 if you have the `strerror' function. */ +#undef HAVE_STRERROR + +/* Define to 1 if you have the `stricmp' function. */ +#undef HAVE_STRICMP + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the `strlwr' function. */ +#undef HAVE_STRLWR + +/* Define to 1 if you have the `strncat' function. */ +#undef HAVE_STRNCAT + +/* Define to 1 if you have the `strncpy' function. */ +#undef HAVE_STRNCPY + +/* Define to 1 if you have the header file. */ +#undef HAVE_STROPTS_H + +/* Define to 1 if you have the `strtod' function. */ +#undef HAVE_STRTOD + +/* Define is struct tm has tm_gmtoff */ +#undef HAVE_STRUCT_TIME_TM_GMTOFF + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYSLOG_H + +/* Define to 1 if you have the `system' function. */ +#undef HAVE_SYSTEM + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_CONF_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_DIR_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_FILE_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_MMAN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_NDIR_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_PARAM_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_RESOURCE_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SELECT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SHM_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SOCKET_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TIMES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TIME_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_UCONTEXT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_UN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_WAIT_H + +/* Define to 1 if you have the `time' function. */ +#undef HAVE_TIME + +/* Define to 1 if you have the `timegm' function. */ +#undef HAVE_TIMEGM + +/* Define to 1 if you have the `times' function. */ +#undef HAVE_TIMES + +/* Define to 1 if you have the header file. */ +#undef HAVE_TIME_H + +/* Define to 1 if you have the `tmpnam' function. */ +#undef HAVE_TMPNAM + +/* Define to 1 if you have the `ttyname' function. */ +#undef HAVE_TTYNAME + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* Define to 1 if you have the `usleep' function. */ +#undef HAVE_USLEEP + +/* Define to 1 if you have the header file. */ +#undef HAVE_UTIL_H + +/* Define to 1 if you have the `utime' function. */ +#undef HAVE_UTIME + +/* Define to 1 if you have the header file. */ +#undef HAVE_UTIME_H + +/* Define if tzset sets timezone variable */ +#undef HAVE_VAR_TIMEZONE + +/* Define to 1 if you have the `vfork' function. */ +#undef HAVE_VFORK + +/* Define to 1 if you have the `vsnprintf' function. */ +#undef HAVE_VSNPRINTF + +/* Define to 1 if you have the `waitpid' function. */ +#undef HAVE_WAITPID + +/* Define to 1 if you have the header file. */ +#undef HAVE_WCHAR_H + +/* Define to 1 if you have the `wcsdup' function. */ +#undef HAVE_WCSDUP + +/* Define to 1 if you have the header file. */ +#undef HAVE_WCTYPE_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_WINSOCK2_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_WINSOCK_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_ZLIB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_ZUTIL_H + +/* Define to 1 if you have the `_chsize_s' function. */ +#undef HAVE__CHSIZE_S + +/* Define to 1 if you have the `_NSGetEnviron' function. */ +#undef HAVE__NSGETENVIRON + +/* what is the configure host name */ +#undef HOST_ALIAS + +/* malloc_t */ +#undef MALLOC_T + +/* max number of threads, default 1 or 1024 */ #undef MAX_THREADS -#endif /* YAP_CONFIG_H */ +/* maximum amount of or-parallelism */ +#undef MAX_WORKERS +/* o not use realloc() from HP-UX 10.20 together with MPI */ +#undef MPI_AVOID_REALLOC + +/* myddas release */ +#undef MYDDAS_VERSION + +/* at least 2M Cells for Heap */ +#undef MinHeapSpace + +/* at least 1M Cells for Stack */ +#undef MinStackSpace + +/* at least 1/2M Cells for Trail */ +#undef MinTrailSpace + +/* compile wait in UNIX */ +#undef NO_UNION_WAIT + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the home page for this package. */ +#undef PACKAGE_URL + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define as the return type of signal handlers (`int' or `void'). */ +#undef RETSIGTYPE + +/* The size of `double', as computed by sizeof. */ +#undef SIZEOF_DOUBLE + +/* The size of `float', as computed by sizeof. */ +#undef SIZEOF_FLOAT + +/* The size of `int', as computed by sizeof. */ +#undef SIZEOF_INT + +/* The size of `int *', as computed by sizeof. */ +#undef SIZEOF_INT_P + +/* The size of `long', as computed by sizeof. */ +#undef SIZEOF_LONG + +/* The size of `long int', as computed by sizeof. */ +#undef SIZEOF_LONG_INT + +/* The size of `long long', as computed by sizeof. */ +#undef SIZEOF_LONG_LONG + +/* The size of `long long int', as computed by sizeof. */ +#undef SIZEOF_LONG_LONG_INT + +/* The size of `short int', as computed by sizeof. */ +#undef SIZEOF_SHORT_INT + +/* The size of `SQLWCHAR', as computed by sizeof. */ +#undef SIZEOF_SQLWCHAR + +/* The size of `void*', as computed by sizeof. */ +#undef SIZEOF_VOIDP + +/* The size of `void *', as computed by sizeof. */ +#undef SIZEOF_VOID_P + +/* The size of `wchar_t', as computed by sizeof. */ +#undef SIZEOF_WCHAR_T + +/* relocable objects */ +#undef SO_EXT + +/* libraries */ +#undef SO_PATH + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* enable condor distributed execution, static compilation */ +#undef SUPPORT_CONDOR + +/* Define to 1 if your declares `struct tm'. */ +#undef TM_IN_SYS_TIME + +/* do not use our own locking routines */ +#undef USE_PTHREAD_LOCKING + +/* use OS malloc */ +#undef USE_SYSTEM_MALLOC + +/* threaded emulator */ +#undef USE_THREADED_CODE + +/* Define to name of the UUID header file. */ +#undef UUID_H + +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else +# ifndef WORDS_BIGENDIAN +# undef WORDS_BIGENDIAN +# endif +#endif + +/* architecture */ +#undef YAP_ARCH + +/* where the yap executable lives */ +#undef YAP_BINDIR + +/* YAP version string */ +#undef YAP_FULL_VERSION + +/* where to look for shared libraries */ +#undef YAP_LIBDIR + +/* numerical version */ +#undef YAP_NUMERIC_VERSION + +/* where to look for Prolog sources */ +#undef YAP_PL_SRCDIR + +/* where YAP lives */ +#undef YAP_ROOTDIR + +/* where to look for the Prolog library */ +#undef YAP_SHAREDIR + +/* saved state file */ +#undef YAP_STARTUP + +/* date of compilation */ +#undef YAP_TIMESTAMP + +/* yap version */ +#undef YAP_VERSION + +/* name of YAP library */ +#undef YAP_YAPLIB + +/* HP-UX old socket stuff */ +#undef _XOPEN_SOURCE + +/* HP-UX old socket stuff */ +#undef _XOPEN_SOURCE_EXTENDED + +/* 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 diff --git a/configure b/configure index 1307b927f..7e06284ad 100755 --- a/configure +++ b/configure @@ -621,7 +621,8 @@ ac_includes_default="\ # include #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 @@ -4267,13 +4272,14 @@ if test "${with_gmp+set}" = set; then : LDFLAGS="$LDFLAGS -L${yap_cv_gmp}/lib" LIBS="$LIBS -L${yap_cv_gmp}/lib" CPPFLAGS="$CPPFLAGS -I${yap_cv_gmp}/include" - CFLAGS="$CFLAGS -I${yap_cv_gmp}/include" + CFLAGS="$CFLAGS -I${yap_cv_gmp}/include" fi else yap_cv_gmp=yes fi + # Check whether --with-R was given. if test "${with_R+set}" = set; then : withval=$with_R; if test "$withval" = yes; then @@ -4433,24 +4439,21 @@ 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 +if test "$orparallelism" = no +then - $as_echo "#define MinStackSpace (600*SIZEOF_INT_P)" >>confdefs.h - - $as_echo "#define MinTrailSpace (100*SIZEOF_INT_P)" >>confdefs.h - - cat >>confdefs.h <<_ACEOF +cat >>confdefs.h <<_ACEOF #define MAX_WORKERS $yap_cv_max_workers _ACEOF @@ -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 +cat >>confdefs.h <<_ACEOF #define MAX_THREADS $yap_cv_max_threads _ACEOF -fi if test "$yap_cv_prism" = no @@ -4559,7 +4559,8 @@ then CC="condor_compile $CC" CXX="condor_compile $CXX" yap_cv_readline="no" - $as_echo "#define SUPPORT_CONDOR 1" >>confdefs.h + +$as_echo "#define SUPPORT_CONDOR 1" >>confdefs.h yap_cv_minisat=no STATIC_MODE="" @@ -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,7 +6475,8 @@ done if test "$pthreadlocking" = yes then - $as_echo "#define USE_PTHREAD_LOCKING 1" >>confdefs.h + +$as_echo "#define USE_PTHREAD_LOCKING 1" >>confdefs.h fi use_malloc=yes @@ -6487,6 +6492,7 @@ fi CMFLAGS=-fpic CIFLAGS=-I. + if test "$use_prism" = no; then PKG_PRISM="" else @@ -6588,11 +6594,11 @@ else PKG_ZLIB="" fi -if test "$cross_compiling" = "yes" -then - YAP_EXTRAS= -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5 + if test "$cross_compiling" = "yes" + then + 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; } if ${ac_cv_header_sys_wait_h+:} false; then : $as_echo_n "(cached) " >&6 @@ -6704,24 +6710,24 @@ $as_echo "#define HAVE_RESTARTABLE_SYSCALLS 1" >>confdefs.h fi -fi + fi -INSTALL_DLLS="no" -EXTRA_OBJS="" -SHLIB_LD="#" -SHLIB_CXX_LD="#" -DO_SECOND_LD="#" -M4="m4" -MERGE_DLL_OBJS="#" -IN_UNIX="" + INSTALL_DLLS="no" + EXTRA_OBJS="" + SHLIB_LD="#" + SHLIB_CXX_LD="#" + DO_SECOND_LD="#" + M4="m4" + MERGE_DLL_OBJS="#" + IN_UNIX="" -YAPLIB="libYap.a" + YAPLIB="libYap.a" -case "$target_os" in - *linux*) - if test "$static_compilation" = "no" - then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 + case "$target_os" in + *linux*) + if test "$static_compilation" = "no" + then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } if ${ac_cv_lib_dl_dlopen+:} false; then : $as_echo_n "(cached) " >&6 @@ -6764,102 +6770,105 @@ else have_dl=no fi - if test "$have_dl" = "yes" - then - SO="so" - SHLIB_LD="$CC -shared -export-dynamic" - SHLIB_CXX_LD="$CXX -shared -export-dynamic" - DO_SECOND_LD="" - LIBS="$LIBS -ldl" - case "$target_cpu" in - alpha*) - LDFLAGS="-dynamic $LDFLAGS" - ;; - *) - if test "$CC" != "lcc" - then - LDFLAGS="-rdynamic $LDFLAGS" - fi - ;; - esac - fi - if test "$ac_cv_c_compiler_gnu" = "yes" - then - SHLIB_CFLAGS="-shared -fPIC $CFLAGS" - SHLIB_CXXFLAGS="-shared -fPIC $CXXFLAGS" - INSTALL_DLLS="yes" - fi - LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" - DYNYAPLIB=libYap."$SO" - SONAMEFLAG="-Wl,-soname=$DYNYAPLIB" - fi - if test "$have_nsl" = yes - then - LIBS="$LIBS -lnsl" - fi - if test "$dynamic_loading" = "yes" - then - YAPLIB_LD="\$(CC) -shared" - EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)" - INSTALL_ENV="LD_LIBRARY_PATH=:\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" - else - YAPLIB_LD="\$(CC)" - 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" - ;; - *sunos4*) - M4="/usr/5bin/m4" - LDFLAGS="$LDFLAGS -N" - if test "$have_nsl" = yes - then - LIBS="$LIBS -lnsl" - fi - SO="o" - INSTALL_DLLS="yes" - LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" - 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" - INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" - ;; - *hpux*) - #do not use the first memory quadrant - $as_echo "#define FORCE_SECOND_QUADRANT 1" >>confdefs.h + if test "$have_dl" = "yes" + then + SO="so" + SHLIB_LD="$CC -shared -export-dynamic" + SHLIB_CXX_LD="$CXX -shared -export-dynamic" + DO_SECOND_LD="" + LIBS="$LIBS -ldl" + case "$target_cpu" in + alpha*) + LDFLAGS="-dynamic $LDFLAGS" + ;; + *) + if test "$CC" != "lcc" + then + LDFLAGS="-rdynamic $LDFLAGS" + fi + ;; + esac + fi + if test "$ac_cv_c_compiler_gnu" = "yes" + then + SHLIB_CFLAGS="-shared -fPIC $CFLAGS" + SHLIB_CXXFLAGS="-shared -fPIC $CXXFLAGS" + INSTALL_DLLS="yes" + fi + LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" + DYNYAPLIB=libYap."$SO" + SONAMEFLAG="-Wl,-soname=$DYNYAPLIB" + fi + if test "$have_nsl" = yes + then + LIBS="$LIBS -lnsl" + fi + if test "$dynamic_loading" = "yes" + then + YAPLIB_LD="\$(CC) -shared" + EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)" + INSTALL_ENV="LD_LIBRARY_PATH=:\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" + else + YAPLIB_LD="\$(CC)" + 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" + ;; + *sunos4*) + M4="/usr/5bin/m4" + LDFLAGS="$LDFLAGS -N" + if test "$have_nsl" = yes + then + LIBS="$LIBS -lnsl" + fi + SO="o" + INSTALL_DLLS="yes" + LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" + 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" + INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" + ;; + *hpux*) + #do not use the first memory quadrant - M4="/usr/bin/m4" - if test ${use_condor} = no - then - SHLIB_INTERFACE="load_shl.o" - if test "$CC" = cc -o "$CC" = c89 - then - #this tells ld to export all non-static symbols, - #otherwise no external predicates. - SHLIB_LD="$CC -shared -export-dynamic" - SHLIB_CXX_LD="$CXX -shared -export-dynamic" - DO_SECOND_LD="" - SO="sl" +$as_echo "#define FORCE_SECOND_QUADRANT 1" >>confdefs.h + + M4="/usr/bin/m4" + if test ${use_condor} = no + then + SHLIB_INTERFACE="load_shl.o" + if test "$CC" = cc -o "$CC" = c89 + then + #this tells ld to export all non-static symbols, + #otherwise no external predicates. + SHLIB_LD="$CC -shared -export-dynamic" + SHLIB_CXX_LD="$CXX -shared -export-dynamic" + DO_SECOND_LD="" + SO="sl" SHLIB_CFLAGS="+z $CFLAGS" SHLIB_CXXFLAGS="+z $CXXFLAGS" INSTALL_DLLS="yes" # 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 +$as_echo "#define _XOPEN_SOURCE 1" >>confdefs.h + + +$as_echo "#define _XOPEN_SOURCE_EXTENDED 1" >>confdefs.h 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 - $as_echo "#define MPI_AVOID_REALLOC 1" >>confdefs.h + +$as_echo "#define MPI_AVOID_REALLOC 1" >>confdefs.h fi LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" @@ -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 + +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 + +$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,7 +8540,8 @@ 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 + +$as_echo "#define NO_UNION_WAIT 1" >>confdefs.h fi @@ -8503,7 +8570,8 @@ 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 + +$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,10 +14561,12 @@ 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 + +$as_echo "#define HAVE_LIBMPE 1" >>confdefs.h else - $as_echo "#define HAVE_LIBMPE 0" >>confdefs.h + +$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 diff --git a/configure.in b/configure.in index b794e80c3..9b391de92 100755 --- a/configure.in +++ b/configure.in @@ -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], @@ -155,9 +173,10 @@ AC_ARG_WITH(gmp, LDFLAGS="$LDFLAGS -L${yap_cv_gmp}/lib" LIBS="$LIBS -L${yap_cv_gmp}/lib" CPPFLAGS="$CPPFLAGS -I${yap_cv_gmp}/include" - CFLAGS="$CFLAGS -I${yap_cv_gmp}/include" + 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" @@ -579,7 +591,7 @@ then LIBS="-lncurses $LIBS" ]) AC_CHECK_LIB([readline], [main],[ - AC_DEFINE([HAVE_LIBREADLINE], [1],[Define if you have libreadline]) + AC_DEFINE([HAVE_LIBREADLINE], [1], [Define if you have libreadline]) LIBS="-lreadline $LIBS" ], [if test "x$with_readline" != xcheck; then @@ -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 @@ -721,129 +735,128 @@ else PKG_ZLIB="" fi -if test "$cross_compiling" = "yes" -then - YAP_EXTRAS= -else - AC_SYS_RESTARTABLE_SYSCALLS -fi - -dnl defaults -INSTALL_DLLS="no" -EXTRA_OBJS="" -SHLIB_LD="#" -SHLIB_CXX_LD="#" -DO_SECOND_LD="#" -M4="m4" -MERGE_DLL_OBJS="#" -IN_UNIX="" - -dnl This has to be before $target_os -YAPLIB="libYap.a" - -dnl now this is where things get nasty. -dnl trying to get the libraries -case "$target_os" in - *linux*) - if test "$static_compilation" = "no" - then - AC_CHECK_LIB(dl,dlopen, - have_dl=yes - , - have_dl=no) - if test "$have_dl" = "yes" - then - SO="so" - SHLIB_LD="$CC -shared -export-dynamic" - SHLIB_CXX_LD="$CXX -shared -export-dynamic" - DO_SECOND_LD="" - LIBS="$LIBS -ldl" - case "$target_cpu" in - alpha*) - LDFLAGS="-dynamic $LDFLAGS" - ;; - *) - if test "$CC" != "lcc" - then - LDFLAGS="-rdynamic $LDFLAGS" - fi - ;; - esac - fi - if test "$ac_cv_prog_gcc" = "yes" - then - SHLIB_CFLAGS="-shared -fPIC $CFLAGS" - SHLIB_CXXFLAGS="-shared -fPIC $CXXFLAGS" - INSTALL_DLLS="yes" - fi - LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" - DYNYAPLIB=libYap."$SO" - SONAMEFLAG="-Wl,-soname=$DYNYAPLIB" - fi - if test "$have_nsl" = yes - then - LIBS="$LIBS -lnsl" - fi - if test "$dynamic_loading" = "yes" - then - YAPLIB_LD="\$(CC) -shared" - EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)" - INSTALL_ENV="LD_LIBRARY_PATH=:\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" - else - YAPLIB_LD="\$(CC)" - 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" - ;; - *sunos4*) - M4="/usr/5bin/m4" - LDFLAGS="$LDFLAGS -N" - if test "$have_nsl" = yes - then - LIBS="$LIBS -lnsl" - fi - SO="o" - INSTALL_DLLS="yes" - LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" - 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" - INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" - ;; - *hpux*) - #do not use the first memory quadrant - AC_DEFINE(FORCE_SECOND_QUADRANT) - M4="/usr/bin/m4" - if test ${use_condor} = no - then - SHLIB_INTERFACE="load_shl.o" - if test "$CC" = cc -o "$CC" = c89 - then - #this tells ld to export all non-static symbols, - #otherwise no external predicates. - SHLIB_LD="$CC -shared -export-dynamic" - SHLIB_CXX_LD="$CXX -shared -export-dynamic" - DO_SECOND_LD="" - SO="sl" + if test "$cross_compiling" = "yes" + then + YAP_EXTRAS="" + else + AC_SYS_RESTARTABLE_SYSCALLS + fi + + dnl defaults + INSTALL_DLLS="no" + EXTRA_OBJS="" + SHLIB_LD="#" + SHLIB_CXX_LD="#" + DO_SECOND_LD="#" + M4="m4" + MERGE_DLL_OBJS="#" + IN_UNIX="" + + dnl This has to be before $target_os + YAPLIB="libYap.a" + + dnl now this is where things get nasty. + dnl trying to get the libraries + case "$target_os" in + *linux*) + if test "$static_compilation" = "no" + then + AC_CHECK_LIB(dl,dlopen, + have_dl=yes + , + have_dl=no) + if test "$have_dl" = "yes" + then + SO="so" + SHLIB_LD="$CC -shared -export-dynamic" + SHLIB_CXX_LD="$CXX -shared -export-dynamic" + DO_SECOND_LD="" + LIBS="$LIBS -ldl" + case "$target_cpu" in + alpha*) + LDFLAGS="-dynamic $LDFLAGS" + ;; + *) + if test "$CC" != "lcc" + then + LDFLAGS="-rdynamic $LDFLAGS" + fi + ;; + esac + fi + if test "$ac_cv_prog_gcc" = "yes" + then + SHLIB_CFLAGS="-shared -fPIC $CFLAGS" + SHLIB_CXXFLAGS="-shared -fPIC $CXXFLAGS" + INSTALL_DLLS="yes" + fi + LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" + DYNYAPLIB=libYap."$SO" + SONAMEFLAG="-Wl,-soname=$DYNYAPLIB" + fi + if test "$have_nsl" = yes + then + LIBS="$LIBS -lnsl" + fi + if test "$dynamic_loading" = "yes" + then + YAPLIB_LD="\$(CC) -shared" + EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)" + INSTALL_ENV="LD_LIBRARY_PATH=:\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" + else + YAPLIB_LD="\$(CC)" + 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" + ;; + *sunos4*) + M4="/usr/5bin/m4" + LDFLAGS="$LDFLAGS -N" + if test "$have_nsl" = yes + then + LIBS="$LIBS -lnsl" + fi + SO="o" + INSTALL_DLLS="yes" + LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" + 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" + INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" + ;; + *hpux*) + #do not use the first memory 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 + SHLIB_INTERFACE="load_shl.o" + if test "$CC" = cc -o "$CC" = c89 + then + #this tells ld to export all non-static symbols, + #otherwise no external predicates. + SHLIB_LD="$CC -shared -export-dynamic" + SHLIB_CXX_LD="$CXX -shared -export-dynamic" + DO_SECOND_LD="" + SO="sl" SHLIB_CFLAGS="+z $CFLAGS" SHLIB_CXXFLAGS="+z $CXXFLAGS" INSTALL_DLLS="yes" # 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 + , + 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 ]) @@ -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 ]) @@ -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 diff --git a/library/lammpi/configure.in b/library/lammpi/configure.in index ace99a4bf..b38fd8121 100644 --- a/library/lammpi/configure.in +++ b/library/lammpi/configure.in @@ -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" diff --git a/os/pl-rl.c b/os/pl-rl.c index cb7b67cb7..6103cd9cd 100755 --- a/os/pl-rl.c +++ b/os/pl-rl.c @@ -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__ diff --git a/packages/myddas/configure.in b/packages/myddas/configure.in index 734a7bb37..7f7b3494d 100644 --- a/packages/myddas/configure.in +++ b/packages/myddas/configure.in @@ -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