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

Merge branch 'master' of git://yap.git.sourceforge.net/gitroot/yap/yap-6.3

Browse Source
This commit is contained in:
Denys Duchier 2011-12-03 22:05:22 +01:00
commit 696e0e91e7
7 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -4337,7 +4337,7 @@ $as_echo "no" >&6; }
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
GECODE_VERSION=unknown-gecode-version
GECODE_EXTRALIBS=
GECODE_EXTRALIBS=-lgecodesupport -lgecodekernel -lgecodeint -lgecodeset -lgecodesearch
if test "$use_gecode" = yes; then

2
configure.in
View File

@ -98,7 +98,7 @@ AC_COMPILE_IFELSE([
AC_MSG_RESULT([no])
])
GECODE_VERSION=unknown-gecode-version
GECODE_EXTRALIBS=
GECODE_EXTRALIBS=-lgecodesupport -lgecodekernel -lgecodeint -lgecodeset -lgecodesearch
AC_SUBST(GECODE_VERSION)
AC_SUBST(GECODE_EXTRALIBS)
if test "$use_gecode" = yes; then

4
library/gecode/Makefile.in
View File

@ -44,7 +44,7 @@ SOBJS=gecode_yap.@SO@
GECODE_VERSION = @GECODE_VERSION@
DISJUNCTOR = -DDISJUNCTOR
GECODE_LIBS = @GECODE_EXTRALIBS@ -lgecodesupport -lgecodekernel -lgecodeint -lgecodeset -lgecodesearch
GECODE_LIBS = @GECODE_EXTRALIBS@
all: $(SOBJS) gecode.yap
@ -59,7 +59,7 @@ gecode_yap.o: \
$(CXX) -c -I$(srcdir)/$(GECODE_VERSION) $(CXXFLAGS) $(DISJUNCTOR) -o $@ $<
@DO_SECOND_LD@gecode_yap.@SO@: gecode_yap.o
@DO_SECOND_LD@ @SHLIB_LD@ -o gecode_yap.@SO@ gecode_yap.o $(LDFLAGS) $(GECODE_LIBS) @EXTRA_LIBS_FOR_DLLS@
@DO_SECOND_LD@ @SHLIB_CXX_LD@ -o gecode_yap.@SO@ gecode_yap.o $(LDFLAGS) $(GECODE_LIBS) @EXTRA_LIBS_FOR_DLLS@
gecode.yap: $(srcdir)/gecode_yap_hand_written.yap $(srcdir)/$(GECODE_VERSION)/gecode_yap_auto_generated.yap
cat $^ > $@

10
os/pl-error.c
View File

@ -30,6 +30,8 @@ PL_get_chars_ex(term_t t, char **s, unsigned int flags)
}
#undef PL_get_atom_ex
int
PL_get_atom_ex__LD(term_t t, atom_t *a ARG_LD)
{ if ( PL_get_atom(t, a) )
@ -38,6 +40,14 @@ PL_get_atom_ex__LD(term_t t, atom_t *a ARG_LD)
return PL_error(NULL, 0, NULL, ERR_TYPE, ATOM_atom, t);
}
int
PL_get_atom_ex(term_t t, atom_t *a)
{ if ( PL_get_atom(t, a) )
succeed;
return PL_error(NULL, 0, NULL, ERR_TYPE, ATOM_atom, t);
}
int
PL_get_integer_ex(term_t t, int *i)

2
packages/Dialect.defs.in
View File

@ -50,7 +50,7 @@ CFLAGS=$(COFLAGS) $(CWFLAGS) $(CMFLAGS) $(CIFLAGS) $(PKGCFLAGS) @DEFS@
LDSOFLAGS=@LDFLAGS@ @EXTRA_LIBS_FOR_SWIDLLS@
LDFLAGS=$(PKGLDFLAGS)
MKINDEX=$(PL) -f none -g make -t halt
MKINDEX=(cd $(srcdir) ; $(PL) -f none -g make -t halt)
.txt.tex:
swipl -f script.pl -g "doc_latex('$*.txt','$*.tex',[stand_alone(false)]),halt" -t "halt(1)"

2
packages/clib

@ -1 +1 @@
Subproject commit f0e208de69f5303648fe1d035e2bfa164411d42d
Subproject commit e6b682d909a4d63ee876af70c738d900449625fb

2
packages/zlib

@ -1 +1 @@
Subproject commit 1028ec347935a5f61925541d7adcf6b08aca820c
Subproject commit 2a859fd75795cc428e911b59abf8404c87b530f4