X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=libyaz4j%2Fbuild.sh;h=9b15b74919269da8ac3edf49efb418dc46ea2895;hb=f1dc0de045f5d44f2f97d44e96139ac712fb359c;hp=05768a5ad07e2f29c2f3dd3527e3883dba06a5c8;hpb=f828ea79a8fc939be9ceb0f368ec57887b7c60f9;p=yaz4j-moved-to-github.git

diff --git a/libyaz4j/build.sh b/libyaz4j/build.sh
index 05768a5..9b15b74 100755
--- a/libyaz4j/build.sh
+++ b/libyaz4j/build.sh
@@ -1,12 +1,21 @@
 #!/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
+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/yaz/" -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/yaz" -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/yaz" -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}