From: František Dvořák <valtri@civ.zcu.cz>
Date: Thu, 3 Mar 2011 13:19:33 +0000 (+0000)
Subject: Support gcj java.
X-Git-Tag: glite-jobid-api-java_R_1_1_2_1~13
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=01b89c0edbc1d3b33e7e3798e159f41335c6862f;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 dbbcc94..2164409 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}${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 ${DESTDIR}${PREFIX}${prefix}/${libdir}