Hi all,
I've made the javah check in configure conditional on whether the JNI
headers need to actually
be regenerated, as that's the only place where we use javah.
cheers,
dalibor topic
2007-04-17 Dalibor Topic <[EMAIL PROTECTED]>
* configure.ac (CLASSPATH_WITH_JAVAH): Only check if
the JNI headers need to be regenerated.
* m4/acinclude.m4 (USER_SPECIFIED_JAVAH): Removed unused
conditional.
Index: configure.ac
===================================================================
RCS file: /sources/classpath/classpath/configure.ac,v
retrieving revision 1.207
diff -u -r1.207 configure.ac
--- configure.ac 16 Apr 2007 22:01:54 -0000 1.207
+++ configure.ac 17 Apr 2007 15:51:20 -0000
@@ -626,7 +626,9 @@
fi
fi
-CLASSPATH_WITH_JAVAH
+if test "x${REGENERATE_JNI_HEADERS}" = xyes; then
+ CLASSPATH_WITH_JAVAH
+fi
dnl -----------------------------------------------------------
dnl Add the include files for the native abstraction layer.
Index: m4/acinclude.m4
===================================================================
RCS file: /sources/classpath/classpath/m4/acinclude.m4,v
retrieving revision 1.15
diff -u -r1.15 acinclude.m4
--- m4/acinclude.m4 15 Dec 2006 22:09:28 -0000 1.15
+++ m4/acinclude.m4 17 Apr 2007 15:51:22 -0000
@@ -200,7 +200,6 @@
[
CLASSPATH_CHECK_JAVAH
])
- AM_CONDITIONAL(USER_SPECIFIED_JAVAH, test "x${USER_JAVAH}" != x)
AC_SUBST(USER_JAVAH)
])
