[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath

Kaffe CVS cvs-commits at kaffe.org
Mon Dec 12 19:30:25 PST 2005


PatchSet 7000 
Date: 2005/12/13 03:19:23
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath

Members: 
	ChangeLog:1.4521->1.4522 
	developers/resync-classpath.sh:1.3->1.4 
	libraries/javalib/external/classpath/ChangeLog:1.5->1.6 
	libraries/javalib/external/classpath/Makefile.in:1.5->1.6 
	libraries/javalib/external/classpath/aclocal.m4:1.5->1.6 
	libraries/javalib/external/classpath/configure:1.8->1.9 
	libraries/javalib/external/classpath/doc/Makefile.in:1.3->1.4 
	libraries/javalib/external/classpath/doc/hacking.texinfo:1.1->1.2 
	libraries/javalib/external/classpath/doc/api/Makefile.in:1.3->1.4 
	libraries/javalib/external/classpath/doc/www.gnu.org/cp-tools/texidoclet.html:1.4->1.5 
	libraries/javalib/external/classpath/doc/www.gnu.org/include/macros.wml:1.4->1.5 
	libraries/javalib/external/classpath/examples/Makefile.in:1.6->1.7 
	libraries/javalib/external/classpath/external/Makefile.in:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/Makefile.in:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/AttributeList.java:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/Attributes.java:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ContentHandler.java:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/DTDHandler.java:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/DocumentHandler.java:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/EntityResolver.java:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ErrorHandler.java:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/HandlerBase.java:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/InputSource.java:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/Locator.java:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/Parser.java:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXException.java:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXNotRecognizedException.java:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXNotSupportedException.java:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXParseException.java:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/XMLFilter.java:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/XMLReader.java:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/package.html:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Attributes2.java:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Attributes2Impl.java:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/DeclHandler.java:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/DefaultHandler2.java:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/EntityResolver2.java:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/LexicalHandler.java:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Locator2.java:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Locator2Impl.java:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/package.html:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/AttributeListImpl.java:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/AttributesImpl.java:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/DefaultHandler.java:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/LocatorImpl.java:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/NamespaceSupport.java:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/NewInstance.java:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/ParserAdapter.java:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/ParserFactory.java:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLFilterImpl.java:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLReaderAdapter.java:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLReaderFactory.java:1.5->1.6 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/package.html:1.5->1.6 
	libraries/javalib/external/classpath/external/w3c_dom/Makefile.in:1.5->1.6 
	libraries/javalib/external/classpath/gnu/xml/stream/CRLFReader.java:INITIAL->1.1 
	libraries/javalib/external/classpath/gnu/xml/stream/SAXParser.java:INITIAL->1.1 
	libraries/javalib/external/classpath/gnu/xml/stream/SAXParserFactory.java:INITIAL->1.1 
	libraries/javalib/external/classpath/gnu/xml/stream/XMLInputFactoryImpl.java:1.1->1.2 
	libraries/javalib/external/classpath/gnu/xml/stream/XMLInputStreamReader.java:INITIAL->1.1 
	libraries/javalib/external/classpath/gnu/xml/stream/XMLParser.java:INITIAL->1.1 
	libraries/javalib/external/classpath/include/Makefile.in:1.5->1.6 
	libraries/javalib/external/classpath/java/io/ObjectOutputStream.java:1.3->1.4 
	libraries/javalib/external/classpath/java/io/ObjectStreamClass.java:1.2->1.3 
	libraries/javalib/external/classpath/java/security/Security.java:1.1->1.2 
	libraries/javalib/external/classpath/javax/security/auth/login/AccountException.java:INITIAL->1.1 
	libraries/javalib/external/classpath/javax/security/auth/login/AccountExpiredException.java:1.1->1.2 
	libraries/javalib/external/classpath/javax/security/auth/login/AccountLockedException.java:INITIAL->1.1 
	libraries/javalib/external/classpath/javax/security/auth/login/AccountNotFoundException.java:INITIAL->1.1 
	libraries/javalib/external/classpath/javax/security/auth/login/CredentialException.java:INITIAL->1.1 
	libraries/javalib/external/classpath/javax/security/auth/login/CredentialExpiredException.java:1.1->1.2 
	libraries/javalib/external/classpath/javax/security/auth/login/CredentialNotFoundException.java:INITIAL->1.1 
	libraries/javalib/external/classpath/javax/security/auth/login/LoginContext.java:1.2->1.3 
	libraries/javalib/external/classpath/javax/swing/JComponent.java:1.3->1.4 
	libraries/javalib/external/classpath/javax/swing/JEditorPane.java:1.2->1.3 
	libraries/javalib/external/classpath/javax/swing/ViewportLayout.java:1.3->1.4 
	libraries/javalib/external/classpath/javax/swing/text/html/BlockView.java:INITIAL->1.1 
	libraries/javalib/external/classpath/javax/swing/text/html/CSS.java:1.1->1.2 
	libraries/javalib/external/classpath/javax/swing/text/html/HTMLDocument.java:1.2->1.3 
	libraries/javalib/external/classpath/javax/swing/text/html/HTMLEditorKit.java:1.2->1.3 
	libraries/javalib/external/classpath/lib/Makefile.am:1.5->1.6 
	libraries/javalib/external/classpath/lib/Makefile.in:1.8->1.9 
	libraries/javalib/external/classpath/lib/copy-vmresources.sh.in:1.2->1.3 
	libraries/javalib/external/classpath/m4/acinclude.m4:1.1->1.2 
	libraries/javalib/external/classpath/native/Makefile.in:1.5->1.6 
	libraries/javalib/external/classpath/native/fdlibm/Makefile.in:1.5->1.6 
	libraries/javalib/external/classpath/native/jawt/Makefile.in:1.5->1.6 
	libraries/javalib/external/classpath/native/jni/Makefile.in:1.5->1.6 
	libraries/javalib/external/classpath/native/jni/classpath/Makefile.in:1.6->1.7 
	libraries/javalib/external/classpath/native/jni/gtk-peer/Makefile.in:1.6->1.7 
	libraries/javalib/external/classpath/native/jni/java-io/Makefile.in:1.6->1.7 
	libraries/javalib/external/classpath/native/jni/java-lang/Makefile.in:1.5->1.6 
	libraries/javalib/external/classpath/native/jni/java-net/Makefile.in:1.5->1.6 
	libraries/javalib/external/classpath/native/jni/java-nio/Makefile.in:1.5->1.6 
	libraries/javalib/external/classpath/native/jni/java-util/Makefile.in:1.5->1.6 
	libraries/javalib/external/classpath/native/jni/midi-alsa/Makefile.in:1.5->1.6 
	libraries/javalib/external/classpath/native/jni/midi-dssi/Makefile.in:1.6->1.7 
	libraries/javalib/external/classpath/native/jni/qt-peer/Makefile.in:1.5->1.6 
	libraries/javalib/external/classpath/native/jni/xmlj/Makefile.in:1.5->1.6 
	libraries/javalib/external/classpath/native/target/Makefile.in:1.5->1.6 
	libraries/javalib/external/classpath/native/target/Linux/Makefile.in:1.5->1.6 
	libraries/javalib/external/classpath/native/target/generic/Makefile.in:1.5->1.6 
	libraries/javalib/external/classpath/resource/Makefile.in:1.5->1.6 
	libraries/javalib/external/classpath/resource/gnu/regexp/MessagesBundle_it.properties:1.5->1.6 
	libraries/javalib/external/classpath/scripts/Makefile.in:1.5->1.6 
	libraries/javalib/external/classpath/scripts/classpath.spec.in:1.5->1.6 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4521 kaffe/ChangeLog:1.4522
--- kaffe/ChangeLog:1.4521	Mon Dec 12 02:36:20 2005
+++ kaffe/ChangeLog	Tue Dec 13 03:19:23 2005
@@ -1,3 +1,7 @@
+2005-12-13  Dalibor Topic  <robilad at kaffe.org>
+
+        * libraries/javalib/external/classpath: Resynched GNU Classpath.
+
 2005-12-11  Dalibor Topic  <robilad at kaffe.org>
 
 	* libraries/clib/nio/gnu_java_nio_VMPipe.c:
Index: kaffe/developers/resync-classpath.sh
diff -u kaffe/developers/resync-classpath.sh:1.3 kaffe/developers/resync-classpath.sh:1.4
--- kaffe/developers/resync-classpath.sh:1.3	Sat Nov 26 20:29:35 2005
+++ kaffe/developers/resync-classpath.sh	Tue Dec 13 03:19:28 2005
@@ -15,7 +15,7 @@
     cd ${WORKDIR};
 
     echo "Extracting classpath from CVS"
-    cvs -z3 -d:ext:anoncvs at savannah.gnu.org:/cvsroot/classpath co -P classpath;
+     cvs -z3 -d:pserver:anonymous at cvs.sv.gnu.org:/sources/classpath co -P classpath;
     
     cd classpath;
 
Index: kaffe/libraries/javalib/external/classpath/ChangeLog
diff -u kaffe/libraries/javalib/external/classpath/ChangeLog:1.5 kaffe/libraries/javalib/external/classpath/ChangeLog:1.6
--- kaffe/libraries/javalib/external/classpath/ChangeLog:1.5	Thu Dec  8 01:50:19 2005
+++ kaffe/libraries/javalib/external/classpath/ChangeLog	Tue Dec 13 03:19:28 2005
@@ -1,3 +1,195 @@
+2005-12-12  Dalibor Topic  <robilad at kaffe.org>
+
+	Fixes bug #25353
+	* m4/acinclude.m4: Added JIKESWARNINGS makefile variable. 
+	Only add +Pno-shadow to JIKESWARNINGS if not using jikes 1.19.
+	* lib/Makefile.am: Use JIKESWARNINGS instead of explicitely
+	listing the warnings.
+
+2005-12-12  Chris Burdess  <dog at gnu.org>
+
+	* gnu/xml/stream/SAXParser.java,
+	  gnu/xml/stream/SAXParserFactory.java,
+	  gnu/xml/stream/XMLParser.java: SAX parser using StAX implementation.
+
+2005-12-12  Gary Benson  <gbenson at redhat.com>
+
+	* java/security/Security.java (setProperty): Spelling correction.
+	* java/security/Security.java (setProperty): Allow null values.
+
+2005-12-12  Roman Kennke  <kennke at aicas.com>
+
+	* javax/swing/ViewportLayout.java
+	(layoutContainer): Always check and adjust the size, not only when
+	portSize >= view.minSize.
+
+2005-12-12  Roman Kennke  <kennke at aicas.com>
+
+	* javax/swing/JComponent.java
+	(getPreferredSize): Don't check for the minimumSize. According to
+	a mauve test, this is not necessary.
+
+2005-12-12  Chris Burdess  <dog at gnu.org>
+
+	* gnu/xml/stream/XMLInputFactoryImpl.java,
+	  gnu/xml/stream/CRLFReader.java,
+	  gnu/xml/stream/XMLInputStreamReader.java,
+	  gnu/xml/stream/XMLParser.java: New StAX parser.
+
+2005-12-11  Mark Wielaard  <mark at klomp.org>
+
+	* doc/hacking.texinfo: Add section on branches.
+
+2005-12-11  Guilhem Lavaux  <guilhem at kaffe.org>
+
+	* lib/copy-vmresources.sh.in: Added some '.' after find. 
+	
+2005-12-09  Lillian Angel  <langel at redhat.com>
+
+	* javax/swing/text/html/CSS.java:
+	Fixed class signature.
+	* javax/swing/text/html/HTMLEditorKit.java:
+	Fixed class signature.
+	(LinkController): New class added with only stubs. Functions
+	are not implmented yet.
+	(InsertHTMLTextAction): New class. Constructors implemented.
+	(insertHTML): Implemented.
+	(insertAtBoundary): Added, not yet implemented.
+	(insertAtBoundry): Implemented.
+	(actionPerformed): Added, not yet implemented.
+	(HTMLTextAction): New class.
+	(getHTMLDocument): Implemented.
+	(getHTMLEditorKit): Implemented.
+	(getElementsAt): Implemented.
+	(elementCountToTag): Added, not yet implemented.
+	(findElementMatchingTag): Likewise.
+	(getViewFactory): Implemented.
+	(HTMLFactory): Moved to beginning of class, with other inner classes.
+	(ParserCallBack): Added constructor, not yet implemented.
+	(clone): Added, not yet implemented. Calls super.
+	(createInputAttributes): Likewise.
+	(install): Likewise.
+	(deinstall): Likewise.
+	(getActions): Likewise.
+	(getInputAttributes): Likewise.
+	(getDefaultCursor): Implemented.
+	(getLinkCursor): Implemented.
+	(SetLinkCursor): Implemented.
+	(setDefaultLinkCursor): Implemented.
+	(AccessibleContext): Can't implement until AccessibleHTML is
+	implemented. Currently, returns null because accessibility is not supported.
+
+2005-12-09  Anthony Balkissoon  <abalkiss at redhat.com>
+
+	* javax/swing/JEditorPane.java:
+	(setText): Allow the EditorKit to read the text into the Document,
+	allowing for other than plain text.
+
+2005-12-09  Lillian Angel  <langel at redhat.com>
+
+	* javax/swing/text/html/HTMLDocument.java
+	(getReader): Added function. Not implemented. It was
+	added so a certain mauve test committed compiles with
+	classpath fine.
+
+2005-12-09  Lillian Angel  <langel at redhat.com>
+
+	* javax/swing/text/html/HTMLEditorKit.java
+	(getViewFactory): Fixed class name of ViewFactory returned.
+	(HTMLFactory): Fixed class name to match API.
+
+2005-12-08  Lillian Angel  <langel at redhat.com>
+
+	* javax/swing/text/html/HTMLEditorKit.java
+	(insertHTML): Added method, not implemented yet.
+	(read): Likewise.
+	(write): Likewise.
+	(getContentType): Implemented.
+	(getViewFactory): Implemented.
+	(HTMLViewFactory): New package-private inner class, implemented.
+
+2005-12-08  Lillian Angel  <langel at redhat.com>
+
+	* javax/swing/text/StyledEditorKit.java
+	(create): Reverted to use BoxView. I need to write
+	a mauve test to be sure about this.
+
+2005-12-08  Lillian Angel  <langel at redhat.com>
+
+	* javax/swing/text/StyledEditorKit.java
+	(create): Changed to use BlockView here instead of BoxView.
+
+2005-12-08  Anthony Balkissoon  <abalkiss at redhat.com>
+
+	* javax/swing/JEditorPane.java:
+	(init): Changed to no-argument instead of taking in an EditorKit and
+	passing it to setEditorKit.  Callers will have to call setEditorKit
+	themselves.
+	(JEditorPane()): Changed call to init to have no arguments, call
+	setEditorKit after init.
+	(JEditorPane(String, String)): Likewise.
+	(JEditorPane(URL)): Don't call default constructor, call init and then
+	setEditorKit using the appropriate EditorKit for text/html.
+
+2005-12-08  Anthony Balkissoon  <abalkiss at redhat.com>
+
+	* javax/swing/JEditorPane.java:
+	(registerMap): New field.
+	(editorMap): New field.
+	(JEditorPane()): Call init instead of setEditorKit.
+	(JEditorPane(String, String)): Likewise.
+	(init): New method.
+	(createEditorKitForContentType): Implemented and documented.
+	(getEditorKitClassNameForContentType): Likewise.
+	(getEditorKitForContentType): Likewise.
+	(registerEditorKitForContentType): Likewise.
+	(replaceSelection): Call super (this is temporary until the real
+	implementation happens.  There is already a TODO noting that this needs
+	to be implemented.
+	(setEditorKitForContentType): Implemented and documented.
+
+2005-12-08  Lillian Angel  <langel at redhat.com>
+
+	* javax/swing/text/html/BlockView.java:
+	New class added.
+	(BlockView): Implemented.
+	(setParent): Implemented.
+	(calculateMajorAxisRequirements): Added, not fully implemented.
+	(calculateMinorAxisRequirements): Likewise.
+	(layoutMinorAxis): Likewise.
+	(paint): Implemented, but some code is commented out since
+	StyleSheet is not yet implemented.
+	(getAttributes): Likewise.
+	(getResizeWeight): Implemented.
+	(getAlignment): Implemented.
+	(changedUpdate): Implemented.
+	(getPreferredSpan): Implemented.
+	(getMinimumSpan): Implemented.
+	(getMaximumSpan): Implemented.
+	(setPropertiesFromAttributes): Added, not implemented yet. Need
+	to wait for StyleSheet to be implemented.
+
+2005-12-08  Tom Tromey  <tromey at redhat.com>
+
+	* javax/security/auth/login/LoginContext.java (LoginContext): New
+	constructor.
+	* javax/security/auth/login/CredentialNotFoundException.java: New
+	file.
+	* javax/security/auth/login/CredentialExpiredException.java: Extends
+	CredentialException.
+	* javax/security/auth/login/CredentialException.java: New file.
+	* javax/security/auth/login/AccountNotFoundException.java: New file.
+	* javax/security/auth/login/AccountLockedException.java: New file.
+	* javax/security/auth/login/AccountExpiredException.java: Extends
+	AccountException.
+	* javax/security/auth/login/AccountException.java: New file.
+
+2005-12-08  Roman Kennke  <kennke at aicas.com>
+
+	* javax/swing/JComponent.java
+	(JComponent): Don't set a layout here. The default setting should be
+	null.
+
 2005-12-07  Tom Tromey  <tromey at redhat.com>
 
 	* java/lang/Float.java (toHexString): New method.
@@ -152,7 +344,7 @@
 2005-12-01  Anthony Green  <green at redhat.com>
 
         PR bootstrap/25207
-        * configure.ac: Make sure we have an alsa library in addition to
+	* configure.ac: Make sure we have an alsa library in addition to
         the headers.  This extra test is required for systems with
         multilibs.
 
@@ -383,7 +575,8 @@
 	appropriate size String for the table.
 	(getPreferredSize): Implemented.
 	(getMinimumSize): Implemented.
-	(addControlButtons): Added action listeners for detailButton and listButton.
+	(addControlButtons): Added action listeners for detailButton and
+	listButton.
 	(setDirectorySelected): Added API documentation.
 	(getDirectoryName): Likewise.
 	(setDirectoryName): Likewise.
@@ -395,12 +588,14 @@
 	(init): Layout should not be set to FlowLayout. JDK sets it to null.
 	* javax/swing/plaf/metal/MetalFileChooserUI.java
 	(mouseClicked): Changed to call completeEditing when double-clicked.
-	(editFile): Fixed to add an action listener to the editing field. Editing
-	for filechooser now works.
-	(completeEditing): Fixed renaming to create a new file object and rescan the
-	directory if renaming was successful. Added code to cancel editing as well.
-	(EditingActionListener): New class to listen for notify action and to complete
-	editing when enter is pressed. Otherwise, editing is cancelled.
+	(editFile): Fixed to add an action listener to the editing field.
+	Editing	for filechooser now works.
+	(completeEditing): Fixed renaming to create a new file object and
+	rescan the directory if renaming was successful. Added code to cancel
+	editing as well.
+	(EditingActionListener): New class to listen for notify action and
+	to complete editing when enter is pressed. Otherwise, editing is
+	cancelled.
 	* javax/swing/plaf/metal/MetalSplitPaneDivider.java
 	(MetalDividerLayout): Changed to public.
 	(MetalDividerLayout.init): Likewise.
@@ -425,10 +620,8 @@
 
 	* native/jni/java-io/javaio.c, native/jni/java-io/javaio.h:
 	Removed.
-
 	* native/jni/java-io/java_io_VMFile.c: Removed dependency on
 	javaio.h
-
 	* native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c:
 	Likewise.
 	
@@ -507,8 +700,8 @@
 	* javax/swing/plaf/metal/MetalFileChooserUI.java
 	(propertyChange): Implemented MULTI_SELECTION_ENABLED_CHANGED_PROPERTY
 	property change.
-	(getListCellRendererComponent): Set opaque property, so background color
-	on cell is painted.
+	(getListCellRendererComponent): Set opaque property, so background
+	color on cell is painted.
 	(SingleClickListener.init): Implemented.
 	(installStrings): Fixed tooltip text strings.
 
@@ -671,8 +864,8 @@
 
 2005-11-25  Christian Thalinger  <twisti at complang.tuwien.ac.at>
 
-        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c 
-        (save_to_stream): Added missing DeleteLocalRef call.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c 
+	(save_to_stream): Added missing DeleteLocalRef call.
 
 2005-11-24  Sven de Marothy  <sven at physto.se>
 
@@ -789,9 +982,10 @@
 	(paintBottomTabBorder): Likewise.
 	(paintTabBackground): Added call to paint the highlight below the tab.
 	(getColorForGap): Added code to return selected color, if selected.
-	(shouldFillGap): Changed to return false. With JDK, gap is never filled in
-	MetalL&F.
-	(paintHighlightBelowTab): Implemented to paint the highlight on selected tabs.
+	(shouldFillGap): Changed to return false. With JDK, gap is never
+	filled in MetalL&F.
+	(paintHighlightBelowTab): Implemented to paint the highlight on
+	selected tabs.
 	(calculateMaxTabHeight): Removed.
 	(getTabLabelShiftX): Removed.
 	(getTabLabelShiftY): Removed.
Index: kaffe/libraries/javalib/external/classpath/Makefile.in
diff -u kaffe/libraries/javalib/external/classpath/Makefile.in:1.5 kaffe/libraries/javalib/external/classpath/Makefile.in:1.6
--- kaffe/libraries/javalib/external/classpath/Makefile.in:1.5	Thu Dec  8 21:29:11 2005
+++ kaffe/libraries/javalib/external/classpath/Makefile.in	Tue Dec 13 03:19:29 2005
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -167,6 +167,7 @@
 JAY_SKELETON = @JAY_SKELETON@
 JIKES = @JIKES@
 JIKESENCODING = @JIKESENCODING@
+JIKESWARNINGS = @JIKESWARNINGS@
 KJC = @KJC@
 LDFLAGS = @LDFLAGS@
 LIBDEBUG = @LIBDEBUG@
Index: kaffe/libraries/javalib/external/classpath/aclocal.m4
diff -u kaffe/libraries/javalib/external/classpath/aclocal.m4:1.5 kaffe/libraries/javalib/external/classpath/aclocal.m4:1.6
--- kaffe/libraries/javalib/external/classpath/aclocal.m4:1.5	Thu Dec  8 21:29:11 2005
+++ kaffe/libraries/javalib/external/classpath/aclocal.m4	Tue Dec 13 03:19:29 2005
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005  Free Software Foundation, Inc.
@@ -14,6 +14,7 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
 # serial 47 AC_PROG_LIBTOOL
+# Debian $Rev: 214 $
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -123,7 +124,7 @@
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
-Xsed='sed -e 1s/^X//'
+Xsed='sed -e s/^X//'
 [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
 
 # Same as above, but do not quote variable references.
@@ -191,8 +192,6 @@
   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 fi
 
-_LT_CC_BASENAME([$compiler])
-
 # Only perform the check for file, if the check method requires it
 case $deplibs_check_method in
 file_magic*)
@@ -238,48 +237,6 @@
 ])# _LT_AC_SYS_COMPILER
 
 
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-AC_DEFUN([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
-  case $cc_temp in
-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-])
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-])# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-AC_DEFUN([_LT_LINKER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
-])# _LT_LINKER_BOILERPLATE
-
-
 # _LT_AC_SYS_LIBPATH_AIX
 # ----------------------
 # Links a minimal program and checks the executable
@@ -352,7 +309,7 @@
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
 
 if test -z "$ECHO"; then
 if test "X${echo_test_string+set}" != Xset; then
@@ -621,10 +578,8 @@
    echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-     $SED '/^$/d' conftest.err >conftest.er2
-     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+     # So say no if there are warnings
+     if test ! -s conftest.err; then
        $2=yes
      fi
    fi
@@ -655,11 +610,6 @@
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
-       $SED '/^$/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         $2=yes
-       fi
      else
        $2=yes
      fi
@@ -718,38 +668,11 @@
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536 # usable default for *BSD
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    # 
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  *)
+ *)
     # If test is not a shell built-in, we'll probably end up computing a
     # maximum length that is only half of the actual maximum length, but
     # we can't tell.
-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
 	       = "XX$teststring") >/dev/null 2>&1 &&
 	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
 	    lt_cv_sys_max_cmd_len=$new_result &&
@@ -1015,9 +938,7 @@
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-     $SED '/^$/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+     if test ! -s out/conftest.err; then
        _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
      fi
    fi
@@ -1085,8 +1006,8 @@
 [AC_MSG_CHECKING([how to hardcode library paths into programs])
 _LT_AC_TAGVAR(hardcode_action, $1)=
 if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
-   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
-   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+   test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
+   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
 
   # We can hardcode non-existant directories.
   if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
@@ -1253,7 +1174,7 @@
   shlibpath_var=LIBRARY_PATH
   ;;
 
-bsdi[[45]]*)
+bsdi4*)
   version_type=linux
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -1311,7 +1232,7 @@
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
     ;;
@@ -1369,9 +1290,7 @@
   dynamic_linker='GNU ld.so'
   ;;
 
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
+freebsd*)
   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
   version_type=freebsd-$objformat
   case $version_type in
@@ -1390,7 +1309,7 @@
   freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
-  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+  freebsd3.[01]* | freebsdelf3.[01]*)
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -1516,7 +1435,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -1529,6 +1448,18 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 knetbsd*-gnu)
   version_type=linux
   need_lib_prefix=no
@@ -1579,11 +1510,7 @@
 openbsd*)
   version_type=sunos
   need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
-  esac
+  need_version=yes
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
@@ -1749,9 +1676,7 @@
 
       case $tagname in
       CXX)
-	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-	    (test "X$CXX" != "Xg++"))) ; then
+	if test -n "$CXX" && test "X$CXX" != "Xno"; then
 	  AC_LIBTOOL_LANG_CXX_CONFIG
 	else
 	  tagname=""
@@ -2156,15 +2081,6 @@
 *) reload_flag=" $reload_flag" ;;
 esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
 ])# AC_PROG_LD_RELOAD_FLAG
 
 
@@ -2198,7 +2114,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-bsdi[[45]]*)
+bsdi4*)
   lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
   lt_cv_file_magic_cmd='/usr/bin/file -L'
   lt_cv_file_magic_test_file=/shlib/libc.so
@@ -2221,13 +2137,13 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | kfreebsd*-gnu | dragonfly*)
+freebsd* | kfreebsd*-gnu)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
       # Not sure whether the presence of OpenBSD here was a mistake.
       # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
       lt_cv_file_magic_cmd=/usr/bin/file
       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
       ;;
@@ -2274,7 +2190,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd*)
+netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
   else
@@ -2293,10 +2209,12 @@
   ;;
 
 openbsd*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
   else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
   fi
   ;;
 
@@ -2486,21 +2404,10 @@
 # ---------------
 AC_DEFUN([_LT_AC_LANG_CXX],
 [AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+AC_REQUIRE([AC_PROG_CXXCPP])
 _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
 ])# _LT_AC_LANG_CXX
 
-# _LT_AC_PROG_CXXCPP
-# ---------------
-AC_DEFUN([_LT_AC_PROG_CXXCPP],
-[
-AC_REQUIRE([AC_PROG_CXX])
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  AC_PROG_CXXCPP
-fi
-])# _LT_AC_PROG_CXXCPP
 
 # AC_LIBTOOL_F77
 # --------------
@@ -2573,10 +2480,6 @@
 
 _LT_AC_SYS_COMPILER
 
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
 #
 # Check for any special shared library compilation flags.
 #
@@ -2640,6 +2543,43 @@
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
+  ;;
+  darwin* | rhapsody*)
+  if test "$GCC" = yes; then
+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    case "$host_os" in
+    rhapsody* | darwin1.[[012]])
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
+      ;;
+    *) # Darwin 1.3 on
+      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+      else
+        case ${MACOSX_DEPLOYMENT_TARGET} in
+          10.[[012]])
+            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+            ;;
+          10.*)
+            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
+            ;;
+        esac
+      fi
+      ;;
+    esac
+    output_verbose_link_cmd='echo'
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
+    _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+  else
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+  fi
     ;;
 esac
 AC_MSG_RESULT([$enable_shared])
@@ -2665,7 +2605,7 @@
 AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
 [AC_LANG_PUSH(C++)
 AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+AC_REQUIRE([AC_PROG_CXXCPP])
 
 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 _LT_AC_TAGVAR(allow_undefined_flag, $1)=
@@ -2709,10 +2649,6 @@
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
 
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
 # Allow CC to be a program name with arguments.
 lt_save_CC=$CC
 lt_save_LD=$LD
@@ -2734,7 +2670,7 @@
 CC=${CXX-"c++"}
 compiler=$CC
 _LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
+cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
 
 # We don't want -fno-exception wen compiling C++ code, so set the
 # no_builtin_flag separately
@@ -2841,7 +2777,7 @@
     _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 
     if test "$GXX" = yes; then
-      case $host_os in aix4.[[012]]|aix4.[[012]].*)
+      case $host_os in aix4.[012]|aix4.[012].*)
       # We only want to do this on AIX 4.2 and lower, the check
       # below for broken collect2 doesn't work under 4.3+
 	collect2name=`${CC} -print-prog-name=collect2`
@@ -2862,9 +2798,6 @@
 	fi
       esac
       shared_flag='-shared'
-      if test "$aix_use_runtimelinking" = yes; then
-	shared_flag="$shared_flag "'${wl}-G'
-      fi
     else
       # not using gcc
       if test "$host_cpu" = ia64; then
@@ -2924,7 +2857,6 @@
     esac
     ;;
 
-
   cygwin* | mingw* | pw32*)
     # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
     # as there is no search path for DLLs.
@@ -2948,76 +2880,65 @@
       _LT_AC_TAGVAR(ld_shlibs, $1)=no
     fi
   ;;
-      darwin* | rhapsody*)
-        case "$host_os" in
-        rhapsody* | darwin1.[[012]])
-         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[[012]])
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-        esac
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 
-    if test "$GXX" = yes ; then
-      lt_int_apple_cc_single_mod=no
-      output_verbose_link_cmd='echo'
-      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-       lt_int_apple_cc_single_mod=yes
-      fi
-      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      else
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-        fi
-        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          else
-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          fi
-            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+  darwin* | rhapsody*)
+  if test "$GXX" = yes; then
+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    case "$host_os" in
+    rhapsody* | darwin1.[[012]])
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
+      ;;
+    *) # Darwin 1.3 on
+      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
       else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         _LT_AC_TAGVAR(ld_shlibs, $1)=no
-          ;;
-      esac
+        case ${MACOSX_DEPLOYMENT_TARGET} in
+          10.[[012]])
+            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+            ;;
+          10.*)
+            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
+            ;;
+        esac
       fi
-        ;;

*** Patch too long, truncated ***




More information about the kaffe mailing list