X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=libyaz4j%2Fbuild.sh;h=d4687adf8c2e6911be9f23826ce61b9811fd0d33;hb=e1d54d118cce837805e62c7005c4f85ee2872920;hp=d23d1d83830581f8c6f46e1a58355736672f7ddd;hpb=fcdd77ca513dc74c5dcbfdf39f7c3fefabf50478;p=yaz4j-moved-to-github.git

diff --git a/libyaz4j/build.sh b/libyaz4j/build.sh
old mode 100644
new mode 100755
index d23d1d8..d4687ad
--- a/libyaz4j/build.sh
+++ b/libyaz4j/build.sh
@@ -1,15 +1,17 @@
 #!/bin/bash
+JNI_DIR=${JAVA_HOME:-/usr/lib/jvm/java-6-sun}/include
+set -x
+YAZ_CONFIG=yaz-config
+YAZ_PREFIX=`${YAZ_CONFIG} --prefix`
+YAZ_CFLAGS=`${YAZ_CONFIG} --cflags`
+YAZ_LIBS=`${YAZ_CONFIG} --libs`
 
-JNI_DIR=$( find / -type f -name jni.h 2>/dev/null | xargs dirname );
+swig -I"include" -I"${YAZ_PREFIX}/include" -outdir ../src/main/java/org/yaz4j/jni -package org.yaz4j.jni -o src/libyaz4j.cpp -c++ -java libyaz4j.i
 
-echo using JNI include directory - $JNI_DIR;
+g++ -fPIC -I"include" -I"$JNI_DIR" -I"$JNI_DIR/linux" ${YAZ_CFLAGS} -c -Wall -o obj/libyaz4j.o src/libyaz4j.cpp
 
-swig -I"include" -I"../dependencies/yaz-2.1.28/include/yaz/" -outdir ../src/org/yaz4j/jni -package org.yaz4j.jni -o src/libyaz4j.cpp -c++ -java libyaz4j.i
+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++ -I"include" -I"$JNI_DIR" -I"$JNI_DIR/linux" -I"../dependencies/yaz-2.1.28/include/yaz" -I"../dependencies/yaz-2.1.28/include" -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/yaz" -I"../dependencies/yaz-2.1.28/include" -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}