提交 2558049e authored 作者: Michael Jerris's avatar Michael Jerris

FS-7667: [mod_java] fix include directory detection when using debian java…

FS-7667: [mod_java] fix include directory detection when using debian java pacakges and use detected directory
上级 46f8557d
......@@ -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,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
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论