Use CPPFLAGS for mod_java includes

This commit is contained in:
Travis Cross 2014-05-22 18:08:14 +00:00
parent e8ba8ed5a5
commit 1fe6fb6d46

View File

@ -4,11 +4,14 @@ 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_LIBADD = $(switch_builddir)/libfreeswitch.la
mod_java_la_LDFLAGS = -avoid-version -module -no-undefined -shared
# Without -fno-strict-aliasing, g++ generates invalid code for Java_org_freeswitch_freeswitchJNI_SWIGJavaSessionUpcast, which segfaults
mod_java_la_CFLAGS += $(JAVA_FLAGS) -fno-strict-aliasing -I/usr/lib/jvm/java-gcj/include -I/usr/lib/jvm/java-gcj/include/linux
mod_java_la_CFLAGS += $(JAVA_FLAGS) -fno-strict-aliasing
CLASSES=src/org/freeswitch/Launcher.java \
src/org/freeswitch/HangupHook.java \