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

fix path to access java libs

Browse Source
This commit is contained in:
Vítor Santos Costa II 2010-04-20 23:08:52 +01:00
parent da78b22324
commit c2ff395626
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -5973,7 +5973,7 @@ elif test -e "$srcdir"/packages/jpl/Makefile.in; then
if test "x$JAVALIBS" = "x"; then if test "x$JAVALIBS" = "x"; then
case "$target_os" in case "$target_os" in
*cygwin*|*mingw*) *cygwin*|*mingw*)
JAVALIBS="\"$JAVA_HOME\"/lib/jvm.lib -lpthread ../PLStream/plstream.dll" JAVALIBS="\"$JAVA_HOME\"/lib/jvm.lib -lpthread \$(YAPLIBDIR)/PLStream/plstream.dll"
;; ;;
*darwin*) *darwin*)
JAVALIBS="-Wl,-framework,JavaVM" JAVALIBS="-Wl,-framework,JavaVM"
@ -6512,7 +6512,7 @@ fi
fi fi
;; ;;
*) *)
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" JAVALIBPATH="\$(LIBDIR)/libYap.so \$(YAPLIBDIR)/plstream.so $LIBS $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

4
configure.in
View File

@ -672,7 +672,7 @@ elif test -e "$srcdir"/packages/jpl/Makefile.in; then
if test "x$JAVALIBS" = "x"; then if test "x$JAVALIBS" = "x"; then
case "$target_os" in case "$target_os" in
*cygwin*|*mingw*) *cygwin*|*mingw*)
JAVALIBS="\"$JAVA_HOME\"/lib/jvm.lib -lpthread ../PLStream/plstream.dll" JAVALIBS="\"$JAVA_HOME\"/lib/jvm.lib -lpthread \$(YAPLIBDIR)/PLStream/plstream.dll"
;; ;;
*darwin*) *darwin*)
JAVALIBS="-Wl,-framework,JavaVM" JAVALIBS="-Wl,-framework,JavaVM"
@ -804,7 +804,7 @@ case "$target_os" in
fi fi
;; ;;
*) *)
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" JAVALIBPATH="\$(LIBDIR)/libYap.so \$(YAPLIBDIR)/plstream.so $LIBS $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