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

jpl support: swi sharing updates

Browse Source
This commit is contained in:
Vítor Santos Costa 2012-09-21 11:50:55 +01:00
parent d5bf100b71
commit f38e80f659
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure vendored
View File

@ -660,8 +660,9 @@ ENABLE_WINCONSOLE
STATIC_MODE STATIC_MODE
MAX_WORKERS MAX_WORKERS
LAMOBJS LAMOBJS
JAVACFLAGS
JAVALIBS JAVALIBS
JPLLIBS
JPLCFLAGS
INSTALLCLP INSTALLCLP
INSTALL_COMMAND INSTALL_COMMAND
MPI_LIBS MPI_LIBS
@ -7510,20 +7511,20 @@ elif test -e "$srcdir"/packages/jpl/Makefile.in; then
else else
JAVALIBS="\"$JAVA_HOME\"/lib/jvm.lib" JAVALIBS="\"$JAVA_HOME\"/lib/jvm.lib"
fi fi
JAVACFLAGS="-I\"$JAVA_HOME\"/include -I\"$JAVA_HOME\"/include/win32" JPLCFLAGS="-I\"$JAVA_HOME\"/include -I\"$JAVA_HOME\"/include/win32"
;; ;;
*darwin*) *darwin*)
LIBS="$LIBS -framework JavaVM" LIBS="$LIBS -framework JavaVM"
JAVALIBS="-L/System/Library/Frameworks/JavaVM.framework/Libraries -Wl,-framework,JavaVM" JAVALIBS="-L/System/Library/Frameworks/JavaVM.framework/Libraries -Wl,-framework,JavaVM"
JAVACFLAGS="-I/System/Library/Frameworks/JavaVM.framework/Headers" JPLCFLAGS="-I/System/Library/Frameworks/JavaVM.framework/Headers"
;; ;;
*) *)
case "$target_os" in case "$target_os" in
*linux*) *linux*)
JAVACFLAGS="-I\"$JAVA_HOME\"/include -I\"$JAVA_HOME\"/include/linux" JPLCFLAGS="-I\"$JAVA_HOME\"/include -I\"$JAVA_HOME\"/include/linux"
;; ;;
*solaris*) *solaris*)
JAVACFLAGS="-I\"$JAVA_HOME\"/include -I\"$JAVA_HOME\"/include/solaris" JPLCFLAGS="-I\"$JAVA_HOME\"/include -I\"$JAVA_HOME\"/include/solaris"
;; ;;
esac esac
JAVALIBS="-L$JAVA_HOME/jre/lib/$YAP_TARGET -L$JAVA_HOME/jre/lib/$YAP_TARGET/client -L$JAVA_HOME/jre/lib/$YAP_TARGET/server -Wl,-R,$JAVA_HOME/jre/lib/$YAP_TARGET -ljava -lverify -ljvm " JAVALIBS="-L$JAVA_HOME/jre/lib/$YAP_TARGET -L$JAVA_HOME/jre/lib/$YAP_TARGET/client -L$JAVA_HOME/jre/lib/$YAP_TARGET/server -Wl,-R,$JAVA_HOME/jre/lib/$YAP_TARGET -ljava -lverify -ljvm "
@ -9539,6 +9540,8 @@ fi

12
configure.in
View File

@ -1058,20 +1058,20 @@ elif test -e "$srcdir"/packages/jpl/Makefile.in; then
else else
JAVALIBS="\"$JAVA_HOME\"/lib/jvm.lib" JAVALIBS="\"$JAVA_HOME\"/lib/jvm.lib"
fi fi
JAVACFLAGS="-I\"$JAVA_HOME\"/include -I\"$JAVA_HOME\"/include/win32" JPLCFLAGS="-I\"$JAVA_HOME\"/include -I\"$JAVA_HOME\"/include/win32"
;; ;;
*darwin*) *darwin*)
LIBS="$LIBS -framework JavaVM" LIBS="$LIBS -framework JavaVM"
JAVALIBS="-L/System/Library/Frameworks/JavaVM.framework/Libraries -Wl,-framework,JavaVM" JAVALIBS="-L/System/Library/Frameworks/JavaVM.framework/Libraries -Wl,-framework,JavaVM"
JAVACFLAGS="-I/System/Library/Frameworks/JavaVM.framework/Headers" JPLCFLAGS="-I/System/Library/Frameworks/JavaVM.framework/Headers"
;; ;;
*) *)
case "$target_os" in case "$target_os" in
*linux*) *linux*)
JAVACFLAGS="-I\"$JAVA_HOME\"/include -I\"$JAVA_HOME\"/include/linux" JPLCFLAGS="-I\"$JAVA_HOME\"/include -I\"$JAVA_HOME\"/include/linux"
;; ;;
*solaris*) *solaris*)
JAVACFLAGS="-I\"$JAVA_HOME\"/include -I\"$JAVA_HOME\"/include/solaris" JPLCFLAGS="-I\"$JAVA_HOME\"/include -I\"$JAVA_HOME\"/include/solaris"
;; ;;
esac esac
JAVALIBS="-L$JAVA_HOME/jre/lib/$YAP_TARGET -L$JAVA_HOME/jre/lib/$YAP_TARGET/client -L$JAVA_HOME/jre/lib/$YAP_TARGET/server -Wl,-R,$JAVA_HOME/jre/lib/$YAP_TARGET -ljava -lverify -ljvm " JAVALIBS="-L$JAVA_HOME/jre/lib/$YAP_TARGET -L$JAVA_HOME/jre/lib/$YAP_TARGET/client -L$JAVA_HOME/jre/lib/$YAP_TARGET/server -Wl,-R,$JAVA_HOME/jre/lib/$YAP_TARGET -ljava -lverify -ljvm "
@ -1791,8 +1791,10 @@ AC_SUBST(MPI_OBJS)
AC_SUBST(MPI_LIBS) AC_SUBST(MPI_LIBS)
AC_SUBST(INSTALL_COMMAND) AC_SUBST(INSTALL_COMMAND)
AC_SUBST(INSTALLCLP) AC_SUBST(INSTALLCLP)
AC_SUBST(JPLCFLAGS)
AC_SUBST(JPLLIBS)
AC_SUBST(JAVALIBS) AC_SUBST(JAVALIBS)
AC_SUBST(JAVACFLAGS) AC_SUBST(JPLCFLAGS)
AC_SUBST(LAMOBJS) AC_SUBST(LAMOBJS)
AC_SUBST(MAX_WORKERS) AC_SUBST(MAX_WORKERS)
AC_SUBST(STATIC_MODE) AC_SUBST(STATIC_MODE)