kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-7667: [mod_java] fix include directory detection when using debian java pacakges and use detected directory

This commit is contained in:
Michael Jerris 2015-06-16 14:29:18 -05:00
parent 46f8557d3c
commit 2558049e49
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/config/ax_check_java.m4
View File

@ -22,7 +22,7 @@ then
AC_MSG_RESULT()
dnl these two lines should let u find most java installations
java_dirs="/usr /usr/local /usr/lib/j2sdk1.4-sun /usr/lib/jvm/java /System/Library/Frameworks/JavaVM.framework/Versions/Current /opt /mingw"
java_dirs="/usr /usr/local /usr/lib/j2sdk1.4-sun /usr/lib/jvm/java /usr/lib/jvm/default-java /System/Library/Frameworks/JavaVM.framework/Versions/Current /opt /mingw"
java_inc_dirs="include include/libgcj Headers"
if test "x$with_java" != 'x'

4
src/mod/languages/mod_java/Makefile.am
View File

@ -4,9 +4,7 @@ MODNAME=mod_java
mod_LTLIBRARIES = mod_java.la
mod_java_la_SOURCES = mod_java.cpp freeswitch_java.cpp switch_swig_wrap.cpp modjava.c
mod_java_la_CFLAGS = $(AM_CFLAGS)
mod_java_la_CPPFLAGS = -I/usr/lib/jvm/java-gcj/include
mod_java_la_CPPFLAGS+= -I/usr/lib/jvm/java-gcj/include/linux
mod_java_la_CPPFLAGS+= $(AM_CPPFLAGS)
mod_java_la_CPPFLAGS = $(JAVA_FLAGS) $(AM_CPPFLAGS)
mod_java_la_LIBADD = $(switch_builddir)/libfreeswitch.la
mod_java_la_LDFLAGS = -avoid-version -module -no-undefined -shared