[sr-dev] git:4.1: app_java: Use generic libgcj

Module: sip-router Branch: 4.1 Commit: c24508f80449a01165e65d4592cf77303054c36a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c24508f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Sat Jun 14 18:20:06 2014 +0200 app_java: Use generic libgcj (cherry picked from commit 00d2c27cbd0c36fd8979d5b92a3f860a5e657c60) --- modules/app_java/Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/app_java/Makefile b/modules/app_java/Makefile index 792a116..ca854ed 100644 --- a/modules/app_java/Makefile +++ b/modules/app_java/Makefile @@ -17,8 +17,8 @@ LIBS += $(shell pkg-config libgcj-4.4 --cflags) -L$(JVM_PATH) -ljvm else # try to detect JAVA_HOME JAVA_HOME ?= $(shell readlink -f /usr/bin/javac | sed "s:bin/javac::") -DEFS += $(shell pkg-config libgcj12 --cflags) -I$(JAVA_HOME)/include -LIBS += $(shell pkg-config libgcj12 --libs) -L$(JAVA_HOME)/lib -ljvm +DEFS += $(shell pkg-config libgcj --cflags) -I$(JAVA_HOME)/include +LIBS += $(shell pkg-config libgcj --libs) -L$(JAVA_HOME)/lib -ljvm # On Debian 7.5 there is a bug with JAVA_HOME detection. # $(shell readlink -f /usr/bin/javac | sed "s:bin/javac::") points to perl wrapper script (/usr/bin/gcj-wrapper-4.7)