Menu
▾
▴
[Yap-commits] CVS: Makefile.in,1.9,1.10 TO_DO,1.8,1.9 changes4.3.html,1.28,1.29 config.h.in,1.4,1.5 configure,1.7,1.8 configure.in,1.7,1.8
|
From: Vitor S. C. <vs...@us...> - 2001-06-22 17:53:39
|
Update of /cvsroot/yap
In directory usw-pr-cvs1:/tmp/cvs-serv1211
Modified Files:
Makefile.in TO_DO changes4.3.html config.h.in configure
configure.in
Log Message:
fixes to handle interrupts ^C in Windows.
Improvements to configure scripts for WIN32 configurations.
--with-readline= option for configure
Index: TO_DO
===================================================================
RCS file: /cvsroot/yap/TO_DO,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TO_DO 2001/06/11 20:20:36 1.8
+++ TO_DO 2001/06/22 17:53:36 1.9
@@ -13,7 +13,6 @@
- document system(library)
- document new interface functions.
- ^C can break code.
-- check library(random)
- add more precision when outputting floats.
- make statistics/0 better looking.
- mask when installing.
@@ -78,3 +77,4 @@
- remove pl/nfr.yap and misc/yap.spec from CVS.
- deterministic trail entries for multi-assignment variables.
- weird going ons with prompt and readline
+- check library(random)
Index: changes4.3.html
===================================================================
RCS file: /cvsroot/yap/changes4.3.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- changes4.3.html 2001/06/11 17:40:16 1.28
+++ changes4.3.html 2001/06/22 17:53:36 1.29
@@ -16,6 +16,13 @@
<h2>Yap-4.3.19:</h2>
<ul>
+ <li>FIXED: ^c works with Yap/MINGW32 (not in cygwin).</li>
+ <li>FIXED: ^c a should never core dump.</li>
+ <li>FIXED: comparison of variables in sub-terms.</li>
+ <li>FIXED: parse +inf, -inf, +nan, -nan as floats and write
+ them accordingly.</li>
+ <li>FIXED: comparison was breaking ISO.</li>
+ <li>FIXED: use $(CC) never gcc directly.</li>
<li>FIXED: support newer versions of readline by moving text
to prompt.</li>
<li>FIXED: upgrade to autoconf 2.5.</li>
Index: config.h.in
===================================================================
RCS file: /cvsroot/yap/config.h.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config.h.in 2001/05/28 19:54:52 1.4
+++ config.h.in 2001/06/22 17:53:36 1.5
@@ -38,6 +38,7 @@
#undef HAVE_MEMORY_H
#undef HAVE_NETDB_H
#undef HAVE_NETINET_IN_H
+#undef HAVE_READLINE_READLINE_H
#undef HAVE_REGEX_H
#undef HAVE_SIGINFO_H
#undef HAVE_SIGNAL_H
@@ -96,22 +97,22 @@
/* Define return type for signal */
#undef RETSIGTYPE
+#undef HAVE_ACOSH
#undef HAVE_ALARM
#undef HAVE_ASINH
-#undef HAVE_ACOSH
#undef HAVE_ATANH
#undef HAVE_CHDIR
#undef HAVE_DUP2
#undef HAVE_FETESTEXCEPT
#undef HAVE_FINITE
+#undef HAVE_GETCWD
+#undef HAVE_GETENV
#undef HAVE_GETHOSTBYNAME
#undef HAVE_GETHOSTID
#undef HAVE_GETHOSTNAME
-#undef HAVE_GETRUSAGE
-#undef HAVE_GETCWD
-#undef HAVE_GETENV
#undef HAVE_GETHRTIME
#undef HAVE_GETPWNAM
+#undef HAVE_GETRUSAGE
#undef HAVE_GETTIMEOFDAY
#undef HAVE_GETWD
#undef HAVE_ISATTY
@@ -121,11 +122,11 @@
#undef HAVE_LINK
#undef HAVE_LOCALTIME
#undef HAVE_LSTAT
-#undef HAVE_MMAP
#undef HAVE_MEMCPY
#undef HAVE_MEMMOVE
#undef HAVE_MKSTEMP
#undef HAVE_MKTEMP
+#undef HAVE_MMAP
#undef HAVE_OPENDIR
#undef HAVE_POPEN
#undef HAVE_PUTENV
@@ -134,24 +135,24 @@
#undef HAVE_RENAME
#undef HAVE_RINT
#undef HAVE_SBRK
-#undef HAVE_STAT
#undef HAVE_SELECT
#undef HAVE_SETBUF
#undef HAVE_SETLINEBUF
#undef HAVE_SHMAT
#undef HAVE_SIGACTION
#undef HAVE_SIGGETMASK
+#undef HAVE_SIGINTERRUPT
#undef HAVE_SIGNAL
#undef HAVE_SIGPROCMASK
-#undef HAVE_SIGSEGV
#undef HAVE_SIGSETJMP
#undef HAVE_SLEEP
#undef HAVE_SNPRINTF
#undef HAVE_SOCKET
+#undef HAVE_STAT
+#undef HAVE_STRCHR
#undef HAVE_STRERROR
#undef HAVE_STRNCAT
#undef HAVE_STRNCPY
-#undef HAVE_STRCHR
#undef HAVE_STRTOD
#undef HAVE_SYSTEM
#undef HAVE_TIME
@@ -160,8 +161,9 @@
#undef HAVE_USLEEP
#undef HAVE_VSNPRINTF
#undef HAVE_WAITPID
-#undef HAVE_ENVIRON
#undef HAVE_MPZ_XOR
+
+#undef HAVE_SIGSEGV
#define SELECT_TYPE_ARG1
#define SELECT_TYPE_ARG234
Index: configure
===================================================================
RCS file: /cvsroot/yap/configure,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- configure 2001/06/11 20:20:36 1.7
+++ configure 2001/06/22 17:53:36 1.8
@@ -31,6 +31,8 @@
--enable-debug-yap enable C-debugging for YAP "
ac_help="$ac_help
--with-gmp[=DIR] use GNU Multiple Precision in DIR"
+ac_help="$ac_help
+ --with-readline[=DIR] use GNU Readline Library in DIR"
# Initialize some variables set by options.
# The variables have the same names as the options, with
@@ -548,7 +550,7 @@
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
[...2173 lines suppressed...]
s%@LN_S@%$LN_S%g
s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
@@ -3987,6 +4180,7 @@
s%@build_vendor@%$build_vendor%g
s%@build_os@%$build_os%g
s%@INSTALL_COMMAND@%$INSTALL_COMMAND%g
+s%@CPP@%$CPP%g
s%@INSTALL_DLLS@%$INSTALL_DLLS%g
s%@SHLIB_CFLAGS@%$SHLIB_CFLAGS%g
s%@SHLIB_SUFFIX@%$SHLIB_SUFFIX%g
@@ -4038,7 +4232,7 @@
cat >> $CONFIG_STATUS <<EOF
-CONFIG_FILES=\${CONFIG_FILES-"Makefile library/regex/Makefile library/system/Makefile library/random/Makefile .depend library/Makefile CHR/Makefile CLPQR/Makefile"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile library/regex/Makefile library/system/Makefile library/random/Makefile .depend library/Makefile CHR/Makefile CLPQR/Makefile LGPL/win32cons/Makefile"}
EOF
cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
Index: configure.in
===================================================================
RCS file: /cvsroot/yap/configure.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- configure.in 2001/06/11 20:20:36 1.7
+++ configure.in 2001/06/22 17:53:36 1.8
@@ -11,15 +11,7 @@
AC_SUBST(GCC)
AC_SUBST(C_INTERF_FLAGS)
-AC_CYGWIN
-if test "$ac_cv_cygwin" = "yes" -a "$CC" = "gcc"
-then
- CC="gcc -mno-cygwin"
-fi
-AC_MINGW32
-
dnl Checks for programs.
-AC_PROG_CPP
AC_PROG_LN_S
AC_PROG_INSTALL
AC_PROG_RANLIB
@@ -67,17 +59,23 @@
fi
[yap_cv_gmp=yes])
+AC_ARG_WITH(readline,
+ [ --with-readline[=DIR] use GNU Readline Library in DIR],
+ if test $withval = yes; then
+ yap_cv_readline=yes
+ elif test $withval = no; then
+ yap_cv_readline=no
+ else
+ yap_cv_readline=$with_readline
+ LDFLAGS="$LDFLAGS -L${yap_cv_readline}/lib"
+ CPPFLAGS="$CPPFLAGS -I${yap_cv_readline}/include"
+ fi
+ [yap_cv_readline=yes])
+
AC_CANONICAL_SYSTEM
AC_DEFINE_UNQUOTED(HOST_ALIAS,"${host_alias}")
-if test "$cross_compiling" = "yes"
-then
- YAP_EXTRAS=
-else
- AC_SYS_RESTARTABLE_SYSCALLS
-fi
-
dnl Compilation Flags
if test "$GCC" = "yes"
then
@@ -167,22 +165,22 @@
dnl mingw does not get along well with libm
dnl cygnus and mingw32 also need wsock32 to use sockets.
dnl
-if test "$MINGW32" = "yes"
+if test "$target_os" = "cygwin"
then
- AC_CHECK_LIB(wsock32,main)
- INSTALL_COMMAND=install_mingw32
-else
- if test "$CYGWIN" = "yes" -a "$MINGW32" = "no"
+ if test "$CC" = "gcc"
then
+ CC="gcc -mno-cygwin"
+ AC_CHECK_LIB(wsock32,main)
+ INSTALL_COMMAND=install_mingw32
+ yap_cv_readline=no
+ else
AC_CHECK_LIB(wsock32,main)
AC_CHECK_LIB(cygwin,main)
fi
+else
INSTALL_COMMAND="install_unix"
AC_CHECK_LIB(m,sin)
AC_CHECK_LIB(socket,socket)
- AC_CHECK_LIB(termcap,tgetent)
- AC_CHECK_LIB(readline,readline)
- AC_CHECK_LIB(gmp,main)
AC_CHECK_LIB(nsl,main,
have_nsl=yes
,
@@ -193,6 +191,24 @@
,
have_dl=no)
fi
+if test "$yap_cv_readline" != "no"
+then
+ AC_CHECK_LIB(termcap,tgetent)
+ AC_CHECK_LIB(readline,readline)
+fi
+if test "$yap_cv_gmp" != "no"
+then
+ AC_CHECK_LIB(gmp,main)
+fi
+
+AC_PROG_CPP
+
+if test "$cross_compiling" = "yes"
+then
+ YAP_EXTRAS=
+else
+ AC_SYS_RESTARTABLE_SYSCALLS
+fi
dnl System stuff for dynamic linking.
dnl
@@ -389,17 +405,23 @@
dnl Checks for header files.
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(fcntl.h sys/file.h sys/socket.h sys/types.h sys/time.h)
-AC_CHECK_HEADERS(sys/ucontext.h sys/un.h unistd.h sys/times.h ieeefp.h)
-AC_CHECK_HEADERS(sys/param.h errno.h netdb.h netinet/in.h arpa/inet.h)
-AC_CHECK_HEADERS(string.h memory.h sys/mman.h sys/stat.h stdarg.h ctype.h)
-AC_CHECK_HEADERS(sys/resource.h limits.h siginfo.h time.h fenv.h)
-AC_CHECK_HEADERS(fpu_control.h sys/shm.h regex.h winsock.h winsock2.h)
-AC_CHECK_HEADERS(sys/select.h direct.h dirent.h signal.h io.h)
+AC_CHECK_HEADERS(arpa/inet.h ctype.h direct.h dirent.h errno.h fcntl.h)
+AC_CHECK_HEADERS(fenv.h fpu_control.h ieeefp.h io.h limits.h memory.h)
+AC_CHECK_HEADERS(netdb.h netinet/in.h regex.h)
+AC_CHECK_HEADERS(siginfo.h signal.h stdarg.h string.h sys/file.h)
+AC_CHECK_HEADERS(sys/mman.h sys/param.h sys/resource.h sys/select.h)
+AC_CHECK_HEADERS(sys/shm.h sys/socket.h sys/stat.h)
+AC_CHECK_HEADERS(sys/time.h sys/times.h sys/types.h)
+AC_CHECK_HEADERS(sys/ucontext.h sys/un.h)
+AC_CHECK_HEADERS(time.h unistd.h winsock.h winsock2.h)
if test "$yap_cv_gmp" != "no"
then
AC_CHECK_HEADERS(gmp.h)
fi
+if test "$yap_cv_readline" != "no"
+then
+ AC_CHECK_HEADERS( readline/readline.h)
+fi
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_INLINE
@@ -561,15 +583,17 @@
dnl Checks for library functions.
AC_TYPE_SIGNAL
-AC_CHECK_FUNCS(getcwd getwd strtod getrusage chdir signal times siggetmask)
-AC_CHECK_FUNCS(strchr memcpy isatty sbrk shmat mmap random rand sigaction)
-AC_CHECK_FUNCS(snprintf vsnprintf setbuf system link getpwnam dup2 sigprocmask)
-AC_CHECK_FUNCS(labs strncat tmpnam getenv gettimeofday gethrtime putenv)
-AC_CHECK_FUNCS(strerror socket memmove alarm asinh acosh atanh rint)
-AC_CHECK_FUNCS(stat select fetestexcept finite strncpy mkstemp isnan)
-AC_CHECK_FUNCS(setlinebuf lstat opendir localtime time gethostname)
-AC_CHECK_FUNCS(gethostid gethostbyname kill mktemp popen rename waitpid)
-AC_CHECK_FUNCS(sleep usleep)
+AC_CHECK_FUNCS(acosh alarm asinh atanh chdir dup2)
+AC_CHECK_FUNCS(fetestexcept finite getcwd getenv)
+AC_CHECK_FUNCS(gethostbyname gethostid gethostname)
+AC_CHECK_FUNCS(gethrtime getpwnam getrusage gettimeofday getwd)
+AC_CHECK_FUNCS(isatty isnan kill labs link localtime lstat)
+AC_CHECK_FUNCS(memcpy memmove mkstemp mktemp mmap opendir)
+AC_CHECK_FUNCS(popen putenv rand random rename rint sbrk select)
+AC_CHECK_FUNCS(setbuf setlinebuf shmat sigaction siggetmask siginterrupt)
+AC_CHECK_FUNCS(signal sigprocmask sleep snprintf socket stat)
+AC_CHECK_FUNCS(strchr strerror strncat strncpy strtod system)
+AC_CHECK_FUNCS(time times tmpnam usleep vsnprintf waitpid)
dnl check for mpz_xor
AC_MSG_CHECKING(for mpz_xor)
@@ -595,7 +619,7 @@
mkdir -p CHR
mkdir -p CLPQR
-AC_OUTPUT(Makefile library/regex/Makefile library/system/Makefile library/random/Makefile .depend library/Makefile CHR/Makefile CLPQR/Makefile)
+AC_OUTPUT(Makefile library/regex/Makefile library/system/Makefile library/random/Makefile .depend library/Makefile CHR/Makefile CLPQR/Makefile LGPL/win32cons/Makefile)
make depend
|
