[kaffe] CVS kaffe (robilad): m4/classpath.m4: Removed unused check for jni.h.

Kaffe CVS cvs-commits at kaffe.org
Thu Jun 14 06:18:47 PDT 2007


PatchSet 7491 
Date: 2007/06/14 13:17:18
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
2007-06-14  Dalibor Topic  <robilad at kaffe.org>

        * m4/classpath.m4: Removed unused check for jni.h.

Members: 
	ChangeLog:1.4990->1.4991 
	configure:1.585->1.586 
	config/config.h.in:1.165->1.166 
	m4/classpath.m4:1.1->1.2 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4990 kaffe/ChangeLog:1.4991
--- kaffe/ChangeLog:1.4990	Wed Jun 13 22:40:35 2007
+++ kaffe/ChangeLog	Thu Jun 14 13:17:18 2007
@@ -1,3 +1,7 @@
+2007-06-14  Dalibor Topic  <robilad at kaffe.org>
+
+	* m4/classpath.m4: Removed unused check for jni.h.
+
 2007-06-13  Dalibor Topic  <robilad at kaffe.org>
 
 	* test/regression/Reflect.java: Simplified.
Index: kaffe/configure
diff -u kaffe/configure:1.585 kaffe/configure:1.586
--- kaffe/configure:1.585	Wed Jun 13 02:19:29 2007
+++ kaffe/configure	Thu Jun 14 13:17:19 2007
@@ -26339,153 +26339,6 @@
 { echo "$as_me:$LINENO: result: ${CLASSPATH_INCLUDEDIR}" >&5
 echo "${ECHO_T}${CLASSPATH_INCLUDEDIR}" >&6; }
 
-as_ac_Header=`echo "ac_cv_header_${CLASSPATH_INCLUDEDIR}/jni.h" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for ${CLASSPATH_INCLUDEDIR}/jni.h" >&5
-echo $ECHO_N "checking for ${CLASSPATH_INCLUDEDIR}/jni.h... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking ${CLASSPATH_INCLUDEDIR}/jni.h usability" >&5
-echo $ECHO_N "checking ${CLASSPATH_INCLUDEDIR}/jni.h 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 <${CLASSPATH_INCLUDEDIR}/jni.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; 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 core 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 ${CLASSPATH_INCLUDEDIR}/jni.h presence" >&5
-echo $ECHO_N "checking ${CLASSPATH_INCLUDEDIR}/jni.h 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 <${CLASSPATH_INCLUDEDIR}/jni.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.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: ${CLASSPATH_INCLUDEDIR}/jni.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: ${CLASSPATH_INCLUDEDIR}/jni.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ${CLASSPATH_INCLUDEDIR}/jni.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: ${CLASSPATH_INCLUDEDIR}/jni.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: ${CLASSPATH_INCLUDEDIR}/jni.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: ${CLASSPATH_INCLUDEDIR}/jni.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ${CLASSPATH_INCLUDEDIR}/jni.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: ${CLASSPATH_INCLUDEDIR}/jni.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ${CLASSPATH_INCLUDEDIR}/jni.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: ${CLASSPATH_INCLUDEDIR}/jni.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ${CLASSPATH_INCLUDEDIR}/jni.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: ${CLASSPATH_INCLUDEDIR}/jni.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ${CLASSPATH_INCLUDEDIR}/jni.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: ${CLASSPATH_INCLUDEDIR}/jni.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ${CLASSPATH_INCLUDEDIR}/jni.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: ${CLASSPATH_INCLUDEDIR}/jni.h: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ------------------------------ ##
-## Report this to kaffe at kaffe.org ##
-## ------------------------------ ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for ${CLASSPATH_INCLUDEDIR}/jni.h" >&5
-echo $ECHO_N "checking for ${CLASSPATH_INCLUDEDIR}/jni.h... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define CLASSPATH_JNI_H "${CLASSPATH_INCLUDEDIR}/jni.h"
-_ACEOF
-
-else
-  { { echo "$as_me:$LINENO: error: cannot find jni.h" >&5
-echo "$as_me: error: cannot find jni.h" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-
 
 
 if test x$with_system_classpath = xyes; then
Index: kaffe/config/config.h.in
diff -u kaffe/config/config.h.in:1.165 kaffe/config/config.h.in:1.166
--- kaffe/config/config.h.in:1.165	Wed Jun 13 02:19:30 2007
+++ kaffe/config/config.h.in	Thu Jun 14 13:17:19 2007
@@ -9,9 +9,6 @@
 /* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */
 #undef BYTEORDER
 
-/* Java core library jni.h header */
-#undef CLASSPATH_JNI_H
-
 /* __GLIBC__ */
 #undef COMPILE_VALUE_GLIBC
 
Index: kaffe/m4/classpath.m4
diff -u kaffe/m4/classpath.m4:1.1 kaffe/m4/classpath.m4:1.2
--- kaffe/m4/classpath.m4:1.1	Wed Jun 13 02:19:41 2007
+++ kaffe/m4/classpath.m4	Thu Jun 14 13:17:20 2007
@@ -79,8 +79,4 @@
             [CLASSPATH_INCLUDEDIR=${withval}],
             [CLASSPATH_INCLUDEDIR=${CLASSPATH_PREFIX}/include])
 AC_MSG_RESULT(${CLASSPATH_INCLUDEDIR})
-
-AC_CHECK_HEADER([${CLASSPATH_INCLUDEDIR}/jni.h],
-                [AC_DEFINE_UNQUOTED([CLASSPATH_JNI_H], "${CLASSPATH_INCLUDEDIR}/jni.h", [Java core library jni.h header])],
-                [AC_MSG_ERROR(cannot find jni.h)])
 ])



More information about the kaffe mailing list