* configure.ac (AM_CPPFLAGS): Set to CPPFLAGS.

* m4/classpath.m4 (AC_CHECK_WITH_JNI_MD_H): Preserve CPPFLAGS.
(AC_CHECK_WITH_JNI_H): Likewise.

diff --git a/configure.ac b/configure.ac
index e232388c6721bf4110fc583d590b39f1d6639fbe..60bc74682e889248cfec16cbadf04390fea06831 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -822,13 +822,13 @@ AZ_PYTHON_LSPEC
 dnl define some stuff required for --fullversion
 AC_DEFINE_UNQUOTED(VERSION_CONFIGURE_ARGS, "$ac_configure_args", [configure arguments])
 AC_DEFINE_UNQUOTED(VERSION_CC, "$CC", [CC used])
-AC_DEFINE_UNQUOTED(VERSION_CFLAGS, "$OPT_CFLAGS $ARCH_CFLAGS $CPPFLAGS_INCLUDE", [CFLAGS used])
+AC_DEFINE_UNQUOTED(VERSION_CFLAGS, "$OPT_CFLAGS $ARCH_CFLAGS $CPPFLAGS", [CFLAGS used])
 
 
 dnl finally pass CFLAGS to Makefiles via AM_CFLAGS
 CFLAGS="$OPT_CFLAGS"
 AM_CFLAGS=$ARCH_CFLAGS
-AM_CPPFLAGS="$CPPFLAGS_INCLUDE"
+AM_CPPFLAGS="$CPPFLAGS"
 AC_SUBST(AM_CFLAGS)
 AC_SUBST(AM_CPPFLAGS)
 

diff --git a/m4/classpath.m4 b/m4/classpath.m4
index b484bff0766d1261f76afa99f689ef4e3bdb23d2..e659187f4167224d80b9e110178bcb22a138f773 100644 (file)
--- a/m4/classpath.m4
+++ b/m4/classpath.m4
@@ -127,14 +127,20 @@ dnl where jni_md.h is installed
 AC_DEFUN([AC_CHECK_WITH_JNI_MD_H],[
 AC_MSG_CHECKING(where jni_md.h is installed)
 AC_ARG_WITH([jni_md_h],
-            [AS_HELP_STRING(--with-jni_md_h=<dir>,path to jni_md.h [[default=CLASSPATH_PREFIX/include]])],
+            [AS_HELP_STRING(--with-jni_md_h=<dir>,path to jni_md.h [[default=(sun:CLASSPATH_PREFIX/include/linux,*:CLASSPATH_PREFIX/include)]])],
             [WITH_JNI_MD_H=${withval}],
-            [WITH_JNI_MD_H=${CLASSPATH_PREFIX}/include])
+            [case "${WITH_CLASSPATH}" in
+                 sun)
+                     WITH_JNI_MD_H=${CLASSPATH_PREFIX}/include/linux
+                     ;;
+                 *)
+                     WITH_JNI_MD_H=${CLASSPATH_PREFIX}/include
+                     ;;
+            esac])
 AC_MSG_RESULT(${WITH_JNI_MD_H})
 
 dnl We use CPPFLAGS so jni.h can find jni_md.h
-CPPFLAGS_INCLUDE="${CPPFLAGS_INCLUDE} -I${WITH_JNI_MD_H}"
-CPPFLAGS="${CPPFLAGS_INCLUDE}"
+CPPFLAGS="${CPPFLAGS} -I${WITH_JNI_MD_H}"
 
 AC_CHECK_HEADER([${WITH_JNI_MD_H}/jni_md.h],
                 [AC_DEFINE_UNQUOTED([INCLUDE_JNI_MD_H], "${WITH_JNI_MD_H}/jni_md.h", [Java core library jni_md.h header])],
@@ -153,8 +159,7 @@ AC_ARG_WITH([jni_h],
 AC_MSG_RESULT(${WITH_JNI_H})
 
 dnl We use CPPFLAGS so jni.h can find jni_md.h
-CPPFLAGS_INCLUDE="${CPPFLAGS_INCLUDE} -I${WITH_JNI_H}"
-CPPFLAGS="${CPPFLAGS_INCLUDE}"
+CPPFLAGS="${CPPFLAGS} -I${WITH_JNI_H}"
 
 AC_CHECK_HEADER([${WITH_JNI_H}/jni.h],
                 [AC_DEFINE_UNQUOTED([INCLUDE_JNI_H], "${WITH_JNI_H}/jni.h", [Java core library jni.h header])],