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

diff --git a/build/config/ax_check_java.m4 b/build/config/ax_check_java.m4
index 1aa3c7d0d011c0b43c4eddf53cd62fc51df4b8c2..d83895e721420bae253b59552b40e7b9c17fd59a 100644 (file)
--- a/build/config/ax_check_java.m4
+++ b/build/config/ax_check_java.m4
@@ -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'

diff --git a/src/mod/languages/mod_java/Makefile.am b/src/mod/languages/mod_java/Makefile.am
index 5d90be0855beb61041a6099309689ff98a4c8895..2e43bd5f4a508a6557afb24c235691116b51fc09 100644 (file)
--- a/src/mod/languages/mod_java/Makefile.am
+++ b/src/mod/languages/mod_java/Makefile.am
@@ -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