diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-06-01 22:56:01 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-06-01 22:56:01 +0000 |
| commit | ba86e8c889f4e5d06cc6c25174ef71887eb81732 (patch) | |
| tree | 832cf564158fc33968325e2e10a0f1aabed1b475 | |
| parent | c7ce17df07c8c8dd25698e25eec66d5e96895234 (diff) | |
| download | classpath-ba86e8c889f4e5d06cc6c25174ef71887eb81732.tar.gz | |
2008-06-01 Andrew John Hughes <gnu_andrew@member.fsf.org>
* configure.ac: Only regenerate headers by
default if the headers aren't in the source tree.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.ac | 8 |
2 files changed, 11 insertions, 2 deletions
@@ -1,5 +1,10 @@ 2008-06-01 Andrew John Hughes <gnu_andrew@member.fsf.org> + * configure.ac: Only regenerate headers by + default if the headers aren't in the source tree. + +2008-06-01 Andrew John Hughes <gnu_andrew@member.fsf.org> + * configure.ac: Only run javac check if examples, tools and/or class library are being built. diff --git a/configure.ac b/configure.ac index 891d7d0d4..ccae37adc 100644 --- a/configure.ac +++ b/configure.ac @@ -291,13 +291,17 @@ dnl ----------------------------------------------------------- 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 ----------------------------------------------------------- |