projects
/
yaz4j-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Comment on how to set JAVA_HOME.
[yaz4j-moved-to-github.git]
/
libyaz4j
/
build.sh
diff --git
a/libyaz4j/build.sh
b/libyaz4j/build.sh
index
36574a0
..
9b15b74
100755
(executable)
--- a/
libyaz4j/build.sh
+++ b/
libyaz4j/build.sh
@@
-1,12
+1,21
@@
#!/bin/bash
#!/bin/bash
+
+# You may need to do something like this:
+# env JAVA_HOME=/usr/lib/jvm/java-6-sun ./build.sh
+
JNI_DIR=${JAVA_HOME}/include
JNI_DIR=${JAVA_HOME}/include
+set -x
+YAZ_CONFIG=yaz-config
+YAZ_PREFIX=`${YAZ_CONFIG} --prefix`
+YAZ_CFLAGS=`${YAZ_CONFIG} --cflags`
+YAZ_LIBS=`${YAZ_CONFIG} --libs`
-swig -I"include" -I"../dependencies/yaz-2.1.28/include" -outdir ../src/org/yaz4j/jni -package org.yaz4j.jni -o src/libyaz4j.cpp -c++ -java libyaz4j.i
+swig -I"include" -I"${YAZ_PREFIX}/include" -outdir ../src/org/yaz4j/jni -package org.yaz4j.jni -o src/libyaz4j.cpp -c++ -java libyaz4j.i
-g++ -I"include" -I"$JNI_DIR" -I"$JNI_DIR/linux" -I"../dependencies/yaz-2.1.28/include" -c -Wall -o obj/libyaz4j.o src/libyaz4j.cpp
+g++ -fPIC -I"include" -I"$JNI_DIR" -I"$JNI_DIR/linux" ${YAZ_CFLAGS} -c -Wall -o obj/libyaz4j.o src/libyaz4j.cpp
-g++ -I"include" -I"$JNI_DIR" -I"$JNI_DIR/linux" -I"../dependencies/yaz-2.1.28/include" -c -Wall -o obj/zoom-extra.o src/zoom-extra.cpp
+g++ -fPIC -I"include" -I"$JNI_DIR" -I"$JNI_DIR/linux" ${YAZ_CFLAGS} -c -Wall -o obj/zoom-extra.o src/zoom-extra.cpp
-g++ -L"../dependencies/yaz-2.1.28/lib" -shared obj/libyaz4j.o obj/zoom-extra.o -lyaz -o lib/libyaz4j.so
+g++ -shared obj/libyaz4j.o obj/zoom-extra.o -o lib/libyaz4j.so ${YAZ_LIBS}