From 1fe6fb6d46efa12ae59f7b573dade4e09c3cdec2 Mon Sep 17 00:00:00 2001 From: Travis Cross Date: Thu, 22 May 2014 18:08:14 +0000 Subject: [PATCH] Use CPPFLAGS for mod_java includes --- src/mod/languages/mod_java/Makefile.am | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/mod/languages/mod_java/Makefile.am b/src/mod/languages/mod_java/Makefile.am index 1c9bda9fd3..b36675300f 100644 --- a/src/mod/languages/mod_java/Makefile.am +++ b/src/mod/languages/mod_java/Makefile.am @@ -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 \