Mercurial > hg > release > icedtea7-2.3
changeset 2577:5954829aa7ed
Actually test for missing classes rather than assuming if not on a Sun JDK.
2012-08-02 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.am:
(ICEDTEA_BOOTSTRAP_CLASSES): Only add
javax.management.remote.JMXServiceURL
and javax.management.modelmbean.ModelMBeanInfo
if missing.
* configure.ac: Check for
javax.management.remote.JMXServiceURL and
javax.management.modelmbean.ModelMBeanInfo
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Fri, 03 Aug 2012 01:54:31 +0100 |
| parents | f61cb5d6d39b |
| children | ba9886ae5d7f |
| files | ChangeLog Makefile.am configure.ac |
| diffstat | 3 files changed, 28 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Jul 27 09:26:20 2012 +0100 +++ b/ChangeLog Fri Aug 03 01:54:31 2012 +0100 @@ -1,3 +1,14 @@ +2012-08-02 Andrew John Hughes <gnu_andrew@member.fsf.org> + + * Makefile.am: + (ICEDTEA_BOOTSTRAP_CLASSES): Only add + javax.management.remote.JMXServiceURL + and javax.management.modelmbean.ModelMBeanInfo + if missing. + * configure.ac: Check for + javax.management.remote.JMXServiceURL and + javax.management.modelmbean.ModelMBeanInfo + 2012-07-27 Andrew John Hughes <gnu_andrew@member.fsf.org> * Makefile.am:
--- a/Makefile.am Fri Jul 27 09:26:20 2012 +0100 +++ b/Makefile.am Fri Aug 03 01:54:31 2012 +0100 @@ -99,16 +99,26 @@ SOURCEPATH_DIRS = $(abs_top_srcdir)/generated:$(OPENJDK_SOURCEPATH_DIRS) # Sources used from OpenJDK. +ICEDTEA_BOOTSTRAP_CLASSES = + if LACKS_SUN_AWT_TOOLKIT #PR43148 - javac fails due to missing java.util.regex.Matcher.quoteReplacement +#PR42003 - Missing javax.swing.plaf.basic.BasicDirectoryModel methods cause OpenJDK build failure +ICEDTEA_BOOTSTRAP_CLASSES += \ + $(SHARE)/java/util/regex/Matcher.java \ + $(SHARE)/javax/swing/plaf/basic/BasicDirectoryModel.java +endif + #PR48033 - Missing javax.management.remote.JMXServiceURL +if LACKS_JAVAX_MANAGEMENT_REMOTE_JMXSERVICEURL +ICEDTEA_BOOTSTRAP_CLASSES += \ + $(SHARE)/javax/management/remote/JMXServiceURL.java +endif + #PR48034 - javax.management.modelmbean.ModelMBeanInfo -#PR42003 - Missing javax.swing.plaf.basic.BasicDirectoryModel methods cause OpenJDK build failure +if LACKS_JAVAX_MANAGEMENT_MODELMBEAN_MODELMBEANINFO ICEDTEA_BOOTSTRAP_CLASSES = \ - $(SHARE)/java/util/regex/Matcher.java \ - $(SHARE)/javax/management/remote/JMXServiceURL.java \ - $(SHARE)/javax/management/modelmbean/ModelMBeanInfo.java \ - $(SHARE)/javax/swing/plaf/basic/BasicDirectoryModel.java + $(SHARE)/javax/management/modelmbean/ModelMBeanInfo.java endif # Settings for javac
--- a/configure.ac Fri Jul 27 09:26:20 2012 +0100 +++ b/configure.ac Fri Aug 03 01:54:31 2012 +0100 @@ -118,6 +118,8 @@ IT_CHECK_FOR_CLASS([JAVAX_ANNOTATION_RESOURCE], [javax.annotation.Resource]) IT_GETDTDTYPE_CHECK IT_CHECK_FOR_CLASS([SUN_AWT_TOOLKIT], [sun.awt.SunToolkit]) +IT_CHECK_FOR_CLASS([JAVAX_MANAGEMENT_REMOTE_JMXSERVICEURL], [javax.management.remote.JMXServiceURL]) +IT_CHECK_FOR_CLASS([JAVAX_MANAGEMENT_MODELMBEAN_MODELMBEANINFO], [javax.management.modelmbean.ModelMBeanInfo]) IT_CHECK_ENABLE_WARNINGS IT_DIAMOND_CHECK IT_BYTECODE7_CHECK