From: František Dvořák <valtri@civ.zcu.cz>
Date: Mon, 6 Jun 2011 12:00:28 +0000 (+0000)
Subject: Support gcj java.
X-Git-Tag: glite-lb-client_R_4_1_10_1~6
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=d7cdcb740088f144d5b9adbc85a334a734c3d4fe;p=jra1mw.git

Support gcj java.
---

diff --git a/org.glite.lb.client-java/src_c/Makefile b/org.glite.lb.client-java/src_c/Makefile
index 2124d30..a9d7912 100755
--- a/org.glite.lb.client-java/src_c/Makefile
+++ b/org.glite.lb.client-java/src_c/Makefile
@@ -6,6 +6,14 @@ PATH_TO_JAVA=${JAVA_HOME}
 
 OS=$(shell uname | tr '[:upper:]' '[:lower:]')
 
+# when there is a system prefix, we are probably working with java from GCC,
+# with java headers already in default search paths
+ifeq (${PATH_TO_JAVA},/usr)
+JDK_CPPFLAGS=
+else
+JDK_CPPFLAGS=-I${PATH_TO_JAVA}/include/$(OS)
+endif
+
 LIB=libglite_lb_sendviasocket.la
 OBJ=send_via_socket.lo
 
@@ -17,7 +25,7 @@ ${LIB}: ${OBJ}
 	libtool --mode=link ${CC} -rpath ${PREFIX}/${libdir} -o $@ ${OBJ}
 
 %.lo: %.c
-	libtool --mode=compile ${CC} -I.. -I${PATH_TO_JAVA}/include -I${PATH_TO_JAVA}/include/$(OS) -c $<
+	libtool --mode=compile ${CC} -I.. -I${PATH_TO_JAVA}/include ${JDK_CPPFLAGS} -c $<
 
 install: compile
 	-mkdir -p ${PREFIX}/${libdir}