try compiling pl-rl

This commit is contained in:
Vitor Santos Costa 2011-02-15 23:45:47 +00:00
parent b902efe21f
commit ef918d8fe4
6 changed files with 338 additions and 216 deletions

View File

@ -206,6 +206,7 @@ IOLIB_SOURCES=$(srcdir)/packages/PLStream/pl-buffer.c $(srcdir)/packages/PLStrea
$(srcdir)/packages/PLStream/pl-os.c \
$(srcdir)/packages/PLStream/pl-privitf.c \
$(srcdir)/packages/PLStream/pl-read.c \
$(srcdir)/packages/PLStream/pl-rl.c \
$(srcdir)/packages/PLStream/pl-stream.c $(srcdir)/packages/PLStream/pl-string.c \
$(srcdir)/packages/PLStream/pl-table.c \
$(srcdir)/packages/PLStream/pl-text.c \
@ -322,8 +323,9 @@ YAPDOCS=$(srcdir)/docs/yap.tex $(srcdir)/docs/chr.tex \
IOLIB_OBJECTS=pl-buffer.o pl-codelist.o pl-ctype.o pl-dtoa.o pl-error.o \
pl-file.o pl-files.o pl-fmt.o \
pl-glob.o pl-option.o \
pl-read.o \
pl-os.o pl-privitf.o \
pl-read.o \
pl-rl.o \
pl-stream.o pl-string.o pl-table.o \
pl-text.o pl-util.o pl-utf8.o \
pl-write.o \
@ -586,6 +588,9 @@ pl-os.o: $(srcdir)/packages/PLStream/pl-os.c
pl-privitf.o: $(srcdir)/packages/PLStream/pl-privitf.c
$(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream $(srcdir)/packages/PLStream/pl-privitf.c -o $@
pl-rl.o: $(srcdir)/packages/PLStream/pl-rl.c
$(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream $(srcdir)/packages/PLStream/pl-rl.c -o $@
pl-read.o: $(srcdir)/packages/PLStream/pl-read.c
$(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream $(srcdir)/packages/PLStream/pl-read.c -o $@

View File

@ -85,6 +85,7 @@
#undef HAVE_PTHREAD_H
#undef HAVE_PWD_H
#undef HAVE_READLINE_READLINE_H
#undef HAVE_READLINE_HISTORY_H
#undef HAVE_REGEX_H
#undef HAVE_SIGINFO_H
#undef HAVE_SIGNAL_H
@ -280,6 +281,8 @@
#define TYPE_SELECT_
#define MYTYPE(X) MYTYPE1#X
#undef HAVE_DECL_RL_CATCH_SIGNALS
/* define how to pass the address of a function */
#define FunAdr(Fn) Fn

517
configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -235,7 +235,7 @@ AC_ARG_WITH(readline,
else
yap_cv_readline=$with_readline
LDFLAGS="$LDFLAGS -L${yap_cv_readline}/lib"
CPPFLAGS="$CPPFLAGS -I${yap_cv_readline}/include"
CPPFLAGS="-I${yap_cv_readline}/include $CPPFLAGS"
fi,
[yap_cv_readline=yes])
@ -1379,6 +1379,8 @@ fi
if test "$yap_cv_readline" != "no"
then
AC_CHECK_HEADERS( readline/readline.h)
AC_CHECK_HEADERS( readline/readline/history.h)
AC_CHECK_DECL( rl_catch_signals )
fi
AC_CHECK_HEADERS(mpi.h)
AC_CHECK_HEADERS(mpe.h)

View File

@ -1129,3 +1129,5 @@ extern const PL_extension PL_predicates_from_glob[];
extern const PL_extension PL_predicates_from_write[];
extern const PL_extension PL_predicates_from_read[];

View File

@ -183,5 +183,26 @@ stripostfix(const char *s, const char *e)
}
#endif
#if HAVE_SIGPROCMASK
#if HAVE_SIGNAL_H
#include <signal.h>
#endif
static inline void
unblockSignal(int sig)
{ sigset_t set;
sigemptyset(&set);
sigaddset(&set, sig);
sigprocmask(SIG_UNBLOCK, &set, NULL);
// DEBUG(1, Sdprintf("Unblocked signal %d\n", sig));
}
#else
static inline void
unblockSignal(int sig)
{
}
#endif
#endif /* PL_YAP_H */