* Improved --with-jni support in configure to allow specification

of an include directory.


git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1276 4e78687f-474d-0410-85f9-8d5e500ac6b2

13 files changed, 257 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 27fb654e..07fdac10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-30  Frank Warmerdam  <warmerdam@pobox.com>
+
+	* Improved --with-jni support in configure to allow specification
+	of an include directory.  
+
 Rel. 4.4.9 2004-10-29
 -------------------------------------------------------------------------
 	
diff --git a/Makefile.in b/Makefile.in
index b98cb564..8f53f6bf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -103,6 +103,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+JNI_INCLUDE = @JNI_INCLUDE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
diff --git a/configure b/configure
index 88b04058..c24d6620 100755
--- a/configure
+++ b/configure
@@ -464,7 +464,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL JNI_INCLUDE LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1046,7 +1046,7 @@ Optional Packages:
                           both]
   --with-tags[=TAGS]
                           include additional configurations [automatic]
-  --with-jni              Include Java/JNI support
+  --with-jni=dir          Include Java/JNI support, add optional include dir
 
 Some influential environment variables:
   CC          C compiler command
@@ -19498,8 +19498,8 @@ fi
 
 
 
-{ echo "$as_me:$LINENO: checking whether to enable Java/JNI support..." >&5
-echo "$as_me: checking whether to enable Java/JNI support..." >&6;}
+JNI_INCLUDE=
+export JNI_INCLUDE
 
 
 # Check whether --with-jni or --without-jni was given.
@@ -19510,7 +19510,28 @@ fi;
 
 if test "$with_jni" = "yes" ; then
 
-  JNI_ENABLED=1
+
+cat >>confdefs.h <<\_ACEOF
+#define JNI_ENABLED 1
+_ACEOF
+
+
+  echo "$as_me:$LINENO: checking whether to enable Java/JNI support" >&5
+echo $ECHO_N "checking whether to enable Java/JNI support... $ECHO_C" >&6
+
+  echo "$as_me:$LINENO: result: enabled" >&5
+echo "${ECHO_T}enabled" >&6
+
+elif test "$with_jni" != "no" -a "$with_jni" != "" ; then
+
+  echo "$as_me:$LINENO: checking whether to enable Java/JNI support" >&5
+echo $ECHO_N "checking whether to enable Java/JNI support... $ECHO_C" >&6
+
+  if test \! -r "$with_jni/jni.h" ; then
+    { { echo "$as_me:$LINENO: error: Did not find $with_jni/jni.h" >&5
+echo "$as_me: error: Did not find $with_jni/jni.h" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
 
 
 cat >>confdefs.h <<\_ACEOF
@@ -19521,11 +19542,189 @@ _ACEOF
   echo "$as_me:$LINENO: result: enabled" >&5
 echo "${ECHO_T}enabled" >&6
 
+  JNI_INCLUDE="-I$with_jni"
+
+elif test "$with_jni" = "" ; then
+
+for ac_header in jni.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ---------------------------------- ##
+## Report this to warmerdam@pobox.com ##
+## ---------------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+  echo "$as_me:$LINENO: checking whether to enable Java/JNI support" >&5
+echo $ECHO_N "checking whether to enable Java/JNI support... $ECHO_C" >&6
+
+  if test "$ac_cv_header_jni_h" = "no" ; then
+    echo "$as_me:$LINENO: result: disabled" >&5
+echo "${ECHO_T}disabled" >&6
+  else
+    echo "$as_me:$LINENO: result: enabled" >&5
+echo "${ECHO_T}enabled" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define JNI_ENABLED 1
+_ACEOF
+
+  fi
+
+else
+  echo "$as_me:$LINENO: checking whether to enable Java/JNI support" >&5
+echo $ECHO_N "checking whether to enable Java/JNI support... $ECHO_C" >&6
+
   echo "$as_me:$LINENO: result: disabled" >&5
 echo "${ECHO_T}disabled" >&6
 fi
 
+JNI_INCLUDE=$JNI_INCLUDE
+
+
+
+
 
                                                                                           ac_config_files="$ac_config_files Makefile src/Makefile man/Makefile man/man1/Makefile man/man3/Makefile nad/Makefile jniwrap/Makefile jniwrap/org/Makefile jniwrap/org/proj4/Makefile"
 cat >confcache <<\_ACEOF
@@ -20253,6 +20452,7 @@ s,@F77@,$F77,;t t
 s,@FFLAGS@,$FFLAGS,;t t
 s,@ac_ct_F77@,$ac_ct_F77,;t t
 s,@LIBTOOL@,$LIBTOOL,;t t
+s,@JNI_INCLUDE@,$JNI_INCLUDE,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF
diff --git a/configure.in b/configure.in
index 5f6f7696..b34661f9 100644
--- a/configure.in
+++ b/configure.in
@@ -26,23 +26,56 @@ dnl ---------------------------------------------------------------------------
 dnl Check for JNI support.
 dnl ---------------------------------------------------------------------------
 
-AC_CHECKING(whether to enable Java/JNI support)
+JNI_INCLUDE=
+export JNI_INCLUDE
 
 AC_ARG_WITH(jni,
-[  --with-jni              Include Java/JNI support],,)
+[  --with-jni=dir          Include Java/JNI support, add optional include dir],,)
 
 if test "$with_jni" = "yes" ; then
 
-  JNI_ENABLED=1
+  AC_DEFINE(JNI_ENABLED,1,[Enabled for Java/JNI Support])
+
+  AC_MSG_CHECKING(whether to enable Java/JNI support)
+
+  AC_MSG_RESULT([enabled])
 
+elif test "$with_jni" != "no" -a "$with_jni" != "" ; then
+
+  AC_MSG_CHECKING(whether to enable Java/JNI support)
+
+  if test \! -r "$with_jni/jni.h" ; then
+    AC_MSG_ERROR(Did not find $with_jni/jni.h)
+  fi
+   
   AC_DEFINE(JNI_ENABLED,1,[Enabled for Java/JNI Support])
 
   AC_MSG_RESULT([enabled])
 
+  JNI_INCLUDE="-I$with_jni"
+
+elif test "$with_jni" = "" ; then
+  AC_CHECK_HEADERS(jni.h)
+
+  AC_MSG_CHECKING(whether to enable Java/JNI support)
+
+  if test "$ac_cv_header_jni_h" = "no" ; then   
+    AC_MSG_RESULT([disabled])
+  else
+    AC_MSG_RESULT([enabled])
+    AC_DEFINE(JNI_ENABLED,1,[Enabled for Java/JNI Support])
+  fi
+
 else
+  AC_MSG_CHECKING(whether to enable Java/JNI support)
+
   AC_MSG_RESULT([disabled])
 fi
 
+AC_SUBST(JNI_INCLUDE,$JNI_INCLUDE)
+
+
+
 
 AC_OUTPUT(Makefile src/Makefile man/Makefile man/man1/Makefile \
 	man/man3/Makefile nad/Makefile \
diff --git a/jniwrap/Makefile.in b/jniwrap/Makefile.in
index 4d1cbbdd..9b8859a2 100644
--- a/jniwrap/Makefile.in
+++ b/jniwrap/Makefile.in
@@ -88,6 +88,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+JNI_INCLUDE = @JNI_INCLUDE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
diff --git a/jniwrap/org/Makefile.in b/jniwrap/org/Makefile.in
index fbc3bd79..401ad7b4 100644
--- a/jniwrap/org/Makefile.in
+++ b/jniwrap/org/Makefile.in
@@ -88,6 +88,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+JNI_INCLUDE = @JNI_INCLUDE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
diff --git a/jniwrap/org/proj4/Makefile.in b/jniwrap/org/proj4/Makefile.in
index 725f1161..cddd51e1 100644
--- a/jniwrap/org/proj4/Makefile.in
+++ b/jniwrap/org/proj4/Makefile.in
@@ -79,6 +79,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+JNI_INCLUDE = @JNI_INCLUDE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
diff --git a/man/Makefile.in b/man/Makefile.in
index 728a6d99..28177b6b 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -88,6 +88,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+JNI_INCLUDE = @JNI_INCLUDE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
diff --git a/man/man1/Makefile.in b/man/man1/Makefile.in
index 02427a80..8b842fdd 100644
--- a/man/man1/Makefile.in
+++ b/man/man1/Makefile.in
@@ -83,6 +83,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+JNI_INCLUDE = @JNI_INCLUDE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
diff --git a/man/man3/Makefile.in b/man/man3/Makefile.in
index 9e2d9684..5c8087fe 100644
--- a/man/man3/Makefile.in
+++ b/man/man3/Makefile.in
@@ -83,6 +83,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+JNI_INCLUDE = @JNI_INCLUDE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
diff --git a/nad/Makefile.in b/nad/Makefile.in
index fed9fc78..101e7646 100644
--- a/nad/Makefile.in
+++ b/nad/Makefile.in
@@ -83,6 +83,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+JNI_INCLUDE = @JNI_INCLUDE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
diff --git a/src/Makefile.am b/src/Makefile.am
index 2b90d6ef..43187bb6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS =	proj nad2nad nad2bin geod cs2cs
 
-INCLUDES =	-DPROJ_LIB=\"$(pkgdatadir)\"
+INCLUDES =	-DPROJ_LIB=\"$(pkgdatadir)\" @JNI_INCLUDE@
 
 include_HEADERS = projects.h nad_list.h proj_api.h org_proj4_Projections.h
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 5b2c9270..130771dd 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -240,6 +240,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+JNI_INCLUDE = @JNI_INCLUDE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -304,7 +305,7 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-INCLUDES = -DPROJ_LIB=\"$(pkgdatadir)\"
+INCLUDES = -DPROJ_LIB=\"$(pkgdatadir)\" @JNI_INCLUDE@
 include_HEADERS = projects.h nad_list.h proj_api.h org_proj4_Projections.h
 EXTRA_DIST = makefile.vc proj.def
 proj_SOURCES = proj.c gen_cheb.c p_series.c