[java-atk-wrapper] Build: Add JNI_INCLUDES after CHECK_JNI

[Magdalen Berns <mberns src gnome org>]

commit e2d096ff956e155d1bad6ff1d027e13b25fc7d52
Author: Magdalen Berns <m berns thismagpie com>
Date:   Sun Jun 7 16:11:20 2015 +0100

    Build: Add JNI_INCLUDES after CHECK_JNI
    
    Bug: https://bugzilla.gnome.org/show_bug.cgi?id=750501

 configure.ac        |    2 +-
 jni/src/Makefile.am |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5275871..449907a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,7 +120,7 @@ AC_SUBST(JDK_SRC)
 AC_SUBST(JAVA_HOME)
 
 if test "x$GCC" = xyes; then
-  JAW_CFLAGS=$JAW_CFLAGS $CFLAGS $JNI_INCLUDES
+  JAW_CFLAGS=$JAW_CFLAGS $CFLAGS
 else
   AC_MSG_ERROR("You should compile with GCC")
 fi
diff --git a/jni/src/Makefile.am b/jni/src/Makefile.am
index e57cba5..0720755 100644
--- a/jni/src/Makefile.am
+++ b/jni/src/Makefile.am
@@ -24,9 +24,11 @@ noinst_HEADERS = jawimpl.h \
                  jawutil.h \
                  jawwindow.h
 
-libatk_wrapper_la_CFLAGS = $(JAW_CFLAGS)
+libatk_wrapper_la_CFLAGS = $(JAW_CFLAGS) \
+                           $(JNI_INCLUDES)
 
-libatk_wrapper_la_CPPFLAGS = $(JAW_CFLAGS)
+libatk_wrapper_la_CPPFLAGS = $(JAW_CFLAGS) \
+                             $(JNI_INCLUDES)
 
 libatk_wrapper_la_LDFLAGS = $(LIB_ATK_WRAPPER_LD_FLAGS) \
                             $(LT_VERSION_INFO) \