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

fix JPL setup. Also, JPL requires paths for installed yap. so should

Browse Source 
only be compiled after installing libs: do make at install time.
This commit is contained in:
Vítor Santos Costa II 2010-04-13 00:24:40 +01:00
parent 9def5978bb
commit f753284785
3 changed files with 2341 additions and 11013 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.in
View File

@ -494,7 +494,6 @@ all: startup.yss
@INSTALL_DLLS@ (cd packages/plunit; $(MAKE)) @INSTALL_DLLS@ (cd packages/plunit; $(MAKE))
@USE_MINISAT@ (cd packages/swi-minisat2/C; $(MAKE)) @USE_MINISAT@ (cd packages/swi-minisat2/C; $(MAKE))
@INSTALL_MATLAB@ (cd library/matlab; $(MAKE)) @INSTALL_MATLAB@ (cd library/matlab; $(MAKE))
@ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE))
@ENABLE_CPLINT@ (cd packages/cplint/approx/simplecuddLPADs; $(MAKE)) @ENABLE_CPLINT@ (cd packages/cplint/approx/simplecuddLPADs; $(MAKE))
@ENABLE_CPLINT@ (cd packages/cplint; $(MAKE)) @ENABLE_CPLINT@ (cd packages/cplint; $(MAKE))
@USE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE)) @USE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE))
@ -543,6 +542,7 @@ install_unix: startup.yss libYap.a
@INSTALL_DLLS@ (cd library/lammpi; $(MAKE) install) @INSTALL_DLLS@ (cd library/lammpi; $(MAKE) install)
@INSTALL_DLLS@ (cd library/matrix; $(MAKE) install) @INSTALL_DLLS@ (cd library/matrix; $(MAKE) install)
@INSTALL_MATLAB@ (cd library/matlab; $(MAKE) install) @INSTALL_MATLAB@ (cd library/matlab; $(MAKE) install)
@ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE))
@ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE) install) @ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE) install)
mkdir -p $(DESTDIR)$(INCLUDEDIR) mkdir -p $(DESTDIR)$(INCLUDEDIR)
$(INSTALL) $(HEADERS) $(DESTDIR)$(INCLUDEDIR) $(INSTALL) $(HEADERS) $(DESTDIR)$(INCLUDEDIR)

13348
configure vendored
View File

File diff suppressed because it is too large Load Diff

4
configure.in
View File

@ -796,7 +796,7 @@ case "$target_os" in
LDFLAGS="-dynamic $LDFLAGS" LDFLAGS="-dynamic $LDFLAGS"
;; ;;
x86*) x86*)
JAVALIBPATH="-L$JAVA_HOME/jre/lib/amd64 -L$JAVA_HOME/jre/lib/amd64/client -L$JAVA_HOME/jre/lib/amd64/server" JAVALIBPATH="\$(LIBDIR)/libYap.so \$(YAPLIBDIR)/plstream.so $LIBS -L$JAVA_HOME/jre/lib/amd64 -L$JAVA_HOME/jre/lib/amd64/client -L$JAVA_HOME/jre/lib/amd64/server"
JAVAINCPATH="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux" JAVAINCPATH="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
if test "$CC" != "lcc" if test "$CC" != "lcc"
then then
@ -804,7 +804,7 @@ case "$target_os" in
fi fi
;; ;;
*) *)
JAVALIBPATH="-L$JAVA_HOME/jre/lib/i386 -L$JAVA_HOME/jre/lib/i386/client -L$JAVA_HOME/jre/lib/i386/server" JAVALIBPATH="\$(LIBDIR)/libYap.so \$(YAPLIBDIR)/plstream.so $LIBS ../PLStream/plstream.so $LIBS -L$JAVA_HOME/jre/lib/i386 -L$JAVA_HOME/jre/lib/i386/client -L$JAVA_HOME/jre/lib/i386/server"
JAVAINCPATH="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux" JAVAINCPATH="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
if test "$CC" != "lcc" if test "$CC" != "lcc"
then then