Mercurial > hg > icedtea6
changeset 2938:3465dd7f9596
Make the inclusion of javax.security.auth.kerberos.KerberosTicket dependent on getSessionKeyType() being missing.
2013-01-21 Andrew John Hughes <gnu.andrew@redhat.com>
* Makefile.am:
(ICEDTEA_BOOTSTRAP_CLASSES): Make the inclusion
of javax.security.auth.kerberos.KerberosTicket
dependent on getSessionKeyType() being missing.
* configure.ac:
Add IT_CHECK_FOR_METHOD calls for
getSessionKeyType() which is missing in some
older versions of GCJ and GNU Classpath (<0.99).
| author | Andrew John Hughes <gnu.andrew@redhat.com> |
|---|---|
| date | Mon, 21 Jan 2013 22:34:53 +0000 |
| parents | cc35a9049bdd |
| children | bc8359665940 |
| files | ChangeLog Makefile.am configure.ac |
| diffstat | 3 files changed, 24 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Jan 21 21:46:50 2013 +0000 +++ b/ChangeLog Mon Jan 21 22:34:53 2013 +0000 @@ -1,3 +1,14 @@ +2013-01-21 Andrew John Hughes <gnu.andrew@redhat.com> + + * Makefile.am: + (ICEDTEA_BOOTSTRAP_CLASSES): Make the inclusion + of javax.security.auth.kerberos.KerberosTicket + dependent on getSessionKeyType() being missing. + * configure.ac: + Add IT_CHECK_FOR_METHOD calls for + getSessionKeyType() which is missing in some + older versions of GCJ and GNU Classpath (<0.99). + 2013-01-21 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am:
--- a/Makefile.am Mon Jan 21 21:46:50 2013 +0000 +++ b/Makefile.am Mon Jan 21 22:34:53 2013 +0000 @@ -65,8 +65,7 @@ # PR54275 - sun.security.sasl requires missing Sasl.CREDENTIALS field ICEDTEA_BOOTSTRAP_CLASSES = \ - $(SHARE)/javax/security/sasl/Sasl.java \ - $(SHARE)/javax/security/auth/kerberos/KerberosTicket.java + $(SHARE)/javax/security/sasl/Sasl.java #PR42003 - Missing javax.swing.plaf.basic.BasicDirectoryModel methods cause OpenJDK build failure if LACKS_JAVAX_SWING_PLAF_BASIC_BASICDIRECTORYMODEL_ADDPROPERTYCHANGELISTENER @@ -118,6 +117,12 @@ endif endif +# PR41686 - Building sun.security.jgss.GSSUtil requires javax.security.auth.kerberos.KerberosTicket.getSessionKeyType() +if LACKS_JAVAX_SECURITY_AUTH_KERBEROS_KERBEROSTICKET_GETSESSIONKEYTYPE +ICEDTEA_BOOTSTRAP_CLASSES += \ + $(SHARE)/javax/security/auth/kerberos/KerberosTicket.java +endif + # Flags MEMORY_LIMIT = -J-Xmx1024m IT_CFLAGS=$(CFLAGS) $(ARCHFLAG)
--- a/configure.ac Mon Jan 21 21:46:50 2013 +0000 +++ b/configure.ac Mon Jan 21 22:34:53 2013 +0000 @@ -109,6 +109,12 @@ ["setIssuers",java.util.Collection.class], [new java.security.cert.X509CRLSelector().setIssuers(new java.util.ArrayList<javax.security.auth.x500.X500Principal>())] ) +IT_CHECK_FOR_METHOD([JAVAX_SECURITY_AUTH_KERBEROS_KERBEROSTICKET_GETSESSIONKEYTYPE], + [javax.security.auth.kerberos.KerberosTicket.getSessionKeyType()], + [javax.security.auth.kerberos.KerberosTicket], + ["getSessionKeyType"], + [new javax.security.auth.kerberos.KerberosTicket(null,null,null,null,0,null,null,null,null,null,null).getSessionKeyType()] +) # Use xvfb-run if found to run gui tests (check-jdk). AC_CHECK_PROG(XVFB_RUN_CMD, xvfb-run, [xvfb-run -a -e xvfb-errors], [])