[sr-dev] git:master:bb1e6cea: app_java: skip throwing error of missing java for make readme

Daniel-Constantin Mierla miconda at gmail.com
Wed Jun 8 14:00:01 CEST 2016


Module: kamailio
Branch: master
Commit: bb1e6ceadacd2b38826ed996e44cc45f3d8d1a41
URL: https://github.com/kamailio/kamailio/commit/bb1e6ceadacd2b38826ed996e44cc45f3d8d1a41

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2016-06-08T13:58:39+02:00

app_java: skip throwing error of missing java for make readme

- controlled by DOCBUILD=yes

---

Modified: modules/app_java/Makefile

---

Diff:  https://github.com/kamailio/kamailio/commit/bb1e6ceadacd2b38826ed996e44cc45f3d8d1a41.diff
Patch: https://github.com/kamailio/kamailio/commit/bb1e6ceadacd2b38826ed996e44cc45f3d8d1a41.patch

---

diff --git a/modules/app_java/Makefile b/modules/app_java/Makefile
index f3a40ae..c348ffd 100644
--- a/modules/app_java/Makefile
+++ b/modules/app_java/Makefile
@@ -24,7 +24,9 @@ LIBS += $(shell pkg-config libgcj --libs) -L$(JAVA_HOME)/lib  -ljvm
 # At this point I don't see any universal method as explicit setting this variable at the compile phase.
 # -- ez
 ifeq ($(shell [ -d "${JAVA_HOME}" -a -f "$(JAVA_HOME)/include/jni.h" -a -f "$(JAVA_HOME)/lib/libjvm.so" ] && echo 1 || echo 0),0)
-    $(error Can't locate Java Development Kit. You have to specify environment JAVA_HOME to build app_java)
+ifneq ($(DOCBUILD),yes)
+$(error Cannot locate Java Development Kit. You have to specify environment JAVA_HOME to build app_java)
+endif
 endif
 
 ifeq ($(OS), freebsd)




More information about the sr-dev mailing list