From 5418f55d748b1f56852736bc69d6b9c10276858f Mon Sep 17 00:00:00 2001 From: Vitor Santos Costa Date: Wed, 9 Mar 2011 13:05:03 +0000 Subject: [PATCH] fix pl-tai --- Makefile.in | 76 +-- config.guess | 0 config.sub | 0 configure | 474 ++++++++++-------- configure.in | 11 +- library/dialect/swi.yap | 124 ----- library/mpi/examples/mk_gmiconf.awk | 0 misc/tkyap | 0 packages/{tai => PLStream}/libtai/BLURB | 0 packages/{tai => PLStream}/libtai/CHANGES | 0 packages/{tai => PLStream}/libtai/FILES | 0 packages/{tai => PLStream}/libtai/INSTALL | 0 packages/{tai => PLStream}/libtai/Makefile.in | 0 .../{tai => PLStream}/libtai/Makefile.mak | 0 packages/{tai => PLStream}/libtai/README | 0 packages/{tai => PLStream}/libtai/THANKS | 0 packages/{tai => PLStream}/libtai/TODO | 0 packages/{tai => PLStream}/libtai/VERSION | 0 packages/{tai => PLStream}/libtai/caldate.3 | 0 packages/{tai => PLStream}/libtai/caldate.h | 0 .../{tai => PLStream}/libtai/caldate_fmjd.c | 0 .../{tai => PLStream}/libtai/caldate_fmt.c | 0 .../{tai => PLStream}/libtai/caldate_mjd.3 | 0 .../{tai => PLStream}/libtai/caldate_mjd.c | 0 .../{tai => PLStream}/libtai/caldate_norm.c | 0 .../{tai => PLStream}/libtai/caldate_scan.c | 0 .../{tai => PLStream}/libtai/caldate_ster.c | 0 packages/{tai => PLStream}/libtai/caltime.3 | 0 packages/{tai => PLStream}/libtai/caltime.h | 0 .../{tai => PLStream}/libtai/caltime_fmt.c | 0 .../{tai => PLStream}/libtai/caltime_scan.c | 0 .../{tai => PLStream}/libtai/caltime_tai.3 | 0 .../{tai => PLStream}/libtai/caltime_tai.c | 0 .../{tai => PLStream}/libtai/caltime_utc.c | 0 packages/{tai => PLStream}/libtai/check.c | 0 packages/{tai => PLStream}/libtai/check.in | 0 packages/{tai => PLStream}/libtai/check.out | 0 packages/{tai => PLStream}/libtai/easter.c | 0 packages/{tai => PLStream}/libtai/leapsecs.3 | 0 packages/{tai => PLStream}/libtai/leapsecs.c | 0 .../{tai => PLStream}/libtai/leapsecs.dat | Bin packages/{tai => PLStream}/libtai/leapsecs.h | 0 .../{tai => PLStream}/libtai/leapsecs.txt | 0 .../{tai => PLStream}/libtai/leapsecs_add.c | 0 .../{tai => PLStream}/libtai/leapsecs_init.c | 0 .../{tai => PLStream}/libtai/leapsecs_read.c | 0 .../{tai => PLStream}/libtai/leapsecs_sub.c | 0 packages/{tai => PLStream}/libtai/nowutc.c | 0 packages/{tai => PLStream}/libtai/tai.3 | 0 packages/{tai => PLStream}/libtai/tai.h | 0 packages/{tai => PLStream}/libtai/tai_add.c | 0 packages/{tai => PLStream}/libtai/tai_now.3 | 0 packages/{tai => PLStream}/libtai/tai_now.c | 0 packages/{tai => PLStream}/libtai/tai_pack.3 | 0 packages/{tai => PLStream}/libtai/tai_pack.c | 0 packages/{tai => PLStream}/libtai/tai_sub.c | 0 .../{tai => PLStream}/libtai/tai_unpack.c | 0 packages/{tai => PLStream}/libtai/taia.3 | 0 packages/{tai => PLStream}/libtai/taia.h | 0 packages/{tai => PLStream}/libtai/taia_add.c | 0 .../{tai => PLStream}/libtai/taia_approx.c | 0 .../{tai => PLStream}/libtai/taia_fmtfrac.c | 0 packages/{tai => PLStream}/libtai/taia_frac.c | 0 packages/{tai => PLStream}/libtai/taia_half.c | 0 packages/{tai => PLStream}/libtai/taia_less.c | 0 packages/{tai => PLStream}/libtai/taia_now.3 | 0 packages/{tai => PLStream}/libtai/taia_now.c | 0 packages/{tai => PLStream}/libtai/taia_pack.3 | 0 packages/{tai => PLStream}/libtai/taia_pack.c | 0 packages/{tai => PLStream}/libtai/taia_sub.c | 0 packages/{tai => PLStream}/libtai/taia_tai.c | 0 .../{tai => PLStream}/libtai/taia_unpack.c | 0 packages/{tai => PLStream}/libtai/yearcal.c | 0 packages/PLStream/pl-file.c | 1 + packages/PLStream/pl-files.c | 1 + packages/PLStream/pl-incl.h | 3 +- packages/{tai => PLStream}/pl-tai.c | 73 +-- packages/clib/demo/cgidemo.pl | 0 78 files changed, 344 insertions(+), 419 deletions(-) mode change 100644 => 100755 config.guess mode change 100644 => 100755 config.sub mode change 100644 => 100755 library/mpi/examples/mk_gmiconf.awk mode change 100644 => 100755 misc/tkyap rename packages/{tai => PLStream}/libtai/BLURB (100%) rename packages/{tai => PLStream}/libtai/CHANGES (100%) rename packages/{tai => PLStream}/libtai/FILES (100%) rename packages/{tai => PLStream}/libtai/INSTALL (100%) rename packages/{tai => PLStream}/libtai/Makefile.in (100%) rename packages/{tai => PLStream}/libtai/Makefile.mak (100%) rename packages/{tai => PLStream}/libtai/README (100%) rename packages/{tai => PLStream}/libtai/THANKS (100%) rename packages/{tai => PLStream}/libtai/TODO (100%) rename packages/{tai => PLStream}/libtai/VERSION (100%) rename packages/{tai => PLStream}/libtai/caldate.3 (100%) rename packages/{tai => PLStream}/libtai/caldate.h (100%) rename packages/{tai => PLStream}/libtai/caldate_fmjd.c (100%) rename packages/{tai => PLStream}/libtai/caldate_fmt.c (100%) rename packages/{tai => PLStream}/libtai/caldate_mjd.3 (100%) rename packages/{tai => PLStream}/libtai/caldate_mjd.c (100%) rename packages/{tai => PLStream}/libtai/caldate_norm.c (100%) rename packages/{tai => PLStream}/libtai/caldate_scan.c (100%) rename packages/{tai => PLStream}/libtai/caldate_ster.c (100%) rename packages/{tai => PLStream}/libtai/caltime.3 (100%) rename packages/{tai => PLStream}/libtai/caltime.h (100%) rename packages/{tai => PLStream}/libtai/caltime_fmt.c (100%) rename packages/{tai => PLStream}/libtai/caltime_scan.c (100%) rename packages/{tai => PLStream}/libtai/caltime_tai.3 (100%) rename packages/{tai => PLStream}/libtai/caltime_tai.c (100%) rename packages/{tai => PLStream}/libtai/caltime_utc.c (100%) rename packages/{tai => PLStream}/libtai/check.c (100%) rename packages/{tai => PLStream}/libtai/check.in (100%) rename packages/{tai => PLStream}/libtai/check.out (100%) rename packages/{tai => PLStream}/libtai/easter.c (100%) rename packages/{tai => PLStream}/libtai/leapsecs.3 (100%) rename packages/{tai => PLStream}/libtai/leapsecs.c (100%) rename packages/{tai => PLStream}/libtai/leapsecs.dat (100%) rename packages/{tai => PLStream}/libtai/leapsecs.h (100%) rename packages/{tai => PLStream}/libtai/leapsecs.txt (100%) rename packages/{tai => PLStream}/libtai/leapsecs_add.c (100%) rename packages/{tai => PLStream}/libtai/leapsecs_init.c (100%) rename packages/{tai => PLStream}/libtai/leapsecs_read.c (100%) rename packages/{tai => PLStream}/libtai/leapsecs_sub.c (100%) rename packages/{tai => PLStream}/libtai/nowutc.c (100%) rename packages/{tai => PLStream}/libtai/tai.3 (100%) rename packages/{tai => PLStream}/libtai/tai.h (100%) rename packages/{tai => PLStream}/libtai/tai_add.c (100%) rename packages/{tai => PLStream}/libtai/tai_now.3 (100%) rename packages/{tai => PLStream}/libtai/tai_now.c (100%) rename packages/{tai => PLStream}/libtai/tai_pack.3 (100%) rename packages/{tai => PLStream}/libtai/tai_pack.c (100%) rename packages/{tai => PLStream}/libtai/tai_sub.c (100%) rename packages/{tai => PLStream}/libtai/tai_unpack.c (100%) rename packages/{tai => PLStream}/libtai/taia.3 (100%) rename packages/{tai => PLStream}/libtai/taia.h (100%) rename packages/{tai => PLStream}/libtai/taia_add.c (100%) rename packages/{tai => PLStream}/libtai/taia_approx.c (100%) rename packages/{tai => PLStream}/libtai/taia_fmtfrac.c (100%) rename packages/{tai => PLStream}/libtai/taia_frac.c (100%) rename packages/{tai => PLStream}/libtai/taia_half.c (100%) rename packages/{tai => PLStream}/libtai/taia_less.c (100%) rename packages/{tai => PLStream}/libtai/taia_now.3 (100%) rename packages/{tai => PLStream}/libtai/taia_now.c (100%) rename packages/{tai => PLStream}/libtai/taia_pack.3 (100%) rename packages/{tai => PLStream}/libtai/taia_pack.c (100%) rename packages/{tai => PLStream}/libtai/taia_sub.c (100%) rename packages/{tai => PLStream}/libtai/taia_tai.c (100%) rename packages/{tai => PLStream}/libtai/taia_unpack.c (100%) rename packages/{tai => PLStream}/libtai/yearcal.c (100%) rename packages/{tai => PLStream}/pl-tai.c (95%) mode change 100644 => 100755 packages/clib/demo/cgidemo.pl diff --git a/Makefile.in b/Makefile.in index d7dfd8125..09eae7223 100755 --- a/Makefile.in +++ b/Makefile.in @@ -210,6 +210,7 @@ IOLIB_SOURCES=$(srcdir)/packages/PLStream/pl-buffer.c $(srcdir)/packages/PLStrea $(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-tai.c \ $(srcdir)/packages/PLStream/pl-text.c \ $(srcdir)/packages/PLStream/pl-write.c \ $(srcdir)/packages/PLStream/pl-yap.c @ENABLE_WINCONSOLE@ $(srcdir)/packages/PLStream/popen.c $(srcdir)/packages/PLStream/windows/windows.c @@ -328,7 +329,7 @@ IOLIB_OBJECTS=pl-buffer.o pl-codelist.o pl-ctype.o pl-dtoa.o pl-error.o \ pl-read.o \ pl-rl.o \ pl-stream.o pl-string.o pl-table.o \ - pl-text.o pl-utf8.o \ + pl-tai.o pl-text.o pl-utf8.o \ pl-write.o \ pl-yap.o @ENABLE_WINCONSOLE@ uxnt.o @@ -351,6 +352,16 @@ ENGINE_OBJECTS = \ write.o \ blobs.o swi.o ypstdio.o $(IOLIB_OBJECTS) @MPI_OBJS@ +LIBTAI_OBJECTS = \ + tai_add.o tai_now.o tai_pack.o \ + tai_sub.o tai_unpack.o taia_add.o taia_approx.o \ + taia_fmtfrac.o taia_frac.o taia_half.o taia_less.o \ + taia_now.o taia_pack.o taia_sub.o taia_tai.o taia_unpack.o \ + caldate_fmt.o caldate_scan.o caldate_fmjd.o caldate_mjd.o \ + caldate_norm.o caldate_ster.o leapsecs_read.o \ + leapsecs_init.o leapsecs_add.o leapsecs_sub.o caltime_fmt.o \ + caltime_scan.o caltime_tai.o caltime_utc.o + C_INTERFACE_OBJECTS = \ load_foreign.o load_dl.o load_dld.o load_dyld.o \ load_none.o load_aout.o load_aix.o load_dll.o load_shl.o \ @@ -548,76 +559,80 @@ pl-ntcon.o: $(srcdir)/console/LGPL/pl-ntcon.c config.h $(CC) -c $(CFLAGS) -I$(srcdir)/include $(srcdir)/console/LGPL/pl-ntcon.c -o $@ pl-ntconsole.o: $(srcdir)/console/LGPL/pl-ntconsole.c config.h - $(CC) -c $(CFLAGS) -I$(srcdir) -I$(srcdir)/include -I$(srcdir)/packages/PLStream $(srcdir)/console/LGPL/pl-ntconsole.c -o $@ + $(CC) -c $(CFLAGS) -I$(srcdir) -I$(srcdir)/include -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/console/LGPL/pl-ntconsole.c -o $@ pl-ntmain.o: $(srcdir)/console/LGPL/pl-ntmain.c config.h - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream $(srcdir)/console/LGPL/pl-ntmain.c -o $@ + $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ < $(srcdir)/console/LGPL/pl-ntmain.c -o $@ pl-buffer.o: $(srcdir)/packages/PLStream/pl-buffer.c - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream -I$(srcdir)/packages/PLStream/windows $(srcdir)/packages/PLStream/pl-buffer.c -o $@ + $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-buffer.c -o $@ pl-codelist.o: $(srcdir)/packages/PLStream/pl-codelist.c - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream -I$(srcdir)/packages/PLStream/windows $(srcdir)/packages/PLStream/pl-codelist.c -o $@ + $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-codelist.c -o $@ pl-ctype.o: $(srcdir)/packages/PLStream/pl-ctype.c - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream -I$(srcdir)/packages/PLStream/windows $(srcdir)/packages/PLStream/pl-ctype.c -o $@ + $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-ctype.c -o $@ pl-dtoa.o: $(srcdir)/packages/PLStream/pl-dtoa.c - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream -I$(srcdir)/packages/PLStream/windows $(srcdir)/packages/PLStream/pl-dtoa.c -o $@ + $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-dtoa.c -o $@ pl-error.o: $(srcdir)/packages/PLStream/pl-error.c - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream -I$(srcdir)/packages/PLStream/windows $(srcdir)/packages/PLStream/pl-error.c -o $@ + $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-error.c -o $@ pl-file.o: $(srcdir)/packages/PLStream/pl-file.c - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream -I$(srcdir)/packages/PLStream/windows $(srcdir)/packages/PLStream/pl-file.c -o $@ + $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-file.c -o $@ pl-files.o: $(srcdir)/packages/PLStream/pl-files.c - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream -I$(srcdir)/packages/PLStream/windows $(srcdir)/packages/PLStream/pl-files.c -o $@ + $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-files.c -o $@ pl-fmt.o: $(srcdir)/packages/PLStream/pl-fmt.c - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream -I$(srcdir)/packages/PLStream/windows $(srcdir)/packages/PLStream/pl-fmt.c -o $@ + $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-fmt.c -o $@ pl-glob.o: $(srcdir)/packages/PLStream/pl-glob.c - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream -I$(srcdir)/packages/PLStream/windows $(srcdir)/packages/PLStream/pl-glob.c -o $@ + $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-glob.c -o $@ pl-option.o: $(srcdir)/packages/PLStream/pl-option.c - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream -I$(srcdir)/packages/PLStream/windows $(srcdir)/packages/PLStream/pl-option.c -o $@ + $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-option.c -o $@ pl-os.o: $(srcdir)/packages/PLStream/pl-os.c - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream -I$(srcdir)/packages/PLStream/windows $(srcdir)/packages/PLStream/pl-os.c -o $@ + $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-os.c -o $@ pl-privitf.o: $(srcdir)/packages/PLStream/pl-privitf.c - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream -I$(srcdir)/packages/PLStream/windows $(srcdir)/packages/PLStream/pl-privitf.c -o $@ + $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(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 -I$(srcdir)/packages/PLStream/windows $(srcdir)/packages/PLStream/pl-rl.c -o $@ + $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(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 -I$(srcdir)/packages/PLStream/windows $(srcdir)/packages/PLStream/pl-read.c -o $@ + $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-read.c -o $@ pl-stream.o: $(srcdir)/packages/PLStream/pl-stream.c - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream -I$(srcdir)/packages/PLStream/windows $(srcdir)/packages/PLStream/pl-stream.c -o $@ + $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-stream.c -o $@ pl-string.o: $(srcdir)/packages/PLStream/pl-string.c - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream -I$(srcdir)/packages/PLStream/windows $(srcdir)/packages/PLStream/pl-string.c -o $@ + $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-string.c -o $@ pl-table.o: $(srcdir)/packages/PLStream/pl-table.c - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream -I$(srcdir)/packages/PLStream/windows $(srcdir)/packages/PLStream/pl-table.c -o $@ + $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-table.c -o $@ pl-text.o: $(srcdir)/packages/PLStream/pl-text.c - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream -I$(srcdir)/packages/PLStream/windows $(srcdir)/packages/PLStream/pl-text.c -o $@ + $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-text.c -o $@ pl-utf8.o: $(srcdir)/packages/PLStream/pl-utf8.c - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream -I$(srcdir)/packages/PLStream/windows $(srcdir)/packages/PLStream/pl-utf8.c -o $@ + $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-utf8.c -o $@ pl-write.o: $(srcdir)/packages/PLStream/pl-write.c - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream -I$(srcdir)/packages/PLStream/windows $(srcdir)/packages/PLStream/pl-write.c -o $@ + $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-write.c -o $@ pl-yap.o: $(srcdir)/packages/PLStream/pl-yap.c - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream -I$(srcdir)/packages/PLStream/windows $(srcdir)/packages/PLStream/pl-yap.c -o $@ + $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-yap.c -o $@ + +pl-tai.o: $(srcdir)/packages/PLStream/pl-tai.c + ( cd packages/PLStream/libtai ; make ) + $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-tai.c -o $@ uxnt.o: $(srcdir)/packages/PLStream/windows/uxnt.c - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream -I$(srcdir)/packages/PLStream/windows $(srcdir)/packages/PLStream/windows/uxnt.c -o $@ + $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/windows/uxnt.c -o $@ # default rule %.o : $(srcdir)/C/%.c config.h @@ -657,7 +672,6 @@ all: startup.yss @INSTALL_DLLS@ (cd packages/sgml; $(MAKE)) @USE_MINISAT@ (cd packages/CLPBN/clpbn/bp ; $(MAKE)) @USE_MINISAT@ (cd packages/swi-minisat2/C; $(MAKE)) - @INSTALL_DLLS@ (cd packages/tai; $(MAKE)) @INSTALL_DLLS@ (cd packages/zlib; $(MAKE)) @ENABLE_CPLINT@ (cd packages/cplint/approx/simplecuddLPADs; $(MAKE)) @ENABLE_CPLINT@ (cd packages/cplint; $(MAKE)) @@ -675,13 +689,13 @@ pl-yap@EXEC_SUFFIX@: $(PLCONS_OBJECTS) LGPL/swi_console/plterm.dll packages/PLST (cd LGPL/swi_console; $(MAKE)) $(MPI_CC) $(EXECUTABLE_CFLAGS) $(LDFLAGS) -o pl-yap $(PLCONS_OBJECTS) LGPL/swi_console/plterm.dll packages/PLSTream/libplstream.dll @YAPLIB@ $(LIBS) @MPI_LIBS@ -libYap.a: $(LIB_OBJECTS) +libYap.a: $(LIB_OBJECTS) -rm -f libYap.a - $(AR) rc libYap.a $(LIB_OBJECTS) + $(AR) rc libYap.a $(addprefix packages/PLStream/libtai/,$(LIBTAI_OBJECTS)) $(LIB_OBJECTS) $(RANLIB) libYap.a @DYNYAPLIB@: $(LIB_OBJECTS) - @YAPLIB_LD@ -o @YAPLIB@ $(LIB_OBJECTS) $(LIBS) $(LDFLAGS) $(SONAMEFLAG) + @YAPLIB_LD@ -o @YAPLIB@ packages/PLStream/libtai/libtai.a $(LIB_OBJECTS) $(LIBS) $(LDFLAGS) $(SONAMEFLAG) install: install_bin install_data @@ -713,7 +727,6 @@ install_unix: startup.yss libYap.a @INSTALL_DLLS@ (cd packages/sgml; $(MAKE) install) @INSTALL_DLLS@ (cd packages/RDF; $(MAKE) install) @INSTALL_DLLS@ (cd packages/semweb; $(MAKE) install) - @INSTALL_DLLS@ (cd packages/tai; $(MAKE) install) @INSTALL_DLLS@ (cd packages/zlib; $(MAKE) @ZLIB_INSTALL@) @INSTALL_DLLS@ (cd packages/CLPBN/clpbn/bp ; $(MAKE) install) @USE_MINISAT@ (cd packages/swi-minisat2/C; $(MAKE) install) @@ -759,7 +772,6 @@ install_win32: startup.yss @ENABLE_WINCONSOLE@ (cd LGPL/swi_console; $(MAKE) install) @INSTALL_MATLAB@ (cd library/matlab; $(MAKE) install) (cd library/tries; $(MAKE) install) - (cd packages/tai; $(MAKE) install) (cd packages/clib; $(MAKE) install) (cd packages/plunit; $(MAKE) install) (cd packages/http; $(MAKE) install) @@ -825,7 +837,7 @@ clean: clean_docs @INSTALL_DLLS@ (cd packages/sgml; $(MAKE) clean) @USE_MINISAT@ (cd packages/swi-minisat2; $(MAKE) clean) @USE_MINISAT@ (cd packages/CLPBN/clpbn/bp; $(MAKE) clean) - @INSTALL_DLLS@ (cd packages/tai; $(MAKE) clean) + @INSTALL_DLLS@ (cd packages/tai/libtai; $(MAKE) clean) @INSTALL_DLLS@ (cd packages/zlib; $(MAKE) clean) @ENABLE_CPLINT@ (cd packages/cplint/approx/simplecuddLPADs; $(MAKE) clean) @ENABLE_CPLINT@ (cd packages/cplint; $(MAKE) clean) diff --git a/config.guess b/config.guess old mode 100644 new mode 100755 diff --git a/config.sub b/config.sub old mode 100644 new mode 100755 diff --git a/configure b/configure index 933169468..a4d581bb5 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67. +# Generated by GNU Autoconf 2.68. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -89,6 +89,7 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -214,11 +215,18 @@ IFS=$as_save_IFS # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also # works around shells that cannot unset nonexistent variables. + # Preserve -v and -x to the replacement shell. BASH_ENV=/dev/null ENV=/dev/null (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; + esac + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} fi if test x$as_have_required = xno; then : @@ -611,6 +619,7 @@ USE_MINISAT CUDD_CPPFLAGS CUDD_LDFLAGS USE_CUDD +EXTRA_INCLUDES_FOR_WIN32 ENABLE_WINCONSOLE STATIC_MODE MAX_WORKERS @@ -801,6 +810,9 @@ LIBS CPPFLAGS CXX CXXFLAGS +LDFLAGS +LIBS +CPPFLAGS CCC CPP' @@ -1207,7 +1219,7 @@ Try \`$0 --help' for more information" $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; esac @@ -1543,7 +1555,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.67 +generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation @@ -1589,7 +1601,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_compile @@ -1627,7 +1639,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_cxx_try_compile @@ -1673,7 +1685,7 @@ fi # interfere with the next link command; also delete a directory that is # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_link @@ -1710,7 +1722,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_cpp @@ -1723,10 +1735,10 @@ fi ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval "test \"\${$3+set}\"" = set; then : + if eval \${$3+:} false; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -1789,7 +1801,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -1798,7 +1810,7 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_mongrel @@ -1839,7 +1851,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=$ac_status fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_run @@ -1853,7 +1865,7 @@ ac_fn_c_check_header_compile () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1871,7 +1883,7 @@ fi eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile @@ -1883,7 +1895,7 @@ ac_fn_c_check_func () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1938,7 +1950,7 @@ fi eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func @@ -2115,7 +2127,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ rm -f conftest.val fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_compute_int @@ -2129,7 +2141,7 @@ ac_fn_c_check_type () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else eval "$3=no" @@ -2170,7 +2182,7 @@ fi eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_type @@ -2183,7 +2195,7 @@ ac_fn_c_check_member () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 $as_echo_n "checking for $2.$3... " >&6; } -if eval "test \"\${$4+set}\"" = set; then : +if eval \${$4+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2227,7 +2239,7 @@ fi eval ac_res=\$$4 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_member cat >config.log <<_ACEOF @@ -2235,7 +2247,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.67. Invocation command line was +generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2493,7 +2505,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;} || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -2597,7 +2609,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2637,7 +2649,7 @@ if test -z "$ac_cv_prog_CC"; then set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2690,7 +2702,7 @@ if test -z "$CC"; then set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2730,7 +2742,7 @@ if test -z "$CC"; then set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2789,7 +2801,7 @@ if test -z "$CC"; then set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2833,7 +2845,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2888,7 +2900,7 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -3003,7 +3015,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $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 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -3046,7 +3058,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3105,7 +3117,7 @@ $as_echo "$ac_try_echo"; } >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi fi fi @@ -3116,7 +3128,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if test "${ac_cv_objext+set}" = set; then : +if ${ac_cv_objext+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3157,7 +3169,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -3167,7 +3179,7 @@ OBJEXT=$ac_cv_objext ac_objext=$OBJEXT { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then : +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3204,7 +3216,7 @@ ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then : +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -3282,7 +3294,7 @@ else fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then : +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -3393,7 +3405,7 @@ if test -z "$CXX"; then set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CXX+set}" = set; then : +if ${ac_cv_prog_CXX+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CXX"; then @@ -3437,7 +3449,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : +if ${ac_cv_prog_ac_ct_CXX+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CXX"; then @@ -3515,7 +3527,7 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : +if ${ac_cv_cxx_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3552,7 +3564,7 @@ ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 $as_echo_n "checking whether $CXX accepts -g... " >&6; } -if test "${ac_cv_prog_cxx_g+set}" = set; then : +if ${ac_cv_prog_cxx_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_cxx_werror_flag=$ac_cxx_werror_flag @@ -3640,7 +3652,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then : +if ${ac_cv_prog_AWK+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then @@ -4203,7 +4215,7 @@ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then : +if ${ac_cv_build+:} false; then : $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias @@ -4219,7 +4231,7 @@ fi $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -4237,7 +4249,7 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then : +if ${ac_cv_host+:} false; then : $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then @@ -4252,7 +4264,7 @@ fi $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -4270,7 +4282,7 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 $as_echo_n "checking target system type... " >&6; } -if test "${ac_cv_target+set}" = set; then : +if ${ac_cv_target+:} false; then : $as_echo_n "(cached) " >&6 else if test "x$target_alias" = x; then @@ -4285,7 +4297,7 @@ fi $as_echo "$ac_cv_target" >&6; } case $ac_cv_target in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;; +*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; esac target=$ac_cv_target ac_save_IFS=$IFS; IFS='-' @@ -4514,7 +4526,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then : +if ${ac_cv_path_install+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -4595,7 +4607,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}ranlib; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_RANLIB+set}" = set; then : +if ${ac_cv_prog_RANLIB+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then @@ -4635,7 +4647,7 @@ if test -z "$ac_cv_prog_RANLIB"; then set dummy ranlib; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then @@ -4687,7 +4699,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}indent; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_INDENT+set}" = set; then : +if ${ac_cv_prog_INDENT+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$INDENT"; then @@ -4727,7 +4739,7 @@ if test -z "$ac_cv_prog_INDENT"; then set dummy indent; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_INDENT+set}" = set; then : +if ${ac_cv_prog_ac_ct_INDENT+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_INDENT"; then @@ -4779,7 +4791,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}ar; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AR+set}" = set; then : +if ${ac_cv_prog_AR+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$AR"; then @@ -4819,7 +4831,7 @@ if test -z "$ac_cv_prog_AR"; then set dummy ar; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : +if ${ac_cv_prog_ac_ct_AR+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AR"; then @@ -4871,7 +4883,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}mpicc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_MPI_CC+set}" = set; then : +if ${ac_cv_prog_MPI_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$MPI_CC"; then @@ -4911,7 +4923,7 @@ if test -z "$ac_cv_prog_MPI_CC"; then set dummy mpicc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_MPI_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_MPI_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_MPI_CC"; then @@ -4962,7 +4974,7 @@ fi set dummy install-info; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_INSTALL_INFO+set}" = set; then : +if ${ac_cv_path_INSTALL_INFO+:} false; then : $as_echo_n "(cached) " >&6 else case $INSTALL_INFO in @@ -5004,7 +5016,7 @@ fi set dummy sh; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_SHELL+set}" = set; then : +if ${ac_cv_path_SHELL+:} false; then : $as_echo_n "(cached) " >&6 else case $SHELL in @@ -5051,7 +5063,7 @@ then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lws2_32" >&5 $as_echo_n "checking for main in -lws2_32... " >&6; } -if test "${ac_cv_lib_ws2_32_main+set}" = set; then : +if ${ac_cv_lib_ws2_32_main+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -5079,7 +5091,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ws2_32_main" >&5 $as_echo "$ac_cv_lib_ws2_32_main" >&6; } -if test "x$ac_cv_lib_ws2_32_main" = x""yes; then : +if test "x$ac_cv_lib_ws2_32_main" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBWS2_32 1 _ACEOF @@ -5089,13 +5101,14 @@ _ACEOF fi EXTRA_LIBS_FOR_DLLS="-lws2_32 \$(abs_top_builddir)/yap.dll" + EXTRA_INCLUDES_FOR_WIN32="-I\$(srcdir)/packages/PLStream/windows" elif test "$target_os" = "cygwin" then CC="${CC} -mno-cygwin" CXX="${CXX} -mno-cygwin" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lwsock32" >&5 $as_echo_n "checking for main in -lwsock32... " >&6; } -if test "${ac_cv_lib_wsock32_main+set}" = set; then : +if ${ac_cv_lib_wsock32_main+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -5123,7 +5136,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wsock32_main" >&5 $as_echo "$ac_cv_lib_wsock32_main" >&6; } -if test "x$ac_cv_lib_wsock32_main" = x""yes; then : +if test "x$ac_cv_lib_wsock32_main" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBWSOCK32 1 _ACEOF @@ -5133,10 +5146,11 @@ _ACEOF fi EXTRA_LIBS_FOR_DLLS="\$(abs_top_builddir)/yap.dll" + EXTRA_INCLUDES_FOR_WIN32="-I\$(srcdir)/packages/PLStream/windows" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lwsock32" >&5 $as_echo_n "checking for main in -lwsock32... " >&6; } -if test "${ac_cv_lib_wsock32_main+set}" = set; then : +if ${ac_cv_lib_wsock32_main+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -5164,7 +5178,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wsock32_main" >&5 $as_echo "$ac_cv_lib_wsock32_main" >&6; } -if test "x$ac_cv_lib_wsock32_main" = x""yes; then : +if test "x$ac_cv_lib_wsock32_main" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBWSOCK32 1 _ACEOF @@ -5177,7 +5191,7 @@ fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lpsapi" >&5 $as_echo_n "checking for main in -lpsapi... " >&6; } -if test "${ac_cv_lib_psapi_main+set}" = set; then : +if ${ac_cv_lib_psapi_main+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -5205,7 +5219,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_psapi_main" >&5 $as_echo "$ac_cv_lib_psapi_main" >&6; } -if test "x$ac_cv_lib_psapi_main" = x""yes; then : +if test "x$ac_cv_lib_psapi_main" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBPSAPI 1 _ACEOF @@ -5235,13 +5249,14 @@ fi ENABLE_WINCONSOLE="#" LIBS="-lcygwin" EXTRA_LIBS_FOR_DLLS="\$(abs_top_builddir)/yap.dll" + EXTRA_INCLUDES_FOR_WIN32="-I\$(srcdir)/packages/PLStream/windows" fi else INSTALL_COMMAND="install_unix" ENABLE_WINCONSOLE="#" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin in -lm" >&5 $as_echo_n "checking for sin in -lm... " >&6; } -if test "${ac_cv_lib_m_sin+set}" = set; then : +if ${ac_cv_lib_m_sin+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -5275,7 +5290,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sin" >&5 $as_echo "$ac_cv_lib_m_sin" >&6; } -if test "x$ac_cv_lib_m_sin" = x""yes; then : +if test "x$ac_cv_lib_m_sin" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBM 1 _ACEOF @@ -5286,7 +5301,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5 $as_echo_n "checking for socket in -lsocket... " >&6; } -if test "${ac_cv_lib_socket_socket+set}" = set; then : +if ${ac_cv_lib_socket_socket+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -5320,7 +5335,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5 $as_echo "$ac_cv_lib_socket_socket" >&6; } -if test "x$ac_cv_lib_socket_socket" = x""yes; then : +if test "x$ac_cv_lib_socket_socket" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBSOCKET 1 _ACEOF @@ -5331,7 +5346,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getsockname in -lxnet" >&5 $as_echo_n "checking for getsockname in -lxnet... " >&6; } -if test "${ac_cv_lib_xnet_getsockname+set}" = set; then : +if ${ac_cv_lib_xnet_getsockname+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -5365,7 +5380,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xnet_getsockname" >&5 $as_echo "$ac_cv_lib_xnet_getsockname" >&6; } -if test "x$ac_cv_lib_xnet_getsockname" = x""yes; then : +if test "x$ac_cv_lib_xnet_getsockname" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBXNET 1 _ACEOF @@ -5376,7 +5391,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lstdc++" >&5 $as_echo_n "checking for main in -lstdc++... " >&6; } -if test "${ac_cv_lib_stdcpp_main+set}" = set; then : +if ${ac_cv_lib_stdcpp_main+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -5404,7 +5419,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_stdcpp_main" >&5 $as_echo "$ac_cv_lib_stdcpp_main" >&6; } -if test "x$ac_cv_lib_stdcpp_main" = x""yes; then : +if test "x$ac_cv_lib_stdcpp_main" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBSTDC__ 1 _ACEOF @@ -5415,7 +5430,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lnsl" >&5 $as_echo_n "checking for main in -lnsl... " >&6; } -if test "${ac_cv_lib_nsl_main+set}" = set; then : +if ${ac_cv_lib_nsl_main+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -5443,7 +5458,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_main" >&5 $as_echo "$ac_cv_lib_nsl_main" >&6; } -if test "x$ac_cv_lib_nsl_main" = x""yes; then : +if test "x$ac_cv_lib_nsl_main" = xyes; then : have_nsl=yes else @@ -5452,7 +5467,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lcrypt" >&5 $as_echo_n "checking for main in -lcrypt... " >&6; } -if test "${ac_cv_lib_crypt_main+set}" = set; then : +if ${ac_cv_lib_crypt_main+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -5480,7 +5495,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_main" >&5 $as_echo "$ac_cv_lib_crypt_main" >&6; } -if test "x$ac_cv_lib_crypt_main" = x""yes; then : +if test "x$ac_cv_lib_crypt_main" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBCRYPT 1 _ACEOF @@ -5491,7 +5506,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lnss_files" >&5 $as_echo_n "checking for main in -lnss_files... " >&6; } -if test "${ac_cv_lib_nss_files_main+set}" = set; then : +if ${ac_cv_lib_nss_files_main+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -5519,7 +5534,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nss_files_main" >&5 $as_echo "$ac_cv_lib_nss_files_main" >&6; } -if test "x$ac_cv_lib_nss_files_main" = x""yes; then : +if test "x$ac_cv_lib_nss_files_main" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBNSS_FILES 1 _ACEOF @@ -5530,7 +5545,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lnss_dns" >&5 $as_echo_n "checking for main in -lnss_dns... " >&6; } -if test "${ac_cv_lib_nss_dns_main+set}" = set; then : +if ${ac_cv_lib_nss_dns_main+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -5558,7 +5573,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nss_dns_main" >&5 $as_echo "$ac_cv_lib_nss_dns_main" >&6; } -if test "x$ac_cv_lib_nss_dns_main" = x""yes; then : +if test "x$ac_cv_lib_nss_dns_main" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBNSS_DNS 1 _ACEOF @@ -5569,7 +5584,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lresolv" >&5 $as_echo_n "checking for main in -lresolv... " >&6; } -if test "${ac_cv_lib_resolv_main+set}" = set; then : +if ${ac_cv_lib_resolv_main+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -5597,7 +5612,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_main" >&5 $as_echo "$ac_cv_lib_resolv_main" >&6; } -if test "x$ac_cv_lib_resolv_main" = x""yes; then : +if test "x$ac_cv_lib_resolv_main" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBRESOLV 1 _ACEOF @@ -5612,7 +5627,7 @@ if test "$yap_cv_readline" != "no" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lreadline" >&5 $as_echo_n "checking for main in -lreadline... " >&6; } -if test "${ac_cv_lib_readline_main+set}" = set; then : +if ${ac_cv_lib_readline_main+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -5640,7 +5655,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_main" >&5 $as_echo "$ac_cv_lib_readline_main" >&6; } -if test "x$ac_cv_lib_readline_main" = x""yes; then : +if test "x$ac_cv_lib_readline_main" = xyes; then : $as_echo "#define HAVE_LIBREADLINE 1" >>confdefs.h @@ -5652,7 +5667,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "--with-readline was given, but test for readline failed -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi fi @@ -5662,7 +5677,7 @@ if test "$yap_cv_gmp" != "no" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgmp" >&5 $as_echo_n "checking for main in -lgmp... " >&6; } -if test "${ac_cv_lib_gmp_main+set}" = set; then : +if ${ac_cv_lib_gmp_main+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -5690,7 +5705,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gmp_main" >&5 $as_echo "$ac_cv_lib_gmp_main" >&6; } -if test "x$ac_cv_lib_gmp_main" = x""yes; then : +if test "x$ac_cv_lib_gmp_main" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBGMP 1 _ACEOF @@ -5704,7 +5719,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlibVersion in -lz" >&5 $as_echo_n "checking for zlibVersion in -lz... " >&6; } -if test "${ac_cv_lib_z_zlibVersion+set}" = set; then : +if ${ac_cv_lib_z_zlibVersion+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -5738,7 +5753,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_zlibVersion" >&5 $as_echo "$ac_cv_lib_z_zlibVersion" >&6; } -if test "x$ac_cv_lib_z_zlibVersion" = x""yes; then : +if test "x$ac_cv_lib_z_zlibVersion" = xyes; then : ZLIBS="-lz" ZLIB=yes else @@ -5754,7 +5769,7 @@ if test "$yap_cv_myddas" != "no" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lmysqlclient" >&5 $as_echo_n "checking for main in -lmysqlclient... " >&6; } - if test "${yap_cv_mysql+set}" = set; then : + if ${yap_cv_mysql+:} false; then : $as_echo_n "(cached) " >&6 else @@ -5791,7 +5806,7 @@ $as_echo "$yap_cv_mysql" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lodbc" >&5 $as_echo_n "checking for main in -lodbc... " >&6; } - if test "${yap_cv_odbc+set}" = set; then : + if ${yap_cv_odbc+:} false; then : $as_echo_n "(cached) " >&6 else @@ -5852,7 +5867,7 @@ then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5 $as_echo_n "checking for pthread_create in -lpthread... " >&6; } -if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then : +if ${ac_cv_lib_pthread_pthread_create+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -5886,7 +5901,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5 $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; } -if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then : +if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBPTHREAD 1 _ACEOF @@ -5907,7 +5922,7 @@ if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then : + if ${ac_cv_prog_CPP+:} false; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -6023,7 +6038,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -6035,7 +6050,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if test "${ac_cv_path_GREP+set}" = set; then : +if ${ac_cv_path_GREP+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -6098,7 +6113,7 @@ $as_echo "$ac_cv_path_GREP" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then : +if ${ac_cv_path_EGREP+:} false; then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -6165,7 +6180,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then : +if ${ac_cv_header_stdc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -6295,7 +6310,7 @@ done for ac_header in pthread.h do : ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default" -if test "x$ac_cv_header_pthread_h" = x""yes; then : +if test "x$ac_cv_header_pthread_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_PTHREAD_H 1 _ACEOF @@ -6416,7 +6431,7 @@ then CC=${MPI_CC} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPI_Init in -lmpi" >&5 $as_echo_n "checking for MPI_Init in -lmpi... " >&6; } -if test "${ac_cv_lib_mpi_MPI_Init+set}" = set; then : +if ${ac_cv_lib_mpi_MPI_Init+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -6450,7 +6465,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mpi_MPI_Init" >&5 $as_echo "$ac_cv_lib_mpi_MPI_Init" >&6; } -if test "x$ac_cv_lib_mpi_MPI_Init" = x""yes; then : +if test "x$ac_cv_lib_mpi_MPI_Init" = xyes; then : $as_echo "#define HAVE_LIBMPI 1" >>confdefs.h else @@ -6465,7 +6480,7 @@ fi else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPI_Init in -lmpich" >&5 $as_echo_n "checking for MPI_Init in -lmpich... " >&6; } -if test "${ac_cv_lib_mpich_MPI_Init+set}" = set; then : +if ${ac_cv_lib_mpich_MPI_Init+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -6499,7 +6514,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mpich_MPI_Init" >&5 $as_echo "$ac_cv_lib_mpich_MPI_Init" >&6; } -if test "x$ac_cv_lib_mpich_MPI_Init" = x""yes; then : +if test "x$ac_cv_lib_mpich_MPI_Init" = xyes; then : $as_echo "#define HAVE_LIBMPICH 1" >>confdefs.h else @@ -6530,7 +6545,7 @@ then CC=${MPI_CC} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPE_Init_log in -lmpe" >&5 $as_echo_n "checking for MPE_Init_log in -lmpe... " >&6; } -if test "${ac_cv_lib_mpe_MPE_Init_log+set}" = set; then : +if ${ac_cv_lib_mpe_MPE_Init_log+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -6564,7 +6579,7 @@ LIBS=$ac_check_lib_save_LIBS 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" = x""yes; then : +if test "x$ac_cv_lib_mpe_MPE_Init_log" = xyes; then : $as_echo "#define HAVE_LIBMPE 1" >>confdefs.h else @@ -6592,7 +6607,7 @@ if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then : + if ${ac_cv_prog_CPP+:} false; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -6708,7 +6723,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -6724,7 +6739,7 @@ then 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 test "${ac_cv_header_sys_wait_h+set}" = set; then : +if ${ac_cv_header_sys_wait_h+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -6765,14 +6780,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for restartable system calls" >&5 $as_echo_n "checking for restartable system calls... " >&6; } -if test "${ac_cv_sys_restartable_syscalls+set}" = set; then : +if ${ac_cv_sys_restartable_syscalls+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = 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 $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -6854,7 +6869,7 @@ case "$target_os" in then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then : +if ${ac_cv_lib_dl_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -6888,7 +6903,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : have_dl=yes else @@ -7020,7 +7035,7 @@ fi then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then : +if ${ac_cv_lib_dl_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -7054,7 +7069,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : have_dl=yes else @@ -7092,7 +7107,7 @@ fi then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then : +if ${ac_cv_lib_dl_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -7126,7 +7141,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : have_dl=yes else @@ -7243,7 +7258,7 @@ fi *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then : +if ${ac_cv_lib_dl_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -7277,7 +7292,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : have_dl=yes else @@ -7438,7 +7453,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlibVersion in -lz" >&5 $as_echo_n "checking for zlibVersion in -lz... " >&6; } -if test "${ac_cv_lib_z_zlibVersion+set}" = set; then : +if ${ac_cv_lib_z_zlibVersion+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -7472,7 +7487,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_zlibVersion" >&5 $as_echo "$ac_cv_lib_z_zlibVersion" >&6; } -if test "x$ac_cv_lib_z_zlibVersion" = x""yes; then : +if test "x$ac_cv_lib_z_zlibVersion" = xyes; then : ZLIBS="-lz" ZLIB=yes else @@ -7508,7 +7523,7 @@ OLD_CC=${CC} CC=${LAM_MPI_CC} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -llam" >&5 $as_echo_n "checking for main in -llam... " >&6; } -if test "${ac_cv_lib_lam_main+set}" = set; then : +if ${ac_cv_lib_lam_main+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -7536,7 +7551,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lam_main" >&5 $as_echo "$ac_cv_lib_lam_main" >&6; } -if test "x$ac_cv_lib_lam_main" = x""yes; then : +if test "x$ac_cv_lib_lam_main" = xyes; then : LAMOBJS=yap_mpi."$SO" else LAMOBJS=no @@ -7546,7 +7561,7 @@ CC=${OLD_CC} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then : +if ${ac_cv_header_stdc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -7658,7 +7673,7 @@ fi { $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 test "${ac_cv_header_sys_wait_h+set}" = set; then : +if ${ac_cv_header_sys_wait_h+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -7895,7 +7910,7 @@ done for ac_header in mach-o/dyld.h do : ac_fn_c_check_header_mongrel "$LINENO" "mach-o/dyld.h" "ac_cv_header_mach_o_dyld_h" "$ac_includes_default" -if test "x$ac_cv_header_mach_o_dyld_h" = x""yes; then : +if test "x$ac_cv_header_mach_o_dyld_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_MACH_O_DYLD_H 1 _ACEOF @@ -7909,7 +7924,7 @@ then for ac_header in gmp.h do : ac_fn_c_check_header_mongrel "$LINENO" "gmp.h" "ac_cv_header_gmp_h" "$ac_includes_default" -if test "x$ac_cv_header_gmp_h" = x""yes; then : +if test "x$ac_cv_header_gmp_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_GMP_H 1 _ACEOF @@ -7924,7 +7939,7 @@ then for ac_header in cudd.h do : ac_fn_c_check_header_mongrel "$LINENO" "cudd.h" "ac_cv_header_cudd_h" "$ac_includes_default" -if test "x$ac_cv_header_cudd_h" = x""yes; then : +if test "x$ac_cv_header_cudd_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_CUDD_H 1 _ACEOF @@ -7939,7 +7954,7 @@ then for ac_header in mysql/mysql.h do : ac_fn_c_check_header_mongrel "$LINENO" "mysql/mysql.h" "ac_cv_header_mysql_mysql_h" "$ac_includes_default" -if test "x$ac_cv_header_mysql_mysql_h" = x""yes; then : +if test "x$ac_cv_header_mysql_mysql_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_MYSQL_MYSQL_H 1 _ACEOF @@ -7954,7 +7969,7 @@ then for ac_header in readline/readline.h do : ac_fn_c_check_header_mongrel "$LINENO" "readline/readline.h" "ac_cv_header_readline_readline_h" "$ac_includes_default" -if test "x$ac_cv_header_readline_readline_h" = x""yes; then : +if test "x$ac_cv_header_readline_readline_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_READLINE_READLINE_H 1 _ACEOF @@ -7966,7 +7981,7 @@ done for ac_header in readline/history.h do : ac_fn_c_check_header_mongrel "$LINENO" "readline/history.h" "ac_cv_header_readline_history_h" "$ac_includes_default" -if test "x$ac_cv_header_readline_history_h" = x""yes; then : +if test "x$ac_cv_header_readline_history_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_READLINE_HISTORY_H 1 _ACEOF @@ -7991,7 +8006,7 @@ fi for ac_header in mpi.h do : ac_fn_c_check_header_mongrel "$LINENO" "mpi.h" "ac_cv_header_mpi_h" "$ac_includes_default" -if test "x$ac_cv_header_mpi_h" = x""yes; then : +if test "x$ac_cv_header_mpi_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_MPI_H 1 _ACEOF @@ -8003,7 +8018,7 @@ done for ac_header in mpe.h do : ac_fn_c_check_header_mongrel "$LINENO" "mpe.h" "ac_cv_header_mpe_h" "$ac_includes_default" -if test "x$ac_cv_header_mpe_h" = x""yes; then : +if test "x$ac_cv_header_mpe_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_MPE_H 1 _ACEOF @@ -8015,7 +8030,7 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 $as_echo_n "checking for inline... " >&6; } -if test "${ac_cv_c_inline+set}" = set; then : +if ${ac_cv_c_inline+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_c_inline=no @@ -8057,7 +8072,7 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5 $as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; } -if test "${ac_cv_struct_tm+set}" = set; then : +if ${ac_cv_struct_tm+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -8096,7 +8111,7 @@ fi # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int *" >&5 $as_echo_n "checking size of int *... " >&6; } -if test "${ac_cv_sizeof_int_p+set}" = set; then : +if ${ac_cv_sizeof_int_p+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int *))" "ac_cv_sizeof_int_p" "$ac_includes_default"; then : @@ -8106,7 +8121,7 @@ else { { $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 (int *) -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_int_p=0 fi @@ -8129,7 +8144,7 @@ _ACEOF # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short int" >&5 $as_echo_n "checking size of short int... " >&6; } -if test "${ac_cv_sizeof_short_int+set}" = set; then : +if ${ac_cv_sizeof_short_int+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short int))" "ac_cv_sizeof_short_int" "$ac_includes_default"; then : @@ -8139,7 +8154,7 @@ else { { $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 (short int) -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_short_int=0 fi @@ -8162,7 +8177,7 @@ _ACEOF # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 $as_echo_n "checking size of int... " >&6; } -if test "${ac_cv_sizeof_int+set}" = set; then : +if ${ac_cv_sizeof_int+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then : @@ -8172,7 +8187,7 @@ else { { $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 (int) -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_int=0 fi @@ -8195,7 +8210,7 @@ _ACEOF # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long int" >&5 $as_echo_n "checking size of long int... " >&6; } -if test "${ac_cv_sizeof_long_int+set}" = set; then : +if ${ac_cv_sizeof_long_int+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long int))" "ac_cv_sizeof_long_int" "$ac_includes_default"; then : @@ -8205,7 +8220,7 @@ else { { $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 (long int) -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_long_int=0 fi @@ -8228,7 +8243,7 @@ _ACEOF # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long int" >&5 $as_echo_n "checking size of long long int... " >&6; } -if test "${ac_cv_sizeof_long_long_int+set}" = set; then : +if ${ac_cv_sizeof_long_long_int+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long int))" "ac_cv_sizeof_long_long_int" "$ac_includes_default"; then : @@ -8238,7 +8253,7 @@ else { { $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 (long long int) -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_long_long_int=0 fi @@ -8261,7 +8276,7 @@ _ACEOF # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of float" >&5 $as_echo_n "checking size of float... " >&6; } -if test "${ac_cv_sizeof_float+set}" = set; then : +if ${ac_cv_sizeof_float+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (float))" "ac_cv_sizeof_float" "$ac_includes_default"; then : @@ -8271,7 +8286,7 @@ else { { $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 (float) -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_float=0 fi @@ -8294,7 +8309,7 @@ _ACEOF # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of double" >&5 $as_echo_n "checking size of double... " >&6; } -if test "${ac_cv_sizeof_double+set}" = set; then : +if ${ac_cv_sizeof_double+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (double))" "ac_cv_sizeof_double" "$ac_includes_default"; then : @@ -8304,7 +8319,7 @@ else { { $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 (double) -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_double=0 fi @@ -8324,7 +8339,7 @@ _ACEOF { $as_echo "$as_me:${as_lineno-$LINENO}: checking for type of malloc" >&5 $as_echo_n "checking for type of malloc... " >&6; } -if test "${yap_cv_malloct+set}" = set; then : +if ${yap_cv_malloct+:} false; then : $as_echo_n "(cached) " >&6 else @@ -8364,7 +8379,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc inline" >&5 $as_echo_n "checking for gcc inline... " >&6; } -if test "${yap_cv_gcc+set}" = set; then : +if ${yap_cv_gcc+:} false; then : $as_echo_n "(cached) " >&6 else @@ -8468,11 +8483,12 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc threaded code" >&5 $as_echo_n "checking for gcc threaded code... " >&6; } -if test "${yap_cv_threaded_code+set}" = set; then : +if ${yap_cv_threaded_code+:} false; then : $as_echo_n "(cached) " >&6 else @@ -8517,7 +8533,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IEEE floats" >&5 $as_echo_n "checking for IEEE floats... " >&6; } -if test "${yap_cv_ffieee+set}" = set; then : +if ${yap_cv_ffieee+:} false; then : $as_echo_n "(cached) " >&6 else @@ -8558,7 +8574,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigsetjmp" >&5 $as_echo_n "checking for sigsetjmp... " >&6; } -if test "${yap_cv_sigsetjmp+set}" = set; then : +if ${yap_cv_sigsetjmp+:} false; then : $as_echo_n "(cached) " >&6 else @@ -8598,7 +8614,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigsegv" >&5 $as_echo_n "checking for sigsegv... " >&6; } -if test "${yap_cv_sigsegv+set}" = set; then : +if ${yap_cv_sigsegv+:} false; then : $as_echo_n "(cached) " >&6 else @@ -8637,7 +8653,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigprof" >&5 $as_echo_n "checking for sigprof... " >&6; } -if test "${yap_cv_sigprof+set}" = set; then : +if ${yap_cv_sigprof+:} false; then : $as_echo_n "(cached) " >&6 else @@ -8676,7 +8692,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for siginfo" >&5 $as_echo_n "checking for siginfo... " >&6; } -if test "${yap_cv_siginfo+set}" = set; then : +if ${yap_cv_siginfo+:} false; then : $as_echo_n "(cached) " >&6 else @@ -8777,7 +8793,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 $as_echo_n "checking return type of signal handlers... " >&6; } -if test "${ac_cv_type_signal+set}" = set; then : +if ${ac_cv_type_signal+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -8919,7 +8935,7 @@ done for ac_func in mbscoll do : ac_fn_c_check_func "$LINENO" "mbscoll" "ac_cv_func_mbscoll" -if test "x$ac_cv_func_mbscoll" = x""yes; then : +if test "x$ac_cv_func_mbscoll" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_MBSCOLL 1 _ACEOF @@ -8930,7 +8946,7 @@ done for ac_func in mbscasecoll do : ac_fn_c_check_func "$LINENO" "mbscasecoll" "ac_cv_func_mbscasecoll" -if test "x$ac_cv_func_mbscasecoll" = x""yes; then : +if test "x$ac_cv_func_mbscasecoll" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_MBSCASECOLL 1 _ACEOF @@ -8941,7 +8957,7 @@ done for ac_func in mbsnrtowcs do : ac_fn_c_check_func "$LINENO" "mbsnrtowcs" "ac_cv_func_mbsnrtowcs" -if test "x$ac_cv_func_mbsnrtowcs" = x""yes; then : +if test "x$ac_cv_func_mbsnrtowcs" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_MBSNRTOWCS 1 _ACEOF @@ -9059,7 +9075,7 @@ done ac_fn_c_check_func "$LINENO" "regexec" "ac_cv_func_regexec" -if test "x$ac_cv_func_regexec" = x""yes; then : +if test "x$ac_cv_func_regexec" = xyes; then : NO_BUILTIN_REGEXP="#" else NO_BUILTIN_REGEXP="" @@ -9069,7 +9085,7 @@ fi for ac_func in NSLinkModule do : ac_fn_c_check_func "$LINENO" "NSLinkModule" "ac_cv_func_NSLinkModule" -if test "x$ac_cv_func_NSLinkModule" = x""yes; then : +if test "x$ac_cv_func_NSLinkModule" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_NSLINKMODULE 1 _ACEOF @@ -9112,7 +9128,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mpz_xor" >&5 $as_echo_n "checking for mpz_xor... " >&6; } -if test "${yap_cv_mpz_xor+set}" = set; then : +if ${yap_cv_mpz_xor+:} false; then : $as_echo_n "(cached) " >&6 else @@ -9158,7 +9174,7 @@ 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 test "${yap_cv_broken_fflush_null+set}" = set; then : +if ${yap_cv_broken_fflush_null+:} false; then : $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <&5 $as_echo_n "checking for socket in -lsocket... " >&6; } -if test "${ac_cv_lib_socket_socket+set}" = set; then : +if ${ac_cv_lib_socket_socket+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -9309,7 +9325,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5 $as_echo "$ac_cv_lib_socket_socket" >&6; } -if test "x$ac_cv_lib_socket_socket" = x""yes; then : +if test "x$ac_cv_lib_socket_socket" = xyes; then : CLIB_NETLIBS="$CLIB_NETLIBS -lsocket" $as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h @@ -9319,13 +9335,13 @@ fi fi ac_fn_c_check_func "$LINENO" "gethostent" "ac_cv_func_gethostent" -if test "x$ac_cv_func_gethostent" = x""yes; then : +if test "x$ac_cv_func_gethostent" = xyes; then : else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostent in -lnsl" >&5 $as_echo_n "checking for gethostent in -lnsl... " >&6; } -if test "${ac_cv_lib_nsl_gethostent+set}" = set; then : +if ${ac_cv_lib_nsl_gethostent+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -9359,7 +9375,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostent" >&5 $as_echo "$ac_cv_lib_nsl_gethostent" >&6; } -if test "x$ac_cv_lib_nsl_gethostent" = x""yes; then : +if test "x$ac_cv_lib_nsl_gethostent" = xyes; then : CLIB_NETLIBS="$CLIB_NETLIBS -lnsl" $as_echo "#define HAVE_LIBNSL 1" >>confdefs.h @@ -9372,7 +9388,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5 $as_echo_n "checking for pthread_create in -lpthread... " >&6; } -if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then : +if ${ac_cv_lib_pthread_pthread_create+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -9406,7 +9422,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5 $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; } -if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then : +if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then : CLIB_PTHREADS="-lpthread" else CLIB_PTHREADS="" @@ -9416,7 +9432,7 @@ fi oldlibs="$LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5 $as_echo_n "checking for crypt in -lcrypt... " >&6; } -if test "${ac_cv_lib_crypt_crypt+set}" = set; then : +if ${ac_cv_lib_crypt_crypt+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -9450,7 +9466,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5 $as_echo "$ac_cv_lib_crypt_crypt" >&6; } -if test "x$ac_cv_lib_crypt_crypt" = x""yes; then : +if test "x$ac_cv_lib_crypt_crypt" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBCRYPT 1 _ACEOF @@ -9463,7 +9479,7 @@ CLIB_CRYPTLIBS="$LIBS" for ac_func in crypt do : ac_fn_c_check_func "$LINENO" "crypt" "ac_cv_func_crypt" -if test "x$ac_cv_func_crypt" = x""yes; then : +if test "x$ac_cv_func_crypt" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_CRYPT 1 _ACEOF @@ -9484,7 +9500,7 @@ ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" " #include " -if test "x$ac_cv_type_socklen_t" = x""yes; then : +if test "x$ac_cv_type_socklen_t" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_SOCKLEN_T 1 @@ -9498,7 +9514,7 @@ ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" " #include " -if test "x$ac_cv_type_ssize_t" = x""yes; then : +if test "x$ac_cv_type_ssize_t" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_SSIZE_T 1 @@ -9553,7 +9569,7 @@ fi ac_fn_c_check_member "$LINENO" "struct tm" "tm_gmtoff" "ac_cv_member_struct_tm_tm_gmtoff" "#include " -if test "x$ac_cv_member_struct_tm_tm_gmtoff" = x""yes; then : +if test "x$ac_cv_member_struct_tm_tm_gmtoff" = xyes; then : $as_echo "#define HAVE_STRUCT_TIME_TM_GMTOFF /**/" >>confdefs.h @@ -9637,8 +9653,8 @@ mkdir -p packages/jpl/src/java/jpl/test mkdir -p packages/jpl/examples mkdir -p packages/jpl/examples/java mkdir -p packages/meld -mkdir -p packages/tai -mkdir -p packages/tai/libtai +mkdir -p packages/PLStream +mkdir -p packages/PLStream/libtai mkdir -p packages/plunit mkdir -p packages/ProbLog mkdir -p packages/ProbLog/simplecudd @@ -9699,9 +9715,7 @@ ac_config_files="$ac_config_files packages/http/Makefile" ac_config_files="$ac_config_files packages/meld/Makefile" -ac_config_files="$ac_config_files packages/tai/Makefile" - -ac_config_files="$ac_config_files packages/tai/libtai/Makefile" +ac_config_files="$ac_config_files packages/PLStream/libtai/Makefile" ac_config_files="$ac_config_files packages/plunit/Makefile" @@ -9807,10 +9821,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && + if test "x$cache_file" != "x/dev/null"; then { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi else { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} @@ -9842,7 +9867,7 @@ LTLIBOBJS=$ac_ltlibobjs -: ${CONFIG_STATUS=./config.status} +: "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" @@ -9943,6 +9968,7 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -10250,7 +10276,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.67. Invocation command line was +generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -10312,7 +10338,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.67, +configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" Copyright (C) 2010 Free Software Foundation, Inc. @@ -10461,8 +10487,7 @@ do "packages/cplint/approx/simplecuddLPADs/Makefile") CONFIG_FILES="$CONFIG_FILES packages/cplint/approx/simplecuddLPADs/Makefile" ;; "packages/http/Makefile") CONFIG_FILES="$CONFIG_FILES packages/http/Makefile" ;; "packages/meld/Makefile") CONFIG_FILES="$CONFIG_FILES packages/meld/Makefile" ;; - "packages/tai/Makefile") CONFIG_FILES="$CONFIG_FILES packages/tai/Makefile" ;; - "packages/tai/libtai/Makefile") CONFIG_FILES="$CONFIG_FILES packages/tai/libtai/Makefile" ;; + "packages/PLStream/libtai/Makefile") CONFIG_FILES="$CONFIG_FILES packages/PLStream/libtai/Makefile" ;; "packages/plunit/Makefile") CONFIG_FILES="$CONFIG_FILES packages/plunit/Makefile" ;; "packages/ProbLog/Makefile") CONFIG_FILES="$CONFIG_FILES packages/ProbLog/Makefile" ;; "packages/RDF/Makefile") CONFIG_FILES="$CONFIG_FILES packages/RDF/Makefile" ;; @@ -10479,7 +10504,7 @@ do "packages/swi-minisat2/Makefile") CONFIG_FILES="$CONFIG_FILES packages/swi-minisat2/Makefile" ;; "packages/swi-minisat2/C/Makefile") CONFIG_FILES="$CONFIG_FILES packages/swi-minisat2/C/Makefile" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -10501,9 +10526,10 @@ fi # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= + tmp= ac_tmp= trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status ' 0 trap 'as_fn_exit 1' 1 2 13 15 } @@ -10511,12 +10537,13 @@ $debug || { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" + test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -10538,7 +10565,7 @@ else ac_cs_awk_cr=$ac_cr fi -echo 'BEGIN {' >"$tmp/subs1.awk" && +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && _ACEOF @@ -10566,7 +10593,7 @@ done rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -10614,7 +10641,7 @@ t delim rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK -cat >>"\$tmp/subs1.awk" <<_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -10646,7 +10673,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF @@ -10680,7 +10707,7 @@ fi # test -n "$CONFIG_FILES" # No need to generate them if there are no CONFIG_HEADERS. # This happens for instance with `./config.status Makefile'. if test -n "$CONFIG_HEADERS"; then -cat >"$tmp/defines.awk" <<\_ACAWK || +cat >"$ac_tmp/defines.awk" <<\_ACAWK || BEGIN { _ACEOF @@ -10692,8 +10719,8 @@ _ACEOF # handling of long lines. ac_delim='%!_!# ' for ac_last_try in false false :; do - ac_t=`sed -n "/$ac_delim/p" confdefs.h` - if test -z "$ac_t"; then + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_tt"; then break elif $ac_last_try; then as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 @@ -10794,7 +10821,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -10813,7 +10840,7 @@ do for ac_f do case $ac_f in - -) ac_f="$tmp/stdin";; + -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, # because $ac_f cannot contain `:'. @@ -10822,7 +10849,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -10848,8 +10875,8 @@ $as_echo "$as_me: creating $ac_file" >&6;} esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -10979,21 +11006,22 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} - rm -f "$tmp/stdin" + rm -f "$ac_tmp/stdin" case $ac_file in - -) cat "$tmp/out" && rm -f "$tmp/out";; - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; esac \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; @@ -11004,20 +11032,20 @@ which seems to be undefined. Please make sure it is defined" >&2;} if test x"$ac_file" != x-; then { $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" - } >"$tmp/config.h" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" + } >"$ac_tmp/config.h" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" - mv "$tmp/config.h" "$ac_file" \ + mv "$ac_tmp/config.h" "$ac_file" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ || as_fn_error $? "could not create -" "$LINENO" 5 fi ;; diff --git a/configure.in b/configure.in index 762957ab7..7a0815a47 100755 --- a/configure.in +++ b/configure.in @@ -565,12 +565,14 @@ then then AC_CHECK_LIB(ws2_32,main) EXTRA_LIBS_FOR_DLLS="-lws2_32 \$(abs_top_builddir)/yap.dll" + EXTRA_INCLUDES_FOR_WIN32="-I\$(srcdir)/packages/PLStream/windows" elif test "$target_os" = "cygwin" then CC="${CC} -mno-cygwin" CXX="${CXX} -mno-cygwin" AC_CHECK_LIB(wsock32,main) EXTRA_LIBS_FOR_DLLS="\$(abs_top_builddir)/yap.dll" + EXTRA_INCLUDES_FOR_WIN32="-I\$(srcdir)/packages/PLStream/windows" else AC_CHECK_LIB(wsock32,main) EXTRA_LIBS_FOR_DLLS="\$(abs_top_builddir)/yap.dll" @@ -597,6 +599,7 @@ then ENABLE_WINCONSOLE="#" LIBS="-lcygwin" EXTRA_LIBS_FOR_DLLS="\$(abs_top_builddir)/yap.dll" + EXTRA_INCLUDES_FOR_WIN32="-I\$(srcdir)/packages/PLStream/windows" fi else INSTALL_COMMAND="install_unix" @@ -1510,6 +1513,7 @@ AC_SUBST(LAMOBJS) AC_SUBST(MAX_WORKERS) AC_SUBST(STATIC_MODE) AC_SUBST(ENABLE_WINCONSOLE) +AC_SUBST(EXTRA_INCLUDES_FOR_WIN32) AC_SUBST(USE_CUDD) AC_SUBST(CUDD_LDFLAGS) @@ -1952,8 +1956,8 @@ mkdir -p packages/jpl/src/java/jpl/test mkdir -p packages/jpl/examples mkdir -p packages/jpl/examples/java mkdir -p packages/meld -mkdir -p packages/tai -mkdir -p packages/tai/libtai +mkdir -p packages/PLStream +mkdir -p packages/PLStream/libtai mkdir -p packages/plunit mkdir -p packages/ProbLog mkdir -p packages/ProbLog/simplecudd @@ -1988,8 +1992,7 @@ AC_CONFIG_FILES([packages/cplint/Makefile]) AC_CONFIG_FILES([packages/cplint/approx/simplecuddLPADs/Makefile]) AC_CONFIG_FILES([packages/http/Makefile]) AC_CONFIG_FILES([packages/meld/Makefile]) -AC_CONFIG_FILES([packages/tai/Makefile]) -AC_CONFIG_FILES([packages/tai/libtai/Makefile]) +AC_CONFIG_FILES([packages/PLStream/libtai/Makefile]) AC_CONFIG_FILES([packages/plunit/Makefile]) AC_CONFIG_FILES([packages/ProbLog/Makefile ]) AC_CONFIG_FILES([packages/RDF/Makefile]) diff --git a/library/dialect/swi.yap b/library/dialect/swi.yap index ba0bbe4fe..2417bf35c 100755 --- a/library/dialect/swi.yap +++ b/library/dialect/swi.yap @@ -97,8 +97,6 @@ :- set_prolog_flag(user_flags,silent). -:- load_foreign_files(['pl-tai'], [], install). - % Time is given as a float in SWI-Prolog. swi_get_time(FSecs) :- datime(Datime), mktime(Datime, Secs), FSecs is Secs*1.0. @@ -120,128 +118,6 @@ goal_expansion(directory_files(A,B),system:swi_directory_files(A,B)). goal_expansion(exists_file(A), system:swi_exists_file(A)). goal_expansion(exists_directory(A), system:swi_exists_directory(A)). -:- dynamic swi_io/0. - -goal_expansion(open(A,B,C,D),system:swi_open(A,B,C,D)) :- swi_io. -goal_expansion(open(A,B,C), system:swi_open(A,B,C)) :- swi_io. -goal_expansion(close(A), system:swi_close(A)) :- swi_io. -goal_expansion(close(A,B), system:swi_close(A,B)) :- swi_io. -goal_expansion(set_input(A), system:swi_set_input(A)) :- swi_io. -goal_expansion(set_output(A), system:swi_set_output(A)) :- swi_io. -goal_expansion(current_input(A), system:swi_current_input(A)) :- swi_io. -goal_expansion(current_output(A), system:swi_current_output(A)) :- swi_io. -goal_expansion(get_code(A,B),system:swi_get_code(A,B)) :- swi_io. -goal_expansion(get_code(A), system:swi_get_code(A)) :- swi_io. -goal_expansion(get_char(A,B),system:swi_get_char(A,B)) :- swi_io. -goal_expansion(get_char(A), system:swi_get_char(A)) :- swi_io. -goal_expansion(get_byte(A,B),system:swi_get_byte(A,B)) :- swi_io. -goal_expansion(get_byte(A), system:swi_get_byte(A)) :- swi_io. -goal_expansion(peek_code(A,B),system:swi_peek_code(A,B)) :- swi_io. -goal_expansion(peek_code(A), system:swi_peek_code(A)) :- swi_io. -goal_expansion(peek_char(A,B),system:swi_peek_char(A,B)) :- swi_io. -goal_expansion(peek_char(A), system:swi_peek_char(A)) :- swi_io. -goal_expansion(peek_byte(A,B),system:swi_peek_byte(A,B)) :- swi_io. -goal_expansion(peek_byte(A), system:swi_peek_byte(A)) :- swi_io. -goal_expansion(put_byte(A,B),system:swi_put_byte(A,B)) :- swi_io. -goal_expansion(put_byte(A), system:swi_put_byte(A)) :- swi_io. -goal_expansion(put_code(A,B),system:swi_put_code(A,B)) :- swi_io. -goal_expansion(put_code(A), system:swi_put_code(A)) :- swi_io. -goal_expansion(put_char(A,B),system:swi_put_char(A,B)) :- swi_io. -goal_expansion(put_char(A), system:swi_put_char(A)) :- swi_io. -goal_expansion(flush_output, system:swi_flush_output). -goal_expansion(flush_output(A), system:swi_flush_output(A)) :- swi_io. -goal_expansion(at_end_of_stream(A), system:swi_at_end_of_stream(A)) :- swi_io. -goal_expansion(at_end_of_stream, system:swi_at_end_of_stream). -goal_expansion(stream_property(A,B),system:swi_stream_property(A,B)) :- swi_io. -goal_expansion(set_stream_position(A,B),system:swi_set_stream_position(A,B)) :- swi_io. - - /* edinburgh IO */ -goal_expansion(see(A), system:swi_see(A)) :- swi_io. -goal_expansion(seen, system:swi_seen). -goal_expansion(seeing(A), system:swi_seeing(A)) :- swi_io. -goal_expansion(tell(A), system:swi_tell(A)) :- swi_io. -goal_expansion(append(A), system:swi_append(A)) :- swi_io. -goal_expansion(told, system:swi_told). -goal_expansion(telling(A), system:swi_telling(A)) :- swi_io. -goal_expansion(put(A,B),system:swi_put(A,B)) :- swi_io. -goal_expansion(put(A), system:swi_put(A)) :- swi_io. -goal_expansion(skip(A), system:swi_skip(A)) :- swi_io. -goal_expansion(skip(A,B),system:swi_skip(A,B)) :- swi_io. -goal_expansion(get(A), system:swi_get(A)) :- swi_io. -goal_expansion(get(A,B),system:swi_get(A,B)) :- swi_io. -goal_expansion(get0(A,B),system:swi_get0(A,B)) :- swi_io. -goal_expansion(get0(A), system:swi_get0(A)) :- swi_io. -goal_expansion(ttyflush, system:swi_ttyflush). -goal_expansion(prompt(A,B),system:swi_prompt(A,B)) :- swi_io. -goal_expansion(tab(A,B),system:swi_tab(A,B)) :- swi_io. -goal_expansion(tab(A), system:swi_tab(A)) :- swi_io. - /* Quintus IO */ -goal_expansion(byte_count(A,B),system:swi_byte_count(A,B)) :- swi_io. -goal_expansion(character_count(A,B),system:swi_character_count(A,B)) :- swi_io. -goal_expansion(line_count(A,B),system:swi_line_count(A,B)) :- swi_io. -goal_expansion(line_position(A,B),system:swi_line_position(A,B)) :- swi_io. -goal_expansion(open_null_stream(A), system:swi_open_null_stream(A)) :- swi_io. - - /* SWI specific */ -goal_expansion(is_stream(A), system:swi_is_stream(A)) :- swi_io. -goal_expansion(set_stream(A,B),system:swi_set_stream(A,B)) :- swi_io. -% careful: with_output_to/2 requires setting user_output, and this -% confuses emulation. -goal_expansion(with_output_to(A,B),system:swi_with_output_to(A,NB)) :- swi_io, - expand_goal(B, NB). -goal_expansion(set_prolog_IO(A,B,C), system:swi_set_prolog_IO(A,B,C)) :- swi_io. -goal_expansion(protocol(A), system:swi_protocol(A)) :- swi_io. -goal_expansion(protocola(A), system:swi_protocola(A)) :- swi_io. -goal_expansion(noprotocol, noprotocol). -goal_expansion(protocolling(A), system:swi_protocolling(A)) :- swi_io. -goal_expansion(prompt1(A), system:swi_prompt1(A)) :- swi_io. -goal_expansion(seek(A,B,C,D),system:swi_seek(A,B,C,D)) :- swi_io. -goal_expansion(wait_for_input(A,B,C), system:swi_wait_for_input(A,B,C)) :- swi_io. -goal_expansion(get_single_char(A), system:swi_get_single_char(A)) :- swi_io. -goal_expansion(read_pending_input(A,B,C), system:swi_read_pending_input(A,B,C)) :- swi_io. -goal_expansion(source_location(A,B),system:swi_source_location(A,B)) :- swi_io. -goal_expansion(copy_stream_data(A,B,C), system:swi_copy_stream_data(A,B,C)) :- swi_io. -goal_expansion(copy_stream_data(A,B),system:swi_copy_stream_data(A,B)) :- swi_io. - - /* SWI internal */ -goal_expansion('$push_input_context', system:'swi_$push_input_context'). -goal_expansion('$pop_input_context', system:'swi_$pop_input_context'). -goal_expansion('$size_stream'(A,B),system:'swi_$size_stream'(A,B)) :- swi_io. - -goal_expansion(access_file(A,B),system:swi_access_file(A,B)) :- swi_io. -goal_expansion(size_file(A,B),system:swi_size_file(A,B)) :- swi_io. -goal_expansion(read_link(A,B,C), system:swi_read_link(A,B,C)) :- swi_io. -goal_expansion(tmp_file(A,B),system:swi_tmp_file(A,B)) :- swi_io. -goal_expansion(tmp_file_stream(A,B,C), system:swi_tmp_file_stream(A,B,C)) :- swi_io. -goal_expansion(delete_file(A), delete_file(A)) :- swi_io. -goal_expansion(delete_directory(A), delete_directory(A)) :- swi_io. -goal_expansion(make_directory(A), make_directory(A)) :- swi_io. -goal_expansion(same_file(A,B),system:swi_same_file(A,B)) :- swi_io. -goal_expansion(rename_file(A,B),system:swi_rename_file(A,B)) :- swi_io. -goal_expansion(file_base_name(A,B),system:swi_file_base_name(A,B)) :- swi_io. -goal_expansion(file_directory_name(A,B),system:swi_file_directory_name(A,B)) :- swi_io. -goal_expansion('$mark_executable'(A), system:'swi_is_absolute_file_name'(A)) :- swi_io. -goal_expansion('$absolute_file_name'(A,B),system:'swi_$absolute_file_name'(A,B)) :- swi_io. -goal_expansion(nl(A),system:swi_nl(A)) :- swi_io. -goal_expansion(nl,system:swi_nl) :- swi_io. -goal_expansion(write(A),write_term(user_output,A,[swi(true)])) :- swi_io. -goal_expansion(write(S,A),write_term(S,A,[swi(true)])) :- swi_io. -goal_expansion(writeq(A),write_term(user_output,A,[swi(true),quoted(true)])) :- swi_io. -goal_expansion(writeq(S,A),write_term(S,A,[swi(true),quoted(true)])) :- swi_io. -goal_expansion(display(A),write_term(user_output,A,[swi(true),ignore_ops(true)])) :- swi_io. -goal_expansion(display(S,A),write_term(S,A,[swi(true),ignore_ops(true),quoted(true)])) :- swi_io. -goal_expansion(write_canonical(A),write_term(user_output,A,[swi(true),ignore_ops(true),quoted(true)])) :- swi_io. -goal_expansion(write_canonical(S,A),write_term(S,A,[swi(true),ignore_ops(true)])) :- swi_io. -goal_expansion(print(A),write_term(user_output,A,[swi(true),portray(true),numbervars(true)])) :- swi_io. -goal_expansion(print(S,A),write_term(S,A,[swi(true),portray(true),numbervars(true)])) :- swi_io. -goal_expansion(write_term(A,Opts),write_term(user_output,A,Opts,[swi(true)|Opts])) :- swi_io. -goal_expansion(write_term(S,A,Opts),write_term(S,A,[swi(true)|Opts])) :- swi_io, \+ member(swi(_), Opts). -goal_expansion(format(A),system:swi_format(user_output,A,[])) :- swi_io. -goal_expansion(format(A,Args),system:swi_format(user_output,A,Args)) :- swi_io. -goal_expansion(format(S,A,Args),system:swi_format(S,A,Args)) :- swi_io. -goal_expansion(writeln(A),system:swi_format(user_output,'~w~n',[A])) :- swi_io. - - % make sure we also use :- user:library_directory(X), atom(X), diff --git a/library/mpi/examples/mk_gmiconf.awk b/library/mpi/examples/mk_gmiconf.awk old mode 100644 new mode 100755 diff --git a/misc/tkyap b/misc/tkyap old mode 100644 new mode 100755 diff --git a/packages/tai/libtai/BLURB b/packages/PLStream/libtai/BLURB similarity index 100% rename from packages/tai/libtai/BLURB rename to packages/PLStream/libtai/BLURB diff --git a/packages/tai/libtai/CHANGES b/packages/PLStream/libtai/CHANGES similarity index 100% rename from packages/tai/libtai/CHANGES rename to packages/PLStream/libtai/CHANGES diff --git a/packages/tai/libtai/FILES b/packages/PLStream/libtai/FILES similarity index 100% rename from packages/tai/libtai/FILES rename to packages/PLStream/libtai/FILES diff --git a/packages/tai/libtai/INSTALL b/packages/PLStream/libtai/INSTALL similarity index 100% rename from packages/tai/libtai/INSTALL rename to packages/PLStream/libtai/INSTALL diff --git a/packages/tai/libtai/Makefile.in b/packages/PLStream/libtai/Makefile.in similarity index 100% rename from packages/tai/libtai/Makefile.in rename to packages/PLStream/libtai/Makefile.in diff --git a/packages/tai/libtai/Makefile.mak b/packages/PLStream/libtai/Makefile.mak similarity index 100% rename from packages/tai/libtai/Makefile.mak rename to packages/PLStream/libtai/Makefile.mak diff --git a/packages/tai/libtai/README b/packages/PLStream/libtai/README similarity index 100% rename from packages/tai/libtai/README rename to packages/PLStream/libtai/README diff --git a/packages/tai/libtai/THANKS b/packages/PLStream/libtai/THANKS similarity index 100% rename from packages/tai/libtai/THANKS rename to packages/PLStream/libtai/THANKS diff --git a/packages/tai/libtai/TODO b/packages/PLStream/libtai/TODO similarity index 100% rename from packages/tai/libtai/TODO rename to packages/PLStream/libtai/TODO diff --git a/packages/tai/libtai/VERSION b/packages/PLStream/libtai/VERSION similarity index 100% rename from packages/tai/libtai/VERSION rename to packages/PLStream/libtai/VERSION diff --git a/packages/tai/libtai/caldate.3 b/packages/PLStream/libtai/caldate.3 similarity index 100% rename from packages/tai/libtai/caldate.3 rename to packages/PLStream/libtai/caldate.3 diff --git a/packages/tai/libtai/caldate.h b/packages/PLStream/libtai/caldate.h similarity index 100% rename from packages/tai/libtai/caldate.h rename to packages/PLStream/libtai/caldate.h diff --git a/packages/tai/libtai/caldate_fmjd.c b/packages/PLStream/libtai/caldate_fmjd.c similarity index 100% rename from packages/tai/libtai/caldate_fmjd.c rename to packages/PLStream/libtai/caldate_fmjd.c diff --git a/packages/tai/libtai/caldate_fmt.c b/packages/PLStream/libtai/caldate_fmt.c similarity index 100% rename from packages/tai/libtai/caldate_fmt.c rename to packages/PLStream/libtai/caldate_fmt.c diff --git a/packages/tai/libtai/caldate_mjd.3 b/packages/PLStream/libtai/caldate_mjd.3 similarity index 100% rename from packages/tai/libtai/caldate_mjd.3 rename to packages/PLStream/libtai/caldate_mjd.3 diff --git a/packages/tai/libtai/caldate_mjd.c b/packages/PLStream/libtai/caldate_mjd.c similarity index 100% rename from packages/tai/libtai/caldate_mjd.c rename to packages/PLStream/libtai/caldate_mjd.c diff --git a/packages/tai/libtai/caldate_norm.c b/packages/PLStream/libtai/caldate_norm.c similarity index 100% rename from packages/tai/libtai/caldate_norm.c rename to packages/PLStream/libtai/caldate_norm.c diff --git a/packages/tai/libtai/caldate_scan.c b/packages/PLStream/libtai/caldate_scan.c similarity index 100% rename from packages/tai/libtai/caldate_scan.c rename to packages/PLStream/libtai/caldate_scan.c diff --git a/packages/tai/libtai/caldate_ster.c b/packages/PLStream/libtai/caldate_ster.c similarity index 100% rename from packages/tai/libtai/caldate_ster.c rename to packages/PLStream/libtai/caldate_ster.c diff --git a/packages/tai/libtai/caltime.3 b/packages/PLStream/libtai/caltime.3 similarity index 100% rename from packages/tai/libtai/caltime.3 rename to packages/PLStream/libtai/caltime.3 diff --git a/packages/tai/libtai/caltime.h b/packages/PLStream/libtai/caltime.h similarity index 100% rename from packages/tai/libtai/caltime.h rename to packages/PLStream/libtai/caltime.h diff --git a/packages/tai/libtai/caltime_fmt.c b/packages/PLStream/libtai/caltime_fmt.c similarity index 100% rename from packages/tai/libtai/caltime_fmt.c rename to packages/PLStream/libtai/caltime_fmt.c diff --git a/packages/tai/libtai/caltime_scan.c b/packages/PLStream/libtai/caltime_scan.c similarity index 100% rename from packages/tai/libtai/caltime_scan.c rename to packages/PLStream/libtai/caltime_scan.c diff --git a/packages/tai/libtai/caltime_tai.3 b/packages/PLStream/libtai/caltime_tai.3 similarity index 100% rename from packages/tai/libtai/caltime_tai.3 rename to packages/PLStream/libtai/caltime_tai.3 diff --git a/packages/tai/libtai/caltime_tai.c b/packages/PLStream/libtai/caltime_tai.c similarity index 100% rename from packages/tai/libtai/caltime_tai.c rename to packages/PLStream/libtai/caltime_tai.c diff --git a/packages/tai/libtai/caltime_utc.c b/packages/PLStream/libtai/caltime_utc.c similarity index 100% rename from packages/tai/libtai/caltime_utc.c rename to packages/PLStream/libtai/caltime_utc.c diff --git a/packages/tai/libtai/check.c b/packages/PLStream/libtai/check.c similarity index 100% rename from packages/tai/libtai/check.c rename to packages/PLStream/libtai/check.c diff --git a/packages/tai/libtai/check.in b/packages/PLStream/libtai/check.in similarity index 100% rename from packages/tai/libtai/check.in rename to packages/PLStream/libtai/check.in diff --git a/packages/tai/libtai/check.out b/packages/PLStream/libtai/check.out similarity index 100% rename from packages/tai/libtai/check.out rename to packages/PLStream/libtai/check.out diff --git a/packages/tai/libtai/easter.c b/packages/PLStream/libtai/easter.c similarity index 100% rename from packages/tai/libtai/easter.c rename to packages/PLStream/libtai/easter.c diff --git a/packages/tai/libtai/leapsecs.3 b/packages/PLStream/libtai/leapsecs.3 similarity index 100% rename from packages/tai/libtai/leapsecs.3 rename to packages/PLStream/libtai/leapsecs.3 diff --git a/packages/tai/libtai/leapsecs.c b/packages/PLStream/libtai/leapsecs.c similarity index 100% rename from packages/tai/libtai/leapsecs.c rename to packages/PLStream/libtai/leapsecs.c diff --git a/packages/tai/libtai/leapsecs.dat b/packages/PLStream/libtai/leapsecs.dat similarity index 100% rename from packages/tai/libtai/leapsecs.dat rename to packages/PLStream/libtai/leapsecs.dat diff --git a/packages/tai/libtai/leapsecs.h b/packages/PLStream/libtai/leapsecs.h similarity index 100% rename from packages/tai/libtai/leapsecs.h rename to packages/PLStream/libtai/leapsecs.h diff --git a/packages/tai/libtai/leapsecs.txt b/packages/PLStream/libtai/leapsecs.txt similarity index 100% rename from packages/tai/libtai/leapsecs.txt rename to packages/PLStream/libtai/leapsecs.txt diff --git a/packages/tai/libtai/leapsecs_add.c b/packages/PLStream/libtai/leapsecs_add.c similarity index 100% rename from packages/tai/libtai/leapsecs_add.c rename to packages/PLStream/libtai/leapsecs_add.c diff --git a/packages/tai/libtai/leapsecs_init.c b/packages/PLStream/libtai/leapsecs_init.c similarity index 100% rename from packages/tai/libtai/leapsecs_init.c rename to packages/PLStream/libtai/leapsecs_init.c diff --git a/packages/tai/libtai/leapsecs_read.c b/packages/PLStream/libtai/leapsecs_read.c similarity index 100% rename from packages/tai/libtai/leapsecs_read.c rename to packages/PLStream/libtai/leapsecs_read.c diff --git a/packages/tai/libtai/leapsecs_sub.c b/packages/PLStream/libtai/leapsecs_sub.c similarity index 100% rename from packages/tai/libtai/leapsecs_sub.c rename to packages/PLStream/libtai/leapsecs_sub.c diff --git a/packages/tai/libtai/nowutc.c b/packages/PLStream/libtai/nowutc.c similarity index 100% rename from packages/tai/libtai/nowutc.c rename to packages/PLStream/libtai/nowutc.c diff --git a/packages/tai/libtai/tai.3 b/packages/PLStream/libtai/tai.3 similarity index 100% rename from packages/tai/libtai/tai.3 rename to packages/PLStream/libtai/tai.3 diff --git a/packages/tai/libtai/tai.h b/packages/PLStream/libtai/tai.h similarity index 100% rename from packages/tai/libtai/tai.h rename to packages/PLStream/libtai/tai.h diff --git a/packages/tai/libtai/tai_add.c b/packages/PLStream/libtai/tai_add.c similarity index 100% rename from packages/tai/libtai/tai_add.c rename to packages/PLStream/libtai/tai_add.c diff --git a/packages/tai/libtai/tai_now.3 b/packages/PLStream/libtai/tai_now.3 similarity index 100% rename from packages/tai/libtai/tai_now.3 rename to packages/PLStream/libtai/tai_now.3 diff --git a/packages/tai/libtai/tai_now.c b/packages/PLStream/libtai/tai_now.c similarity index 100% rename from packages/tai/libtai/tai_now.c rename to packages/PLStream/libtai/tai_now.c diff --git a/packages/tai/libtai/tai_pack.3 b/packages/PLStream/libtai/tai_pack.3 similarity index 100% rename from packages/tai/libtai/tai_pack.3 rename to packages/PLStream/libtai/tai_pack.3 diff --git a/packages/tai/libtai/tai_pack.c b/packages/PLStream/libtai/tai_pack.c similarity index 100% rename from packages/tai/libtai/tai_pack.c rename to packages/PLStream/libtai/tai_pack.c diff --git a/packages/tai/libtai/tai_sub.c b/packages/PLStream/libtai/tai_sub.c similarity index 100% rename from packages/tai/libtai/tai_sub.c rename to packages/PLStream/libtai/tai_sub.c diff --git a/packages/tai/libtai/tai_unpack.c b/packages/PLStream/libtai/tai_unpack.c similarity index 100% rename from packages/tai/libtai/tai_unpack.c rename to packages/PLStream/libtai/tai_unpack.c diff --git a/packages/tai/libtai/taia.3 b/packages/PLStream/libtai/taia.3 similarity index 100% rename from packages/tai/libtai/taia.3 rename to packages/PLStream/libtai/taia.3 diff --git a/packages/tai/libtai/taia.h b/packages/PLStream/libtai/taia.h similarity index 100% rename from packages/tai/libtai/taia.h rename to packages/PLStream/libtai/taia.h diff --git a/packages/tai/libtai/taia_add.c b/packages/PLStream/libtai/taia_add.c similarity index 100% rename from packages/tai/libtai/taia_add.c rename to packages/PLStream/libtai/taia_add.c diff --git a/packages/tai/libtai/taia_approx.c b/packages/PLStream/libtai/taia_approx.c similarity index 100% rename from packages/tai/libtai/taia_approx.c rename to packages/PLStream/libtai/taia_approx.c diff --git a/packages/tai/libtai/taia_fmtfrac.c b/packages/PLStream/libtai/taia_fmtfrac.c similarity index 100% rename from packages/tai/libtai/taia_fmtfrac.c rename to packages/PLStream/libtai/taia_fmtfrac.c diff --git a/packages/tai/libtai/taia_frac.c b/packages/PLStream/libtai/taia_frac.c similarity index 100% rename from packages/tai/libtai/taia_frac.c rename to packages/PLStream/libtai/taia_frac.c diff --git a/packages/tai/libtai/taia_half.c b/packages/PLStream/libtai/taia_half.c similarity index 100% rename from packages/tai/libtai/taia_half.c rename to packages/PLStream/libtai/taia_half.c diff --git a/packages/tai/libtai/taia_less.c b/packages/PLStream/libtai/taia_less.c similarity index 100% rename from packages/tai/libtai/taia_less.c rename to packages/PLStream/libtai/taia_less.c diff --git a/packages/tai/libtai/taia_now.3 b/packages/PLStream/libtai/taia_now.3 similarity index 100% rename from packages/tai/libtai/taia_now.3 rename to packages/PLStream/libtai/taia_now.3 diff --git a/packages/tai/libtai/taia_now.c b/packages/PLStream/libtai/taia_now.c similarity index 100% rename from packages/tai/libtai/taia_now.c rename to packages/PLStream/libtai/taia_now.c diff --git a/packages/tai/libtai/taia_pack.3 b/packages/PLStream/libtai/taia_pack.3 similarity index 100% rename from packages/tai/libtai/taia_pack.3 rename to packages/PLStream/libtai/taia_pack.3 diff --git a/packages/tai/libtai/taia_pack.c b/packages/PLStream/libtai/taia_pack.c similarity index 100% rename from packages/tai/libtai/taia_pack.c rename to packages/PLStream/libtai/taia_pack.c diff --git a/packages/tai/libtai/taia_sub.c b/packages/PLStream/libtai/taia_sub.c similarity index 100% rename from packages/tai/libtai/taia_sub.c rename to packages/PLStream/libtai/taia_sub.c diff --git a/packages/tai/libtai/taia_tai.c b/packages/PLStream/libtai/taia_tai.c similarity index 100% rename from packages/tai/libtai/taia_tai.c rename to packages/PLStream/libtai/taia_tai.c diff --git a/packages/tai/libtai/taia_unpack.c b/packages/PLStream/libtai/taia_unpack.c similarity index 100% rename from packages/tai/libtai/taia_unpack.c rename to packages/PLStream/libtai/taia_unpack.c diff --git a/packages/tai/libtai/yearcal.c b/packages/PLStream/libtai/yearcal.c similarity index 100% rename from packages/tai/libtai/yearcal.c rename to packages/PLStream/libtai/yearcal.c diff --git a/packages/PLStream/pl-file.c b/packages/PLStream/pl-file.c index 5dff861f1..8479ee509 100755 --- a/packages/PLStream/pl-file.c +++ b/packages/PLStream/pl-file.c @@ -4716,6 +4716,7 @@ init_yap(void) PL_register_extensions(PL_predicates_from_glob); PL_register_extensions(PL_predicates_from_write); PL_register_extensions(PL_predicates_from_read); + PL_register_extensions(PL_predicates_from_tai); PL_register_extensions(foreigns); fileerrors = TRUE; SinitStreams(); diff --git a/packages/PLStream/pl-files.c b/packages/PLStream/pl-files.c index 97a84cb27..bb5955e3e 100755 --- a/packages/PLStream/pl-files.c +++ b/packages/PLStream/pl-files.c @@ -63,6 +63,7 @@ LastModifiedFile(const char *file) if ( statfunc(OsPath(file, tmp), &buf) < 0 ) return (time_t)-1; + fprintf(stderr,"buf.st_mtime=%ld\n",buf.st_mtime); return buf.st_mtime; } diff --git a/packages/PLStream/pl-incl.h b/packages/PLStream/pl-incl.h index b3b460e29..539ad0a29 100755 --- a/packages/PLStream/pl-incl.h +++ b/packages/PLStream/pl-incl.h @@ -840,6 +840,7 @@ extern const PL_extension PL_predicates_from_ctype[]; extern const PL_extension PL_predicates_from_file[]; extern const PL_extension PL_predicates_from_files[]; extern const PL_extension PL_predicates_from_glob[]; -extern const PL_extension PL_predicates_from_write[]; extern const PL_extension PL_predicates_from_read[]; +extern const PL_extension PL_predicates_from_tai[]; +extern const PL_extension PL_predicates_from_write[]; diff --git a/packages/tai/pl-tai.c b/packages/PLStream/pl-tai.c similarity index 95% rename from packages/tai/pl-tai.c rename to packages/PLStream/pl-tai.c index 824f12552..6dfc9b744 100755 --- a/packages/tai/pl-tai.c +++ b/packages/PLStream/pl-tai.c @@ -3,9 +3,10 @@ Part of SWI-Prolog Author: Jan Wielemaker - E-mail: wielemak@science.uva.nl + E-mail: J.Wielemaker@cs.vu.nl WWW: http://www.swi-prolog.org - Copyright (C): 1985-2007, University of Amsterdam + Copyright (C): 1985-2010, University of Amsterdam + VU University Amsterdam This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -38,23 +39,22 @@ is supposed to give the POSIX standard one. #include #include -#if defined(__WINDOWS__) || defined (__CYGWIN__) || defined (__MINGW32__) -#define timezone _timezone -#ifndef _POSIX +#if TIME_WITH_SYS_TIME +# include +# include +#else +# if HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif + +#if defined(__WINDOWS__) || defined (__CYGWIN__) +#define timezone _timezone +#ifndef HAVE_VAR_TIMEZONE +#define HAVE_VAR_TIMEZONE #endif -#define localtime_r(_Time, _Tm) ({ struct tm *___tmp_tm = \ - localtime((_Time)); \ - if (___tmp_tm) { \ - *(_Tm) = *___tmp_tm; \ - ___tmp_tm = (_Tm); \ - } \ - ___tmp_tm; }) -#define asctime_r(_Tm, _Buf) ({ char *___tmp_tm = asctime((_Tm)); \ - if (___tmp_tm) \ - ___tmp_tm = \ - strcpy((_Buf),___tmp_tm);\ - ___tmp_tm; }) -#include #else extern char *tzname[2]; #ifdef HAVE_VAR_TIMEZONE @@ -107,7 +107,7 @@ value is EAST and includes the DST offset. static int tz_offset() { -#if defined(HAVE_VAR_TIMEZONE) || _WIN64 || _WIN32 +#ifdef HAVE_VAR_TIMEZONE do_tzset(); return timezone; #else @@ -490,9 +490,14 @@ fmt_domain_error(const char *key, int value) } static int -fmt_not_implemented(const char *key) +fmt_not_implemented(int c) { GET_LD term_t t = PL_new_term_ref(); + char key[3]; + + key[0] = '%'; + key[1] = c; + key[2] = 0; PL_put_atom_chars(t, key); @@ -575,6 +580,7 @@ format_time(IOSTREAM *fd, const wchar_t *format, ftm *ftm, int posix) while((c = *format++)) { int arg = NOARG; + int altO = FALSE; switch(c) { case '%': @@ -651,7 +657,7 @@ format_time(IOSTREAM *fd, const wchar_t *format, ftm *ftm, int posix) OUT2DIGITS_SPC(fd, ftm->tm.tm_mday); break; case 'E': /* alternative format */ - return fmt_not_implemented("%E"); + return fmt_not_implemented(c); case 'F': /* ISO 8601 date format */ SUBFORMAT(L"%Y-%m-%d"); break; @@ -720,7 +726,13 @@ format_time(IOSTREAM *fd, const wchar_t *format, ftm *ftm, int posix) OUTCHR(fd, '\n'); break; case 'O': - return fmt_not_implemented("%O"); + case ':': + if ( format[0] == 'z' ) + { altO = TRUE; + goto fmt_next; + } + + return fmt_not_implemented(c); case 'r': /* The time in a.m./p.m. notation */ SUBFORMAT(L"%I:%M:%S %p"); /* TBD: :-separator locale handling */ break; @@ -798,6 +810,8 @@ format_time(IOSTREAM *fd, const wchar_t *format, ftm *ftm, int posix) OUTCHR(fd, '-'); } OUT2DIGITS(fd, min/60); + if ( altO ) + OUTCHR(fd, ':'); OUT2DIGITS(fd, min%60); break; } @@ -827,6 +841,8 @@ format_time(IOSTREAM *fd, const wchar_t *format, ftm *ftm, int posix) else arg = arg*10+(c-'0'); goto fmt_next; + } else + { return fmt_not_implemented(c); } } break; @@ -939,17 +955,4 @@ BeginPredDefs(tai) PRED_DEF("date_time_stamp", 2, date_time_stamp, 0) PRED_DEF("format_time", 3, format_time3, 0) PRED_DEF("format_time", 4, format_time4, 0) - PRED_DEF("swi_stamp_date_time", 3, stamp_date_time, 0) - PRED_DEF("swi_date_time_stamp", 2, date_time_stamp, 0) - PRED_DEF("swi_format_time", 3, format_time3, 0) - PRED_DEF("swi_format_time", 4, format_time4, 0) EndPredDefs - -#if _YAP_NOT_INSTALLED_ -install_t - install(void) - { - PL_register_extensions(PL_predicates_from_tai); - } -#endif - diff --git a/packages/clib/demo/cgidemo.pl b/packages/clib/demo/cgidemo.pl old mode 100644 new mode 100755