[cp-patches] [release] FYI: Allow native-only build #06: Regenerate headers by default only when necessary

Andrew John Hughes gnu_andrew at member.fsf.org
Sun Jun 1 22:55:40 UTC 2008


This changes the default behaviour for a source tree
which already contains the header files.  It now won't
regenerate them unless asked.  Generating them by default
for a development (CVS) tree remains the default.  This
moves javah to being a dev-only requirement.

ChangeLog:

2008-06-01  Andrew John Hughes  <gnu_andrew at member.fsf.org>

	* configure.ac: Only regenerate headers by
	default if the headers aren't in the source tree.

-- 
Andrew :)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8
-------------- next part --------------
Index: configure.ac
===================================================================
RCS file: /sources/classpath/classpath/configure.ac,v
retrieving revision 1.225.2.3
diff -u -u -r1.225.2.3 configure.ac
--- configure.ac	1 Jun 2008 22:09:52 -0000	1.225.2.3
+++ configure.ac	1 Jun 2008 22:42:26 -0000
@@ -291,13 +291,17 @@
 dnl Regenerate headers at build time (disabled by default)
 dnl -----------------------------------------------------------
 AC_ARG_ENABLE([regen-headers],
-              [AS_HELP_STRING(--enable-regen-headers,automatically regenerate JNI headers [default=yes])],
+              [AS_HELP_STRING(--enable-regen-headers,automatically regenerate JNI headers [default=yes if headers don't exist])],
               [case "${enableval}" in
                 yes) REGENERATE_JNI_HEADERS=yes ;;
                 no) REGENERATE_JNI_HEADERS=no ;;
                 *) REGENERATE_JNI_HEADERS=yes ;;
               esac],
-              [REGENERATE_JNI_HEADERS=yes])
+              [if test -e include/java_lang_VMSystem.h; then
+			REGENERATE_JNI_HEADERS=no ;
+		   else
+			REGENERATE_JNI_HEADERS=yes ;
+	       fi])
 AM_CONDITIONAL(CREATE_JNI_HEADERS, test "x${REGENERATE_JNI_HEADERS}" = xyes)
 
 dnl -----------------------------------------------------------


More information about the Classpath-patches mailing list