Add WIN32 DLL support

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@2367 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,40 @@
+Mon Aug 04 13:16:54 1997  Scott Christley  <scottc@ruth.net-community.com>
+
+	* Source/externs.m: New file.
+	* Source/libgnustep-gui.def: New file.
+	* Source/win32-def.top: New file.
+	* Source/win32-entry.c: New file.
+	* config.sub: New file.
+	* config.guess: Update.
+	* aclocal.m4: Rearrange checking of foundation library so that
+	it works properly on Windows.
+	* configure.in (DLLTOOL): Add support for building a DLL.
+	(enable-shared): New option to enable build of shared library.
+	(disable-static): New option to disable build of static library.
+	* configure: Regenerate.
+	* Headers/gnustep/gui/NSApplication.h (USE_RUN_LOOP): Delete macro.
+	* Headers/gnustep/gui/NSGraphics.h (NSGray): New global.
+	* Headers/gnustep/gui/NSMenuItem.h (be_mi_reserved): New
+ 	instance variable.
+	* Source/Makefile.in: Add support for building a DLL.
+	* Source/NSApplication.m: Move global variables to externs.m.
+	* Source/NSColor.m: Likewise.
+	* Source/NSColorList.m: Likewise.
+	* Source/NSColorPanel.m: Likewise.
+	* Source/NSControl.m: Likewise.
+	* Source/NSDataLink.m: Likewise.
+	* Source/NSFont.m: Likewise.
+	* Source/NSImageRep.m: Likewise.
+	* Source/NSPasteboard.m: Likewise.
+	* Source/NSPrinter.m: Likewise.
+	* Source/NSScreen.m: Likewise.
+	* Source/NSSplitView.m: Likewise.
+	* Source/NSText.m: Likewise.
+	* Source/NSView.m: Likewise.
+	* Source/NSWindow.m: Likewise.
+	* Source/NSWorkspace.m: Likewise.
+	* Source/libgnustep-gui.m: Likewise.
+
 Thu Jun 12 19:05:24 1997  Ovidiu Predescu <ovidiu@net-community.com>
 
 	Finished the second attempt in implementing menus.

Headers/gnustep/gui/NSApplication.h

@@ -31,7 +31,7 @@
 
 #include <AppKit/NSResponder.h>
 
-#define USE_RUN_LOOP 1
+#define USE_RUN_LOOP 0
 
 @class NSArray;
 @class NSMutableArray;

Headers/gnustep/gui/NSGraphics.h

@@ -53,6 +53,7 @@ extern const float NSBlack;
 extern const float NSDarkGray;
 extern const float NSWhite;
 extern const float NSLightGray;
+extern const float NSGray;
 
 //
 // Device Dictionary Keys 

Headers/gnustep/gui/NSMenuItem.h

@@ -68,6 +68,9 @@
 {
   id representedObject;
   BOOL hasSubmenu;
+
+  // Reserved for back-end use
+  void *be_mi_reserved;
 }
 
 - (void)setTitle:(NSString*)aString;

Source/Makefile.in

@@ -73,6 +73,7 @@ LIBOUT =
 LIBFLAGS = rc
 RANLIB = @RANLIB@
 RC = 
+DLLTOOL = @DLLTOOL@
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -229,7 +230,8 @@ NSView$(oext) \
 NSWindow$(oext) \
 NSWorkspace$(oext) \
 TrackingRectangle$(oext) \
-tiff$(oext)
+tiff$(oext) \
+externs$(oext)
 
 OBJS = $(OBJS_WITHOUT_INIT)
 
@@ -244,6 +246,8 @@ OBJS = $(OBJS_WITHOUT_INIT)
 #
 LIBS = $(GCC_LIB) $(SYS_LIBS) $(ADD_LIBS)
 
+IMPORT_LIBRARY=@IMPORT_LIBRARY@
+
 #
 # targets
 #
@@ -256,13 +260,54 @@ header_links:
 	-rm -rf ../Headers/DPSClient
 	$(LN_S) ../Headers/gnustep/dps ../Headers/DPSClient
 
-src: $(MAIN_FILE)$(libext)
+src: @STATIC_LIBRARY@ @SHARED_LIBRARY@
 
 # library
 $(MAIN_FILE)$(libext): $(OBJS)
 	$(LIB) $(LIBFLAGS) $(LIBOUT)$(MAIN_FILE)$(libext) $(OBJS)
 	$(RANLIB) $(MAIN_FILE)$(libext)
 
+# static library when building DLL
+$(MAIN_FILE)_s$(libext): $(OBJS)
+	$(LIB) $(LIBFLAGS) $(LIBOUT)$(MAIN_FILE)_s$(libext) $(OBJS)
+	$(RANLIB) $(MAIN_FILE)_s$(libext)
+
+$(MAIN_FILE).def: FORCE
+	nm @STATIC_LIBRARY@ \
+		| grep '^........ [T] _' \
+		| sed 's/[^_]*_//' >> $(MAIN_FILE).lst
+	cat win32-def.top $(MAIN_FILE).lst > $(MAIN_FILE).def
+	rm $(MAIN_FILE).lst
+
+# build DLL
+$(MAIN_FILE).dll: @STATIC_LIBRARY@ win32-entry$(oext)
+	# Link DLL.
+	$(CC) -dll -Wl,--base-file -Wl,$(MAIN_FILE).base \
+		-o $(MAIN_FILE).dll @STATIC_LIBRARY@ win32-entry$(oext) \
+		-ltiff -lgnustep-base \
+		-lmoldname -lobjc -lkernel32 -lwsock32 -ladvapi32
+	$(DLLTOOL) --dllname $(MAIN_FILE).dll \
+		--def $(MAIN_FILE).def --base-file \
+		$(MAIN_FILE).base --output-exp $(MAIN_FILE).exp
+	$(CC) -dll -Wl,--base-file -Wl,$(MAIN_FILE).base \
+		$(MAIN_FILE).exp \
+		-o $(MAIN_FILE).dll @STATIC_LIBRARY@ win32-entry$(oext) \
+		-ltiff -lgnustep-base \
+		-lmoldname -lobjc -lkernel32 -lwsock32 -ladvapi32
+	$(DLLTOOL) --dllname $(MAIN_FILE).dll \
+		--def $(MAIN_FILE).def \
+		--base-file $(MAIN_FILE).base \
+		--output-exp $(MAIN_FILE).exp
+	$(CC) -dll $(MAIN_FILE).exp \
+		-o $(MAIN_FILE).dll @STATIC_LIBRARY@ win32-entry$(oext) \
+		-ltiff -lgnustep-base \
+		-lmoldname -lobjc -lkernel32 -lwsock32 -ladvapi32
+	# Build the import library to link to:
+	$(DLLTOOL) --dllname $(MAIN_FILE).dll \
+		--def $(MAIN_FILE).def \
+		--output-lib $(IMPORT_LIBRARY)
+	ar r $(IMPORT_LIBRARY) externs$(oext)
+
 #
 # Initialization routine
 #
@@ -282,9 +327,18 @@ installdirs:
 		$(includedir)/gnustep/dps \
 		$(includedir)/gnustep/gui
 
-install-lib: $(MAIN_FILE)$(libext)
+install-lib: src
 	$(INSTALL_PROGRAM) $(MAIN_FILE)$(libext) $(libdir)
 	$(RANLIB) $(libdir)/$(MAIN_FILE)$(libext)
+	# Install the static library if it exists
+	if [ -e $(MAIN_FILE)_s$(libext) ]; then \
+	  $(INSTALL_DATA) $(MAIN_FILE)_s$(libext) $(libdir) ; \
+	  $(RANLIB) $(libdir)/$(MAIN_FILE)_s$(libext) ; \
+	fi
+	# Install the DLL if it exists
+	if [ -e $(MAIN_FILE).dll ]; then \
+	  $(INSTALL_DATA) $(MAIN_FILE).dll $(bindir) ; \
+	fi
 
 install-headers:
 	for file in $(GNUSTEP1_HEADERS); do \

Source/NSApplication.m

@@ -43,78 +43,14 @@
 #include <AppKit/NSMenuItem.h>
 #include <AppKit/NSCursor.h>
 
+extern id NSApp;
+extern NSEvent *gnustep_gui_null_event;
+
 //
 // Class variables
 //
-// The global application instance
-extern id NSApp;
-NSEvent *gnustep_gui_null_event = nil;
 static BOOL gnustep_gui_app_is_in_dealloc;
 
-// Global strings
-NSString *NSModalPanelRunLoopMode = @"ModalPanelMode";
-NSString *NSEventTrackingRunLoopMode = @"EventTrackingMode";
-
-//
-// Global Exception Strings 
-//
-NSString *NSAbortModalException = @"AbortModal";
-NSString *NSAbortPrintingException = @"AbortPrinting";
-NSString *NSAppKitIgnoredException = @"AppKitIgnored";
-NSString *NSAppKitVirtualMemoryException = @"AppKitVirtualMemory";
-NSString *NSBadBitmapParametersException = @"BadBitmapParameters";
-NSString *NSBadComparisonException = @"BadComparison";
-NSString *NSBadRTFColorTableException = @"BadRTFColorTable";
-NSString *NSBadRTFDirectiveException = @"BadRTFDirective";
-NSString *NSBadRTFFontTableException = @"BadRTFFontTable";
-NSString *NSBadRTFStyleSheetException = @"BadRTFStyleSheet";
-NSString *NSBrowserIllegalDelegateException = @"BrowserIllegalDelegate";
-NSString *NSColorListIOException = @"ColorListIO";
-NSString *NSColorListNotEditableException = @"ColorListNotEditable";
-NSString *NSDraggingException = @"Draggin";
-NSString *NSFontUnavailableException = @"FontUnavailable";
-NSString *NSIllegalSelectorException = @"IllegalSelector";
-NSString *NSImageCacheException = @"ImageCache";
-NSString *NSNibLoadingException = @"NibLoading";
-NSString *NSPPDIncludeNotFoundException = @"PPDIncludeNotFound";
-NSString *NSPPDIncludeStackOverflowException = @"PPDIncludeStackOverflow";
-NSString *NSPPDIncludeStackUnderflowException = @"PPDIncludeStackUnderflow";
-NSString *NSPPDParseException = @"PPDParse";
-NSString *NSPasteboardCommunicationException = @"PasteboardCommunication";
-NSString *NSPrintOperationExistsException = @"PrintOperationExists";
-NSString *NSPrintPackageException = @"PrintPackage";
-NSString *NSPrintingCommunicationException = @"PrintingCommunication";
-NSString *NSRTFPropertyStackOverflowException = @"RTFPropertyStackOverflow";
-NSString *NSTIFFException = @"TIFF";
-NSString *NSTextLineTooLongException = @"TextLineTooLong";
-NSString *NSTextNoSelectionException = @"TextNoSelection";
-NSString *NSTextReadException = @"TextRead";
-NSString *NSTextWriteException = @"TextWrite";
-NSString *NSTypedStreamVersionException = @"TypedStreamVersion";
-NSString *NSWindowServerCommunicationException = @"WindowServerCommunication";
-NSString *NSWordTablesReadException = @"WordTablesRead";
-NSString *NSWordTablesWriteException = @"WordTablesWrite";
-
-// Application notifications
-NSString *NSApplicationDidBecomeActiveNotification 
-              = @"ApplicationDidBecomeActive";
-NSString *NSApplicationDidFinishLaunchingNotification 
-              = @"ApplicationDidFinishLaunching";
-NSString *NSApplicationDidHideNotification = @"ApplicationDidHide";
-NSString *NSApplicationDidResignActiveNotification 
-              = @"ApplicationDidResignActive";
-NSString *NSApplicationDidUnhideNotification = @"ApplicationDidUnhide";
-NSString *NSApplicationDidUpdateNotification = @"ApplicationDidUpdate";
-NSString *NSApplicationWillBecomeActiveNotification 
-              = @"ApplicationWillBecomeActive";
-NSString *NSApplicationWillFinishLaunchingNotification 
-              = @"ApplicationWillFinishLaunching";
-NSString *NSApplicationWillHideNotification = @"ApplicationWillHide";
-NSString *NSApplicationWillResignActiveNotification 
-              = @"ApplicationWillResignActive";
-NSString *NSApplicationWillUnhideNotification = @"ApplicationWillUnhide";
-NSString *NSApplicationWillUpdateNotification = @"ApplicationWillUpdate";
-
 @implementation NSApplication
 
 //

Source/NSColor.m

@@ -29,28 +29,11 @@
 #include <AppKit/NSColor.h>
 #include <AppKit/NSColorPrivate.h>
 #include <AppKit/NSView.h>
+#include <AppKit/NSGraphics.h>
 
 // Class variables
 static BOOL gnustep_gui_ignores_alpha = YES;
 
-// Global strings
-NSString *NSCalibratedWhiteColorSpace = @"NSCalibratedWhiteColorSpace";
-NSString *NSCalibratedBlackColorSpace = @"NSCalibratedBlackColorSpace";
-NSString *NSCalibratedRGBColorSpace = @"NSCalibratedRGBColorSpace";
-NSString *NSDeviceWhiteColorSpace = @"NSDeviceWhiteColorSpace";
-NSString *NSDeviceBlackColorSpace = @"NSDeviceBlackColorSpace";
-NSString *NSDeviceRGBColorSpace = @"NSDeviceRGBColorSpace";
-NSString *NSDeviceCMYKColorSpace = @"NSDeviceCMYKColorSpace";
-NSString *NSNamedColorSpace = @"NSNamedColorSpace";
-NSString *NSCustomColorSpace = @"NSCustomColorSpace";
-
-// Global gray values
-const float NSBlack = 0;
-const float NSDarkGray = .333;
-const float NSGray = 0.5;
-const float NSLightGray = .667;
-const float NSWhite = 1;
-
 @implementation NSColor
 
 //

Source/NSColorList.m

@@ -34,9 +34,6 @@
 #include <AppKit/NSColorList.h>
 #include <AppKit/AppKitExceptions.h>
 
-// NSColorList notifications
-NSString *NSColorListChangedNotification = @"NSColorListChange";
-
 // global variable
 static NSMutableArray *gnustep_available_color_lists;
 static NSLock *gnustep_color_list_lock;

Source/NSColorPanel.m

@@ -28,9 +28,6 @@
 
 #include <AppKit/NSColorPanel.h>
 
-// NSColorPanel notifications
-NSString *NSColorPanelColorChangedNotification = @"NSColorPanelColorChangedNotification";
-
 @implementation NSColorPanel
 
 //

Source/NSControl.m

@@ -35,11 +35,6 @@
 //
 static id MB_NSCONTROL_CELL_CLASS = nil;
 
-// NSControl notifications
-NSString *NSControlTextDidBeginEditingNotification = @"NSControlTextDidBeginEditingNotification";
-NSString *NSControlTextDidEndEditingNotification = @"NSControlTextDidEndEditingNotification";
-NSString *NSControlTextDidChangeNotification = @"NSControlTextDidChangeNotification";
-
 @implementation NSControl
 
 //

Source/NSDataLink.m

@@ -29,9 +29,6 @@
 #include <AppKit/NSDataLink.h>
 #include <AppKit/NSDataLinkManager.h>
 
-// Global strings
-NSString *NSDataLinkFileNameExtension = @"dlf";
-
 @implementation NSDataLink
 
 //

Source/NSFont.m

@@ -33,25 +33,6 @@
 #include <AppKit/NSFont.h>
 #include <AppKit/NSFontManager.h>
 
-// Global Strings
-NSString*NSAFMAscender = @"Ascender";
-NSString*NSAFMCapHeight = @"CapHeight";
-NSString*NSAFMCharacterSet = @"CharacterSet";
-NSString*NSAFMDescender = @"Descender";
-NSString*NSAFMEncodingScheme = @"EncodingScheme";
-NSString*NSAFMFamilyName = @"FamilyName";
-NSString*NSAFMFontName = @"FontName";
-NSString*NSAFMFormatVersion = @"FormatVersion";
-NSString*NSAFMFullName = @"FullName";
-NSString*NSAFMItalicAngle = @"ItalicAngle";
-NSString*NSAFMMappingScheme = @"MappingScheme";
-NSString*NSAFMNotice = @"Notice";
-NSString*NSAFMUnderlinePosition = @"UnderlinePosition";
-NSString*NSAFMUnderlineThickness = @"UnderlineThickness";
-NSString*NSAFMVersion = @"Version";
-NSString*NSAFMWeight = @"Weight";
-NSString*NSAFMXHeight = @"XHeight";
-
 @implementation NSFont
 
 /* Class variables */

Source/NSImageRep.m

@@ -35,9 +35,6 @@
 #include <AppKit/NSEPSImageRep.h>
 #include <AppKit/NSPasteboard.h>
 
-// NSImageRep notifications
-NSString *NSImageRepRegistryChangedNotification = @"NSImageRepRegistryChangedNotification";
-
 /* Backend protocol - methods that must be implemented by the backend to
    complete the class */
 @protocol NXImageRepBackend

Source/NSPasteboard.m

@@ -28,27 +28,6 @@
 
 #include <AppKit/NSPasteboard.h>
 
-// Pasteboard Type Globals 
-NSString *NSStringPboardType = @"NSStringPboardType";
-NSString *NSColorPboardType = @"NSColorPboardType";
-NSString *NSFileContentsPboardType = @"NSFileContentsPboardType";
-NSString *NSFilenamesPboardType = @"NSFilenamesPboardType";
-NSString *NSFontPboardType = @"NSFontPboardType";
-NSString *NSRulerPboardType = @"NSRulerPboardType";
-NSString *NSPostScriptPboardType = @"NSPostScriptPboardType";
-NSString *NSTabularTextPboardType = @"NSTabularTextPboardType";
-NSString *NSRTFPboardType = @"NSRTFPboardType";
-NSString *NSTIFFPboardType = @"NSTIFFPboardType";
-NSString *NSDataLinkPboardType = @"NSDataLinkPboardType";
-NSString *NSGeneralPboardType = @"NSGeneralPboardType";
-
-// Pasteboard Name Globals 
-NSString *NSDragPboard = @"NSDragPboard";
-NSString *NSFindPboard = @"NSFindPboard";
-NSString *NSFontPboard = @"NSFontPboard";
-NSString *NSGeneralPboard = @"NSGeneralPboard";
-NSString *NSRulerPboard = @"NSRulerPboard";
-
 @implementation NSPasteboard
 
 //

Source/NSPrinter.m

@@ -72,48 +72,6 @@
 #define NAMEMAPSIZE 0
 #define TYPEMAPSIZE 0
 
-// Printing Information Dictionary Keys 
-NSString *NSPrintAllPages = @"PrintAllPages";
-NSString *NSPrintBottomMargin = @"PrintBottomMargin";
-NSString *NSPrintCopies = @"PrintCopies";
-NSString *NSPrintFaxCoverSheetName = @"PrintFaxCoverSheetName";
-NSString *NSPrintFaxHighResolution = @"PrintFaxHighResolution";
-NSString *NSPrintFaxModem = @"PrintFaxModem";
-NSString *NSPrintFaxReceiverNames = @"PrintFaxReceiverNames";
-NSString *NSPrintFaxReceiverNumbers = @"PrintFaxReceiverNumbers";
-NSString *NSPrintFaxReturnReceipt = @"PrintFaxReturnReceipt";
-NSString *NSPrintFaxSendTime = @"PrintFaxSendTime";
-NSString *NSPrintFaxTrimPageEnds = @"PrintFaxTrimPageEnds";
-NSString *NSPrintFaxUseCoverSheet = @"PrintFaxUseCoverSheet";
-NSString *NSPrintFirstPage = @"PrintFirstPage";
-NSString *NSPrintHorizonalPagination = @"PrintHorizonalPagination";
-NSString *NSPrintHorizontallyCentered = @"PrintHorizontallyCentered";
-NSString *NSPrintJobDisposition = @"PrintJobDisposition";
-NSString *NSPrintJobFeatures = @"PrintJobFeatures";
-NSString *NSPrintLastPage = @"PrintLastPage";
-NSString *NSPrintLeftMargin = @"PrintLeftMargin";
-NSString *NSPrintManualFeed = @"PrintManualFeed";
-NSString *NSPrintOrientation = @"PrintOrientation";
-NSString *NSPrintPagesPerSheet = @"PrintPagesPerSheet";
-NSString *NSPrintPaperFeed = @"PrintPaperFeed";
-NSString *NSPrintPaperName = @"PrintPaperName";
-NSString *NSPrintPaperSize = @"PrintPaperSize";
-NSString *NSPrintPrinter = @"PrintPrinter";
-NSString *NSPrintReversePageOrder = @"PrintReversePageOrder";
-NSString *NSPrintRightMargin = @"PrintRightMargin";
-NSString *NSPrintSavePath = @"PrintSavePath";
-NSString *NSPrintScalingFactor = @"PrintScalingFactor";
-NSString *NSPrintTopMargin = @"PrintTopMargin";
-NSString *NSPrintVerticalPagination = @"PrintVerticalPagination";
-NSString *NSPrintVerticallyCentered = @"PrintVerticallyCentered";
-
-// Print Job Disposition Values 
-NSString  *NSPrintCancelJob = @"PrintCancelJob";
-NSString  *NSPrintFaxJob = @"PrintFaxJob";
-NSString  *NSPrintPreviewJob = @"PrintPreviewJob";
-NSString  *NSPrintSaveJob = @"PrintSaveJob";
-NSString  *NSPrintSpoolJob = @"PrintSpoolJob";
-
 // Class variables:
 
 // Maps  holding NSPrinters with the types of printers, and the real printers

Source/NSScreen.m

@@ -29,14 +29,6 @@
 #include <Foundation/NSDictionary.h>
 #include <AppKit/NSScreen.h>
 
-// Global device dictionary key strings
-NSString *NSDeviceResolution = @"Resolution";
-NSString *NSDeviceColorSpaceName = @"ColorSpaceName";
-NSString *NSDeviceBitsPerSample = @"BitsPerSample";
-NSString *NSDeviceIsScreen = @"IsScreen";
-NSString *NSDeviceIsPrinter = @"IsPrinter";
-NSString *NSDeviceSize = @"Size";
-
 @implementation NSScreen
 
 //

Source/NSSplitView.m

@@ -28,10 +28,6 @@
 
 #include <AppKit/NSSplitView.h>
 
-// NSSplitView notifications
-NSString *NSSplitViewDidResizeSubviewsNotification = @"NSSplitViewDidResizeSubviewsNotification";
-NSString *NSSplitViewWillResizeSubviewsNotification = @"NSSplitViewWillResizeSubviewsNotification";
-
 @implementation NSSplitView
 
 //

Source/NSText.m

@@ -33,11 +33,6 @@
 #include <AppKit/NSFont.h>
 #include <AppKit/NSColor.h>
 
-// NSText notifications
-NSString *NSTextDidBeginEditingNotification = @"NSTextDidBeginEditingNotification";
-NSString *NSTextDidEndEditingNotification = @"NSTextDidEndEditingNotification";
-NSString *NSTextDidChangeNotification = @"NSTextDidChangeNotification";
-
 //
 // NSText implementation
 //

Source/NSView.m

@@ -41,10 +41,6 @@
 static NSMutableDictionary *gnustep_gui_nsview_thread_dict = nil;
 static NSRecursiveLock *gnustep_gui_nsview_lock = nil;
 
-// NSView notifications
-NSString *NSViewFrameChangedNotification = @"NSViewFrameChangedNotification";
-NSString *NSViewFocusChangedNotification = @"NSViewFocusChangedNotification";
-
 @implementation NSView
 
 //

Source/NSWindow.m

@@ -42,22 +42,6 @@
 #include <AppKit/NSScreen.h>
 #include <AppKit/NSCursor.h>
 
-// NSWindow notifications
-NSString *NSWindowDidBecomeKeyNotification = @"WindowDidBecomeKey";
-NSString *NSWindowDidBecomeMainNotification = @"WindowDidBecomeMain";
-NSString *NSWindowDidChangeScreenNotification = @"WindowDidChangeScreen";
-NSString *NSWindowDidDeminiaturizeNotification = @"WindowDidDeminiaturize";
-NSString *NSWindowDidExposeNotification = @"WindowDidExpose";
-NSString *NSWindowDidMiniaturizeNotification = @"WindowDidMiniaturize";
-NSString *NSWindowDidMoveNotification = @"WindowDidMove";
-NSString *NSWindowDidResignKeyNotification = @"WindowDidResignKey";
-NSString *NSWindowDidResignMainNotification = @"WindowDidResignMain";
-NSString *NSWindowDidResizeNotification = @"WindowDidResize";
-NSString *NSWindowDidUpdateNotification = @"WindowDidUpdate";
-NSString *NSWindowWillCloseNotification = @"WindowWillClose";
-NSString *NSWindowWillMiniaturizeNotification = @"WindowWillMiniaturize";
-NSString *NSWindowWillMoveNotification = @"WindowWillMove";
-
 #define ASSIGN(variable, value) \
   [value retain]; \
   [variable release]; \

Source/NSWorkspace.m

@@ -28,35 +28,6 @@
 
 #include <AppKit/NSWorkspace.h>
 
-// Workspace File Type Globals 
-NSString *NSPlainFileType = @"NSPlainFileType";
-NSString *NSDirectoryFileType = @"NSDirectoryFileType";
-NSString *NSApplicationFileType = @"NSApplicationFileType";
-NSString *NSFilesystemFileType = @"NSFilesystemFileType";
-NSString *NSShellCommandFileType = @"NSShellCommandFileType";
-
-// Workspace File Operation Globals 
-NSString *NSWorkspaceCompressOperation = @"NSWorkspaceCompressOperation";
-NSString *NSWorkspaceCopyOperation = @"NSWorkspaceCopyOperation";
-NSString *NSWorkspaceDecompressOperation = @"NSWorkspaceDecompressOperation";
-NSString *NSWorkspaceDecryptOperation = @"NSWorkspaceDecryptOperation";
-NSString *NSWorkspaceDestroyOperation = @"NSWorkspaceDestroyOperation";
-NSString *NSWorkspaceDuplicateOperation = @"NSWorkspaceDuplicateOperation";
-NSString *NSWorkspaceEncryptOperation = @"NSWorkspaceEncryptOperation";
-NSString *NSWorkspaceLinkOperation = @"NSWorkspaceLinkOperation";
-NSString *NSWorkspaceMoveOperation = @"NSWorkspaceMoveOperation";
-NSString *NSWorkspaceRecycleOperation = @"NSWorkspaceRecycleOperation";
-
-// NSWorkspace notifications
-NSString *NSWorkspaceDidLaunchApplicationNotification = @"NSWorkspaceDidLaunchApplicationNotification";
-NSString *NSWorkspaceDidMountNotification = @"NSWorkspaceDidMountNotification";
-NSString *NSWorkspaceDidPerformFileOperationNotification = @"NSWorkspaceDidPerformFileOperationNotification";
-NSString *NSWorkspaceDidTerminateApplicationNotification = @"NSWorkspaceDidTerminateApplicationNotification";
-NSString *NSWorkspaceDidUnmountNotification = @"NSWorkspaceDidUnmountNotification";
-NSString *NSWorkspaceWillLaunchApplicationNotification = @"NSWorkspaceWillLaunchApplicationNotification";
-NSString *NSWorkspaceWillPowerOffNotification = @"NSWorkspaceWillPowerOffNotification";
-NSString *NSWorkspaceWillUnmountNotification = @"NSWorkspaceWillUnmountNotification";
-
 @implementation NSWorkspace
 
 //

Source/externs.m

@@ -0,0 +1,299 @@
+/* 
+   externs.m
+
+   External data
+
+   Copyright (C) 1997 Free Software Foundation, Inc.
+
+   Author:  Scott Christley <scottc@net-community.com>
+   Date: August 1997
+   
+   This file is part of the GNUstep GUI Library.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+   
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this library; see the file COPYING.LIB.
+   If not, write to the Free Software Foundation,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/ 
+
+#include <Foundation/NSString.h>
+#include <AppKit/NSEvent.h>
+
+/* The global application object */
+/* This should really be accessed through [NSApplication sharedApplication] */
+id NSApp = nil;
+
+NSEvent *gnustep_gui_null_event = nil;
+
+// Global strings
+NSString *NSModalPanelRunLoopMode = @"ModalPanelMode";
+NSString *NSEventTrackingRunLoopMode = @"EventTrackingMode";
+
+//
+// Global Exception Strings 
+//
+NSString *NSAbortModalException = @"AbortModal";
+NSString *NSAbortPrintingException = @"AbortPrinting";
+NSString *NSAppKitIgnoredException = @"AppKitIgnored";
+NSString *NSAppKitVirtualMemoryException = @"AppKitVirtualMemory";
+NSString *NSBadBitmapParametersException = @"BadBitmapParameters";
+NSString *NSBadComparisonException = @"BadComparison";
+NSString *NSBadRTFColorTableException = @"BadRTFColorTable";
+NSString *NSBadRTFDirectiveException = @"BadRTFDirective";
+NSString *NSBadRTFFontTableException = @"BadRTFFontTable";
+NSString *NSBadRTFStyleSheetException = @"BadRTFStyleSheet";
+NSString *NSBrowserIllegalDelegateException = @"BrowserIllegalDelegate";
+NSString *NSColorListIOException = @"ColorListIO";
+NSString *NSColorListNotEditableException = @"ColorListNotEditable";
+NSString *NSDraggingException = @"Draggin";
+NSString *NSFontUnavailableException = @"FontUnavailable";
+NSString *NSIllegalSelectorException = @"IllegalSelector";
+NSString *NSImageCacheException = @"ImageCache";
+NSString *NSNibLoadingException = @"NibLoading";
+NSString *NSPPDIncludeNotFoundException = @"PPDIncludeNotFound";
+NSString *NSPPDIncludeStackOverflowException = @"PPDIncludeStackOverflow";
+NSString *NSPPDIncludeStackUnderflowException = @"PPDIncludeStackUnderflow";
+NSString *NSPPDParseException = @"PPDParse";
+NSString *NSPasteboardCommunicationException = @"PasteboardCommunication";
+NSString *NSPrintOperationExistsException = @"PrintOperationExists";
+NSString *NSPrintPackageException = @"PrintPackage";
+NSString *NSPrintingCommunicationException = @"PrintingCommunication";
+NSString *NSRTFPropertyStackOverflowException = @"RTFPropertyStackOverflow";
+NSString *NSTIFFException = @"TIFF";
+NSString *NSTextLineTooLongException = @"TextLineTooLong";
+NSString *NSTextNoSelectionException = @"TextNoSelection";
+NSString *NSTextReadException = @"TextRead";
+NSString *NSTextWriteException = @"TextWrite";
+NSString *NSTypedStreamVersionException = @"TypedStreamVersion";
+NSString *NSWindowServerCommunicationException = @"WindowServerCommunication";
+NSString *NSWordTablesReadException = @"WordTablesRead";
+NSString *NSWordTablesWriteException = @"WordTablesWrite";
+
+// Application notifications
+NSString *NSApplicationDidBecomeActiveNotification 
+              = @"ApplicationDidBecomeActive";
+NSString *NSApplicationDidFinishLaunchingNotification 
+              = @"ApplicationDidFinishLaunching";
+NSString *NSApplicationDidHideNotification = @"ApplicationDidHide";
+NSString *NSApplicationDidResignActiveNotification 
+              = @"ApplicationDidResignActive";
+NSString *NSApplicationDidUnhideNotification = @"ApplicationDidUnhide";
+NSString *NSApplicationDidUpdateNotification = @"ApplicationDidUpdate";
+NSString *NSApplicationWillBecomeActiveNotification 
+              = @"ApplicationWillBecomeActive";
+NSString *NSApplicationWillFinishLaunchingNotification 
+              = @"ApplicationWillFinishLaunching";
+NSString *NSApplicationWillHideNotification = @"ApplicationWillHide";
+NSString *NSApplicationWillResignActiveNotification 
+              = @"ApplicationWillResignActive";
+NSString *NSApplicationWillUnhideNotification = @"ApplicationWillUnhide";
+NSString *NSApplicationWillUpdateNotification = @"ApplicationWillUpdate";
+
+// NSColor Global strings
+NSString *NSCalibratedWhiteColorSpace = @"NSCalibratedWhiteColorSpace";
+NSString *NSCalibratedBlackColorSpace = @"NSCalibratedBlackColorSpace";
+NSString *NSCalibratedRGBColorSpace = @"NSCalibratedRGBColorSpace";
+NSString *NSDeviceWhiteColorSpace = @"NSDeviceWhiteColorSpace";
+NSString *NSDeviceBlackColorSpace = @"NSDeviceBlackColorSpace";
+NSString *NSDeviceRGBColorSpace = @"NSDeviceRGBColorSpace";
+NSString *NSDeviceCMYKColorSpace = @"NSDeviceCMYKColorSpace";
+NSString *NSNamedColorSpace = @"NSNamedColorSpace";
+NSString *NSCustomColorSpace = @"NSCustomColorSpace";
+
+// NSColor Global gray values
+const float NSBlack = 0;
+const float NSDarkGray = .333;
+const float NSGray = 0.5;
+const float NSLightGray = .667;
+const float NSWhite = 1;
+
+// NSColorList notifications
+NSString *NSColorListChangedNotification = @"NSColorListChange";
+
+// NSColorPanel notifications
+NSString *NSColorPanelColorChangedNotification =
+@"NSColorPanelColorChangedNotification";
+
+// NSControl notifications
+NSString *NSControlTextDidBeginEditingNotification =
+@"NSControlTextDidBeginEditingNotification";
+NSString *NSControlTextDidEndEditingNotification =
+@"NSControlTextDidEndEditingNotification";
+NSString *NSControlTextDidChangeNotification =
+@"NSControlTextDidChangeNotification";
+
+// NSDataLink global strings
+NSString *NSDataLinkFileNameExtension = @"dlf";
+
+// NSFont Global Strings
+NSString *NSAFMAscender = @"Ascender";
+NSString *NSAFMCapHeight = @"CapHeight";
+NSString *NSAFMCharacterSet = @"CharacterSet";
+NSString *NSAFMDescender = @"Descender";
+NSString *NSAFMEncodingScheme = @"EncodingScheme";
+NSString *NSAFMFamilyName = @"FamilyName";
+NSString *NSAFMFontName = @"FontName";
+NSString *NSAFMFormatVersion = @"FormatVersion";
+NSString *NSAFMFullName = @"FullName";
+NSString *NSAFMItalicAngle = @"ItalicAngle";
+NSString *NSAFMMappingScheme = @"MappingScheme";
+NSString *NSAFMNotice = @"Notice";
+NSString *NSAFMUnderlinePosition = @"UnderlinePosition";
+NSString *NSAFMUnderlineThickness = @"UnderlineThickness";
+NSString *NSAFMVersion = @"Version";
+NSString *NSAFMWeight = @"Weight";
+NSString *NSAFMXHeight = @"XHeight";
+
+// NSScreen Global device dictionary key strings
+NSString *NSDeviceResolution = @"Resolution";
+NSString *NSDeviceColorSpaceName = @"ColorSpaceName";
+NSString *NSDeviceBitsPerSample = @"BitsPerSample";
+NSString *NSDeviceIsScreen = @"IsScreen";
+NSString *NSDeviceIsPrinter = @"IsPrinter";
+NSString *NSDeviceSize = @"Size";
+
+// NSImageRep notifications
+NSString *NSImageRepRegistryChangedNotification =
+@"NSImageRepRegistryChangedNotification";
+
+// NSPasteboard Type Globals 
+NSString *NSStringPboardType = @"NSStringPboardType";
+NSString *NSColorPboardType = @"NSColorPboardType";
+NSString *NSFileContentsPboardType = @"NSFileContentsPboardType";
+NSString *NSFilenamesPboardType = @"NSFilenamesPboardType";
+NSString *NSFontPboardType = @"NSFontPboardType";
+NSString *NSRulerPboardType = @"NSRulerPboardType";
+NSString *NSPostScriptPboardType = @"NSPostScriptPboardType";
+NSString *NSTabularTextPboardType = @"NSTabularTextPboardType";
+NSString *NSRTFPboardType = @"NSRTFPboardType";
+NSString *NSTIFFPboardType = @"NSTIFFPboardType";
+NSString *NSDataLinkPboardType = @"NSDataLinkPboardType";
+NSString *NSGeneralPboardType = @"NSGeneralPboardType";
+
+// NSPasteboard Name Globals 
+NSString *NSDragPboard = @"NSDragPboard";
+NSString *NSFindPboard = @"NSFindPboard";
+NSString *NSFontPboard = @"NSFontPboard";
+NSString *NSGeneralPboard = @"NSGeneralPboard";
+NSString *NSRulerPboard = @"NSRulerPboard";
+
+// Printing Information Dictionary Keys 
+NSString *NSPrintAllPages = @"PrintAllPages";
+NSString *NSPrintBottomMargin = @"PrintBottomMargin";
+NSString *NSPrintCopies = @"PrintCopies";
+NSString *NSPrintFaxCoverSheetName = @"PrintFaxCoverSheetName";
+NSString *NSPrintFaxHighResolution = @"PrintFaxHighResolution";
+NSString *NSPrintFaxModem = @"PrintFaxModem";
+NSString *NSPrintFaxReceiverNames = @"PrintFaxReceiverNames";
+NSString *NSPrintFaxReceiverNumbers = @"PrintFaxReceiverNumbers";
+NSString *NSPrintFaxReturnReceipt = @"PrintFaxReturnReceipt";
+NSString *NSPrintFaxSendTime = @"PrintFaxSendTime";
+NSString *NSPrintFaxTrimPageEnds = @"PrintFaxTrimPageEnds";
+NSString *NSPrintFaxUseCoverSheet = @"PrintFaxUseCoverSheet";
+NSString *NSPrintFirstPage = @"PrintFirstPage";
+NSString *NSPrintHorizonalPagination = @"PrintHorizonalPagination";
+NSString *NSPrintHorizontallyCentered = @"PrintHorizontallyCentered";
+NSString *NSPrintJobDisposition = @"PrintJobDisposition";
+NSString *NSPrintJobFeatures = @"PrintJobFeatures";
+NSString *NSPrintLastPage = @"PrintLastPage";
+NSString *NSPrintLeftMargin = @"PrintLeftMargin";
+NSString *NSPrintManualFeed = @"PrintManualFeed";
+NSString *NSPrintOrientation = @"PrintOrientation";
+NSString *NSPrintPagesPerSheet = @"PrintPagesPerSheet";
+NSString *NSPrintPaperFeed = @"PrintPaperFeed";
+NSString *NSPrintPaperName = @"PrintPaperName";
+NSString *NSPrintPaperSize = @"PrintPaperSize";
+NSString *NSPrintPrinter = @"PrintPrinter";
+NSString *NSPrintReversePageOrder = @"PrintReversePageOrder";
+NSString *NSPrintRightMargin = @"PrintRightMargin";
+NSString *NSPrintSavePath = @"PrintSavePath";
+NSString *NSPrintScalingFactor = @"PrintScalingFactor";
+NSString *NSPrintTopMargin = @"PrintTopMargin";
+NSString *NSPrintVerticalPagination = @"PrintVerticalPagination";
+NSString *NSPrintVerticallyCentered = @"PrintVerticallyCentered";
+
+// Print Job Disposition Values 
+NSString  *NSPrintCancelJob = @"PrintCancelJob";
+NSString  *NSPrintFaxJob = @"PrintFaxJob";
+NSString  *NSPrintPreviewJob = @"PrintPreviewJob";
+NSString  *NSPrintSaveJob = @"PrintSaveJob";
+NSString  *NSPrintSpoolJob = @"PrintSpoolJob";
+
+// NSSplitView notifications
+NSString *NSSplitViewDidResizeSubviewsNotification =
+@"NSSplitViewDidResizeSubviewsNotification";
+NSString *NSSplitViewWillResizeSubviewsNotification =
+@"NSSplitViewWillResizeSubviewsNotification";
+
+// NSText notifications
+NSString *NSTextDidBeginEditingNotification =
+@"NSTextDidBeginEditingNotification";
+NSString *NSTextDidEndEditingNotification = @"NSTextDidEndEditingNotification";
+NSString *NSTextDidChangeNotification = @"NSTextDidChangeNotification";
+
+// NSView notifications
+NSString *NSViewFrameChangedNotification = @"NSViewFrameChangedNotification";
+NSString *NSViewFocusChangedNotification = @"NSViewFocusChangedNotification";
+
+// NSWindow notifications
+NSString *NSWindowDidBecomeKeyNotification = @"WindowDidBecomeKey";
+NSString *NSWindowDidBecomeMainNotification = @"WindowDidBecomeMain";
+NSString *NSWindowDidChangeScreenNotification = @"WindowDidChangeScreen";
+NSString *NSWindowDidDeminiaturizeNotification = @"WindowDidDeminiaturize";
+NSString *NSWindowDidExposeNotification = @"WindowDidExpose";
+NSString *NSWindowDidMiniaturizeNotification = @"WindowDidMiniaturize";
+NSString *NSWindowDidMoveNotification = @"WindowDidMove";
+NSString *NSWindowDidResignKeyNotification = @"WindowDidResignKey";
+NSString *NSWindowDidResignMainNotification = @"WindowDidResignMain";
+NSString *NSWindowDidResizeNotification = @"WindowDidResize";
+NSString *NSWindowDidUpdateNotification = @"WindowDidUpdate";
+NSString *NSWindowWillCloseNotification = @"WindowWillClose";
+NSString *NSWindowWillMiniaturizeNotification = @"WindowWillMiniaturize";
+NSString *NSWindowWillMoveNotification = @"WindowWillMove";
+
+// Workspace File Type Globals 
+NSString *NSPlainFileType = @"NSPlainFileType";
+NSString *NSDirectoryFileType = @"NSDirectoryFileType";
+NSString *NSApplicationFileType = @"NSApplicationFileType";
+NSString *NSFilesystemFileType = @"NSFilesystemFileType";
+NSString *NSShellCommandFileType = @"NSShellCommandFileType";
+
+// Workspace File Operation Globals 
+NSString *NSWorkspaceCompressOperation = @"NSWorkspaceCompressOperation";
+NSString *NSWorkspaceCopyOperation = @"NSWorkspaceCopyOperation";
+NSString *NSWorkspaceDecompressOperation = @"NSWorkspaceDecompressOperation";
+NSString *NSWorkspaceDecryptOperation = @"NSWorkspaceDecryptOperation";
+NSString *NSWorkspaceDestroyOperation = @"NSWorkspaceDestroyOperation";
+NSString *NSWorkspaceDuplicateOperation = @"NSWorkspaceDuplicateOperation";
+NSString *NSWorkspaceEncryptOperation = @"NSWorkspaceEncryptOperation";
+NSString *NSWorkspaceLinkOperation = @"NSWorkspaceLinkOperation";
+NSString *NSWorkspaceMoveOperation = @"NSWorkspaceMoveOperation";
+NSString *NSWorkspaceRecycleOperation = @"NSWorkspaceRecycleOperation";
+
+// NSWorkspace notifications
+NSString *NSWorkspaceDidLaunchApplicationNotification =
+@"NSWorkspaceDidLaunchApplicationNotification";
+NSString *NSWorkspaceDidMountNotification = @"NSWorkspaceDidMountNotification";
+NSString *NSWorkspaceDidPerformFileOperationNotification =
+@"NSWorkspaceDidPerformFileOperationNotification";
+NSString *NSWorkspaceDidTerminateApplicationNotification =
+@"NSWorkspaceDidTerminateApplicationNotification";
+NSString *NSWorkspaceDidUnmountNotification =
+@"NSWorkspaceDidUnmountNotification";
+NSString *NSWorkspaceWillLaunchApplicationNotification =
+@"NSWorkspaceWillLaunchApplicationNotification";
+NSString *NSWorkspaceWillPowerOffNotification =
+@"NSWorkspaceWillPowerOffNotification";
+NSString *NSWorkspaceWillUnmountNotification =
+@"NSWorkspaceWillUnmountNotification";
+

Source/libgnustep-gui.def

@@ -0,0 +1,125 @@
+;
+;   libgnustep-gui.def
+;
+;   Exports for libgnustep-gui DLL
+;   Specific to WIN32 operating systems
+;
+;   Copyright (C) 1997 Free Software Foundation, Inc.
+;
+;   Author:  Scott Christley <scottc@net-community.com>
+;   Date: August 1997
+;
+;   This file is part of the GNUstep GUI Library.
+;
+;   This library is free software; you can redistribute it and/or
+;   modify it under the terms of the GNU Library General Public
+;   License as published by the Free Software Foundation; either
+;   version 2 of the License, or (at your option) any later version.
+;
+;   This library is distributed in the hope that it will be useful,
+;   but WITHOUT ANY WARRANTY; without even the implied warranty of
+;   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;   Library General Public License for more details.
+;
+;   If you are interested in a warranty or support for this source code,
+;   contact Scott Christley <scottc@net-community.com> for more information.
+;
+;   You should have received a copy of the GNU Library General Public
+;   License along with this library; if not, write to the Free
+;   Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+;
+LIBRARY libgnustep-gui
+EXPORTS
+GNUstepMain
+__objc_class_name_NSActionCell
+__objc_category_name_NSApplication_GNUstepBackend
+__objc_class_name_NSApplication
+__objc_class_name_NSBitmapImageRep
+__objc_class_name_NSBox
+__objc_class_name_NSBrowser
+__objc_class_name_NSBrowserCell
+__objc_category_name_NSBundle_NSBundleAdditions
+__objc_class_name___dummy_class_in_NSBundle
+__objc_class_name_NSButton
+__objc_class_name_NSButtonCell
+__objc_class_name_NSCStringText
+__objc_class_name_NSCachedImageRep
+__objc_class_name_NSCell
+__objc_class_name_NSClipView
+NSBlack
+NSDarkGray
+NSGray
+NSLightGray
+NSWhite
+__objc_category_name_NSCoder_NSCoderAdditions
+__objc_category_name_NSColor_GNUstepPrivate
+__objc_class_name_NSColor
+__objc_category_name_NSColorList_GNUstepPrivate
+__objc_class_name_NSColorList
+__objc_class_name_NSColorPanel
+__objc_class_name_NSColorPicker
+__objc_category_name_NSColorWell_GNUstepBackend
+__objc_class_name_NSColorWell
+__objc_class_name_NSControl
+__objc_category_name_NSCursor_GNUstepBackend
+__objc_class_name_NSCursor
+__objc_class_name_NSCustomImageRep
+__objc_class_name_NSDataLink
+__objc_class_name_NSDataLinkManager
+__objc_class_name_NSDataLinkPanel
+__objc_class_name_NSDPSContext
+__objc_class_name_NSEPSImageRep
+__objc_class_name_NSEvent
+__objc_class_name_NSFont
+__objc_category_name_NSFontManager_GNUstepBackend
+__objc_class_name_NSFontManager
+__objc_class_name_NSFontPanel
+__objc_class_name_NSForm
+__objc_class_name_NSFormCell
+__objc_class_name_NSHelpPanel
+__objc_class_name_NSImage
+iterate_reps_for_types
+repd_for_rep
+set_repd_for_rep
+__objc_class_name_NSImageRep
+__objc_category_name_NSMatrix_PrivateMethods
+__objc_class_name_NSMatrix
+__objc_category_name_NSMenu_PrivateMethods2
+__objc_class_name_NSMenu
+__objc_class_name_NSMenuMatrix
+__objc_class_name_NSMenuItem
+__objc_class_name_NSOpenPanel
+__objc_class_name_NSPageLayout
+__objc_class_name_NSPanel
+__objc_class_name_NSPasteboard
+__objc_class_name_NSPrinter
+__objc_class_name_NSPrintInfo
+__objc_class_name_NSPrintOperation
+__objc_class_name_NSPrintPanel
+__objc_class_name_NSPopUpButton
+__objc_class_name_NSResponder
+__objc_class_name_NSSavePanel
+__objc_class_name_NSScreen
+__objc_category_name_NSScroller_GNUstepBackend
+__objc_class_name_NSScroller
+__objc_class_name_NSScrollView
+__objc_class_name_NSSelection
+__objc_class_name_NSSlider
+__objc_class_name_NSSliderCell
+__objc_class_name_NSSpellChecker
+__objc_class_name_NSSpellServer
+__objc_class_name_NSSplitView
+__objc_class_name_NSText
+__objc_class_name_NSTextField
+__objc_class_name_NSTextFieldCell
+__objc_class_name_NSView
+__objc_category_name_NSWindow_GNUstepBackend
+__objc_class_name_NSWindow
+__objc_class_name_NSWorkspace
+__objc_class_name_TrackingRectangle
+NSTiffClose
+NSTiffGetColormap
+NSTiffGetInfo
+NSTiffOpenData
+NSTiffRead
+NSWriteTiff

Source/libgnustep-gui.m

@@ -30,8 +30,6 @@
 #include <AppKit/NSFontManager.h>
 #include <AppKit/NSFont.h>
 
-id NSApp = nil;
-
 char **NSArgv = NULL;
 
 //

Source/win32-def.top

@@ -0,0 +1,32 @@
+;
+;   libgnustep-gui.def
+;
+;   Exports for libgnustep-gui DLL
+;   Specific to WIN32 operating systems
+;
+;   Copyright (C) 1997 Free Software Foundation, Inc.
+;
+;   Author:  Scott Christley <scottc@net-community.com>
+;   Date: August 1997
+;
+;   This file is part of the GNUstep GUI Library.
+;
+;   This library is free software; you can redistribute it and/or
+;   modify it under the terms of the GNU Library General Public
+;   License as published by the Free Software Foundation; either
+;   version 2 of the License, or (at your option) any later version.
+;
+;   This library is distributed in the hope that it will be useful,
+;   but WITHOUT ANY WARRANTY; without even the implied warranty of
+;   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;   Library General Public License for more details.
+;
+;   If you are interested in a warranty or support for this source code,
+;   contact Scott Christley <scottc@net-community.com> for more information.
+;
+;   You should have received a copy of the GNU Library General Public
+;   License along with this library; if not, write to the Free
+;   Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+;
+LIBRARY libgnustep-gui
+EXPORTS

Source/win32-entry.c

@@ -0,0 +1,85 @@
+/*
+  DLL entry routine
+
+  Copyright (C) 1997 Free Software Foundation, Inc.
+
+  Original Author:  Scott Christley <scottc@net-community.com>
+  Created: August 1997
+   
+  This file is part of the GNUstep GUI Library.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Library General Public
+  License as published by the Free Software Foundation; either
+  version 2 of the License, or (at your option) any later version.
+   
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Library General Public License for more details.
+
+  You should have received a copy of the GNU Library General Public
+  License along with this library; if not, write to the Free
+  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */ 
+
+#include <windows.h>
+
+/* Only if using Microsoft's tools and libraries */
+#ifdef __MS_WIN32__
+#include <stdio.h>
+WINBOOL WINAPI _CRT_INIT( HINSTANCE hinstDLL, DWORD fdwReason,
+			  LPVOID lpReserved );
+
+// Global errno isn't defined in Microsoft's thread safe C library
+void errno()
+{}
+
+int _MB_init_runtime()
+{
+    return 0;
+}
+#endif /* __MS_WIN32__ */
+
+//
+// DLL entry function for GNUstep GUI Library
+// This function gets called everytime a process/thread attaches to DLL
+//
+WINBOOL WINAPI DllMain(HANDLE hInst, ULONG ul_reason_for_call,
+		       LPVOID lpReserved)
+{
+    if (ul_reason_for_call == DLL_PROCESS_ATTACH)
+	{
+#ifdef __MS_WIN32__
+	    /* Initialize the Microsoft C stdio DLL */
+	    _CRT_INIT(hInst, ul_reason_for_call, lpReserved);
+
+	    /* Initialize the GNUstep Base Library runtime structures */
+	    gnustep_base_init_runtime();
+#endif /* __MS_WIN32__ */
+
+	    printf("GNUstep GUI Library: process attach\n");
+	}
+
+    if (ul_reason_for_call == DLL_PROCESS_DETACH)
+	{
+	    printf("GNUstep GUI Library: process detach\n");
+	}
+
+    if (ul_reason_for_call == DLL_THREAD_ATTACH)
+	{
+#ifdef __MS_WIN32__
+	    /* Initialize C stdio DLL */
+	    _CRT_INIT(hInst, ul_reason_for_call, lpReserved);
+#endif /* __MS_WIN32__ */
+
+	    printf("GNUstep GUI Library: thread attach\n");
+	}
+
+    if (ul_reason_for_call == DLL_THREAD_DETACH)
+	{
+	    printf("GNUstep GUI Library: thread detach\n");
+	}
+
+    return TRUE;
+}

aclocal.m4

@@ -166,25 +166,26 @@ AC_REQUIRE([AC_C_CROSS])dnl
 AC_MSG_CHECKING(for the Foundation library)
 OBJC_LIBS=
 AC_CACHE_VAL(ac_cv_foundation_library,
-[AC_LANG_SAVE[]dnl
+[if test "$FOUNDATION" = ""; then
+AC_LANG_SAVE[]dnl
 AC_LANG_OBJECTIVE_C[]
+AC_TRY_CPP(
+#include <foundation/NSObject.h>
+, ac_cv_foundation_library=foundation)
 AC_TRY_COMPILE(
 #include <Foundation/preface.h>
 ,
-, ac_cv_foundation_library="$ac_cv_foundation_library gnustep-base")
+, ac_cv_foundation_library="gnustep-base")
 AC_TRY_COMPILE(
 #include <Foundation/exceptions/FoundationException.h>
 ,
 , ac_cv_foundation_library="$ac_cv_foundation_library libFoundation")
 AC_TRY_COMPILE(
-#include <objects/stdobjects.h>
+#import <Foundation/NSObject.h>
+#import <synch.h>
 ,
-, ac_cv_foundation_library="$ac_cv_foundation_library libobjects")
+, ac_cv_foundation_library=Sun)
 AC_LANG_RESTORE[]dnl
-if test "$FOUNDATION" = ""; then
-AC_TRY_CPP(
-#include <foundation/NSObject.h>
-, ac_cv_foundation_library=foundation)
 else
     ac_cv_foundation_library=$FOUNDATION
 fi

config.guess

@@ -1,6 +1,6 @@
-#!/bin/sh
+#! /bin/sh
-# This script attempts to guess a canonical system name.
+# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -12,11 +12,17 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # General Public License for more details.
 #
-# You should have received a copy of the GNU General Public
+# You should have received a copy of the GNU General Public License
-# License along with this library; see the file COPYING.
+# along with this program; if not, write to the Free Software
-# If not, write to the Free Software Foundation,
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
 
+# Written by Per Bothner <bothner@cygnus.com>.
+# The master version of this file is at the FSF in /home/gd/gnu/lib.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
@@ -29,6 +35,12 @@
 # (but try to keep the structure clean).
 #
 
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 8/24/94.)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
 UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
 UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
@@ -39,23 +51,66 @@ trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
+    alpha:OSF1:*:*)
-	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/-.*//'`
+	# A Vn.n version is a released version.
-	exit 0 ;;
+	# A Tn.n version is a released field test version.
-    alpha:OSF1:1.*:*)
+	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo alpha-dec-osf${UNAME_RELEASE}
+	echo alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//'`
-        exit 0 ;;
+	exit 0 ;;
-    alpha:OSF1:V1.*:* | alpha:OSF1:V[2-9].*:*)
+    21064:Windows_NT:50:3)
-	# 1.3 and later use "V1.3", etc. for uname -r.
+	echo alpha-dec-winnt3.5
-	echo alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^V//'`
+	exit 0 ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-cbm-sysv4
+	exit 0;;
+    amiga:NetBSD:*:*)
+      echo m68k-cbm-netbsd${UNAME_RELEASE}
+      exit 0 ;;
+    amiga:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arc64:OpenBSD:*:*)
+	echo mips64el-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hkmips:OpenBSD:*:*)
+	echo mips-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    pmax:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sgi:OpenBSD:*:*)
+	echo mips-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
-    sun4*:SunOS:5.*:*)
+    SR2?01:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit 0;;
+    Pyramid*:OSx*:*:*|MIS*:OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit 0 ;;
+    NILE:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit 0 ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
+    i86pc:SunOS:5.*:*)
+	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
@@ -63,20 +118,88 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
     sun4*:SunOS:*:*)
-	echo sparc-sun-sunos${UNAME_RELEASE}
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
 	exit 0 ;;
     sun3*:SunOS:*:*)
 	echo m68k-sun-sunos${UNAME_RELEASE}
 	exit 0 ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit 0 ;;
+    atari*:NetBSD:*:*)
+	echo m68k-atari-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    atari*:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3*:NetBSD:*:*)
+	echo m68k-sun-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3*:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:NetBSD:*:*)
+	echo m68k-apple-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit 0 ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit 0 ;;
     RISC*:ULTRIX:*:*)
 	echo mips-dec-ultrix${UNAME_RELEASE}
 	exit 0 ;;
     VAX*:ULTRIX*:*:*)
 	echo vax-dec-ultrix${UNAME_RELEASE}
 	exit 0 ;;
-    mips:*:5*:RISCos)
+    2020:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit 0 ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	sed 's/^	//' << EOF >dummy.c
+	int main (argc, argv) int argc; char **argv; {
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	${CC-cc} dummy.c -o dummy \
+	  && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+	  && rm dummy.c dummy && exit 0
+	rm -f dummy.c dummy
 	echo mips-mips-riscos${UNAME_RELEASE}
 	exit 0 ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit 0 ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit 0 ;;
     m88k:*:4*:R4*)
 	echo m88k-motorola-sysv4
 	exit 0 ;;
@@ -84,12 +207,17 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo m88k-motorola-sysv3
 	exit 0 ;;
     AViiON:dgux:*:*)
+        # DG/UX returns AViiON for all architectures
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
+        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
 	if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
 	     -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
 		echo m88k-dg-dgux${UNAME_RELEASE}
 	else
 		echo m88k-dg-dguxbcs${UNAME_RELEASE}
 	fi
+        else echo i586-dg-dgux${UNAME_RELEASE}
+        fi
  	exit 0 ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
@@ -104,14 +232,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
 	echo m68k-tektronix-bsd
 	exit 0 ;;
-    *:IRIX:*:*)
+    *:IRIX*:*:*)
-	echo mips-sgi-irix${UNAME_RELEASE}
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
 	exit 0 ;;
-    i[34]86:AIX:*:*)
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
+	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+    i?86:AIX:*:*)
 	echo i386-ibm-aix
 	exit 0 ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		sed 's/^		//' << EOF >dummy.c
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
+		rm -f dummy.c dummy
 		echo rs6000-ibm-aix3.2.5
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
@@ -119,9 +263,28 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		echo rs6000-ibm-aix3.2
 	fi
 	exit 0 ;;
+    *:AIX:*:4)
+	if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=4.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit 0 ;;
     *:AIX:*:*)
 	echo rs6000-ibm-aix
 	exit 0 ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit 0 ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit 0 ;;                           # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
 	echo rs6000-bull-bosx
 	exit 0 ;;
@@ -134,18 +297,14 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
 	echo m68k-hp-bsd4.4
 	exit 0 ;;
-    9000/[3478]??:HP-UX:*:* | 9000/8?7:HP-UX:*:* )
+    9000/[3478]??:HP-UX:*:*)
 	case "${UNAME_MACHINE}" in
 	    9000/31? )            HP_ARCH=m68000 ;;
 	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/7?? | 9000/8?7 ) HP_ARCH=hppa1.1 ;;
+	    9000/7?? | 9000/8?[1679] ) HP_ARCH=hppa1.1 ;;
 	    9000/8?? )            HP_ARCH=hppa1.0 ;;
 	esac
-	case ${UNAME_RELEASE} in
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	    *.B7.* )          HPUX_REV=7 ;;
-	    *.B8.* | *.08.* ) HPUX_REV=8 ;;
-	    *.09.* )          HPUX_REV=9 ;;
-	esac
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
 	exit 0 ;;
     3050*:HI-UX:*:*)
@@ -155,9 +314,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	main ()
 	{
 	  long cpu = sysconf (_SC_CPU_VERSION);
-	  if (CPU_IS_HP_MC68K (cpu))
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	    puts ("m68k-hitachi-hiuxwe2");
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	  else if (CPU_IS_PA_RISC (cpu))
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
 	    {
 	      switch (cpu)
 		{
@@ -167,6 +327,8 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		  default: puts ("hppa-hitachi-hiuxwe2"); break;
 		}
 	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
 	  else puts ("unknown-hitachi-hiuxwe2");
 	  exit (0);
 	}
@@ -175,55 +337,195 @@ EOF
 	rm -f dummy.c dummy
 	echo unknown-hitachi-hiuxwe2
 	exit 0 ;;
-    9000/7??:4.3bsd:*:* | 9000/8?7:4.3bsd:*:* )
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
 	echo hppa1.1-hp-bsd
 	exit 0 ;;
     9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
 	exit 0 ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1:*)
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit 0 ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit 0 ;;
+    i?86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit 0 ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit 0 ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
         exit 0 ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2:*)
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	echo c2-convex-bsd
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
         exit 0 ;;
-    CRAY*X-MP:UNICOS:*:*)
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+        exit 0 ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+        exit 0 ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+        exit 0 ;;
+    CRAY*X-MP:*:*:*)
 	echo xmp-cray-unicos
         exit 0 ;;
-    CRAY*Y-MP:UNICOS:*:*)
+    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos
+	echo ymp-cray-unicos${UNAME_RELEASE}
-        exit 0 ;;
+	exit 0 ;;
-    CRAY-2:UNICOS:*:*)
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
+	exit 0 ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE}
+	exit 0 ;;
+    CRAY-2:*:*:*)
 	echo cray2-cray-unicos
         exit 0 ;;
-    i[34]86:BSD/386:*:*)
+    F300:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+        FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        exit 0 ;;
+    F301:UNIX_System_V:*:*)
+       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
+       exit 0 ;;
+    hp3[0-9][05]:NetBSD:*:*)
+	echo m68k-hp-netbsd${UNAME_RELEASE}
 	exit 0 ;;
-    i[34]86:FreeBSD:*:*)
+    hp300:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    i[34]86:Linux:*:*)
+    i?86:BSD/386:*:* | *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
-    i[34]86:UNIX_SV:4.*:* | i[34]86:SYSTEM_V:4.*:*)
+    *:FreeBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit 0 ;;
+    *:NetBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	exit 0 ;;
+    *:OpenBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	exit 0 ;;
+    i*:CYGWIN*:*)
+	echo i386-pc-cygwin32
+	exit 0 ;;
+    i*:MINGW*:*)
+	echo i386-pc-mingw32
+	exit 0 ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin32
+	exit 0 ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    *:GNU:*:*)
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit 0 ;;
+    *:Linux:*:*)
+	# The BFD linker knows what the default object file format is, so
+	# first see if it will tell us.
+	ld_help_string=`ld --help 2>&1`
+	if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_i.86"; then
+	  echo "${UNAME_MACHINE}-pc-linux-gnu" ; exit 0
+	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86linux"; then
+	  echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0
+	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86coff"; then
+	  echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0
+	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68kelf"; then
+	  echo "${UNAME_MACHINE}-unknown-linux-gnu" ; exit 0
+	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68klinux"; then
+	  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0
+	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf32ppc"; then
+	  echo "powerpc-unknown-linux-gnu" ; exit 0
+	elif test "${UNAME_MACHINE}" = "alpha" ; then
+	  echo alpha-unknown-linux-gnu ; exit 0
+	elif test "${UNAME_MACHINE}" = "sparc" ; then
+	  echo sparc-unknown-linux-gnu ; exit 0
+	elif test "${UNAME_MACHINE}" = "mips" ; then
+	  cat >dummy.c <<EOF
+main(argc, argv)
+int argc;
+char *argv[];
+{
+#ifdef __MIPSEB__
+  printf ("%s-unknown-linux-gnu\n", argv[1]);
+#endif
+#ifdef __MIPSEL__
+  printf ("%sel-unknown-linux-gnu\n", argv[1]);
+#endif
+  return 0;
+}
+EOF
+	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
+	  rm -f dummy.c dummy
+	else
+	  # Either a pre-BFD a.out linker (linux-gnuoldld) or one that does not give us
+	  # useful --help.  Gcc wants to distinguish between linux-gnuoldld and linux-gnuaout.
+	  test ! -d /usr/lib/ldscripts/. \
+	    && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
+	  # Determine whether the default compiler is a.out or elf
+	  cat >dummy.c <<EOF
+main(argc, argv)
+int argc;
+char *argv[];
+{
+#ifdef __ELF__
+  printf ("%s-pc-linux-gnu\n", argv[1]);
+#else
+  printf ("%s-pc-linux-gnuaout\n", argv[1]);
+#endif
+  return 0;
+}
+EOF
+	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
+	  rm -f dummy.c dummy
+	fi ;;
+# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
+# are messed up and put the nodename in both sysname and nodename.
+    i?86:DYNIX/ptx:4*:*)
+	echo i386-sequent-sysv4
+	exit 0 ;;
+    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
 		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
 	else
-		echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
 	fi
 	exit 0 ;;
-    i[34]86:*:3.2:*)
+    i?86:*:3.2:*)
-	if /bin/uname -X 2>/dev/null >/dev/null ; then
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
 		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
 		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-		echo ${UNAME_MACHINE}-unknown-sco$UNAME_REL
+		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
-	elif test -f /usr/options/cb.name; then
+			&& UNAME_MACHINE=i586
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-		echo ${UNAME_MACHINE}-unknown-isc$UNAME_REL
 	else
-		echo ${UNAME_MACHINE}-unknown-sysv32
+		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
 	exit 0 ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit 0 ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit 0 ;;
     i860:*:4.*:*) # i860-SVR4
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
@@ -235,30 +537,82 @@ EOF
 	# "miniframe"
 	echo m68010-convergent-sysv
 	exit 0 ;;
-    M680[234]0:*:R3V[567]*:*)
+    M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:* | 3[34]??,3[34]??:*:4.0:*)
+    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
-	uname -p 2>/dev/null | grep 86 >/dev/null \
+	OS_REL=''
-	  && echo i486-ncr-sysv4 && exit 0 ;;
+	test -r /etc/.relid \
-    m680[234]0:LynxOS:2.2*:*)
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	echo m68k-lynx-lynxos${UNAME_RELEASE}
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+          && echo i486-ncr-sysv4 && exit 0 ;;
+    m68*:LynxOS:2.*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
     mc68030:UNIX_System_V:4.*:*)
-        echo m68k-atari-sysv4
+	echo m68k-atari-sysv4
+	exit 0 ;;
+    i?86:LynxOS:2.*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit 0 ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit 0 ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit 0 ;;
+    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                           # says <Richard.M.Bartel@ccMail.Census.GOV>
+        echo i586-unisys-sysv4
         exit 0 ;;
-    i[34]86:LynxOS:2.2*:*)
+    *:UNIX_System_V:4*:FTX*)
-	echo i386-lynx-lynxos${UNAME_RELEASE}
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
 	exit 0 ;;
-    TSUNAMI:LynxOS:2.2*:*)
+    *:*:*:FTX*)
-	echo sparc-lynx-lynxos${UNAME_RELEASE}
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
 	exit 0 ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit 0 ;;
+    R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:*)
+	if [ -d /usr/nec ]; then
+	        echo mips-nec-sysv${UNAME_RELEASE}
+	else
+	        echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+        exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
 
 cat >dummy.c <<EOF
-main()
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
 {
 #if defined (sony)
 #if defined (MIPSEB)
@@ -266,73 +620,87 @@ main()
      I don't know....  */
   printf ("mips-sony-bsd\n"); exit (0);
 #else
-  printf("m68k-sony-newsos\n"); exit(0);
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+          "4"
+#else
+	  ""
+#endif
+         ); exit (0);
 #endif
 #endif
 
 #if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf("arm-acorn-riscix"); exit (0);
+  printf ("arm-acorn-riscix"); exit (0);
 #endif
 
-#if defined(hp300) && !defined(hpux)
+#if defined (hp300) && !defined (hpux)
-  printf("m68k-hp-bsd\n"); exit(0);
+  printf ("m68k-hp-bsd\n"); exit (0);
 #endif
 
-#if defined(NeXT)
+#if defined (NeXT)
-#if !defined(__ARCHITECTURE__)
+#if !defined (__ARCHITECTURE__)
 #define __ARCHITECTURE__ "m68k"
 #endif
   int version;
   version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version==2)
+  printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-    {
+  exit (0);
-      printf("%s-next-ns2\n", __ARCHITECTURE__);
-      exit(0);
-    }
-  else
-    {
-      printf("%s-next-ns3\n", __ARCHITECTURE__);
-      exit(0);
-    }
 #endif
 
 #if defined (MULTIMAX) || defined (n16)
 #if defined (UMAXV)
-  printf("ns32k-encore-sysv\n"); exit(0);
+  printf ("ns32k-encore-sysv\n"); exit (0);
 #else
 #if defined (CMU)
-  printf("ns32k-encore-mach\n"); exit(0);
+  printf ("ns32k-encore-mach\n"); exit (0);
 #else
-  printf("ns32k-encore-bsd\n"); exit(0);
+  printf ("ns32k-encore-bsd\n"); exit (0);
 #endif
 #endif
 #endif
 
-#if defined(__386BSD__) || (defined(__bsdi__) && defined(__i386__))
+#if defined (__386BSD__)
-  printf("i386-unknown-bsd\n"); exit(0);
+  printf ("i386-pc-bsd\n"); exit (0);
 #endif
 
-#if defined(sequent)
+#if defined (sequent)
-#if defined(i386)
+#if defined (i386)
-  printf("i386-sequent-dynix\n"); exit(0);
+  printf ("i386-sequent-dynix\n"); exit (0);
 #endif
 #if defined (ns32000)
-  printf("ns32k-sequent-dynix\n"); exit(0);
+  printf ("ns32k-sequent-dynix\n"); exit (0);
 #endif
 #endif
 
-#if defined(_SEQUENT_)
+#if defined (_SEQUENT_)
-  printf("i386-sequent-ptx\n"); exit(0);
+    struct utsname un;
+
+    uname(&un);
+
+    if (strncmp(un.version, "V2", 2) == 0) {
+	printf ("i386-sequent-ptx2\n"); exit (0);
+    }
+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+	printf ("i386-sequent-ptx1\n"); exit (0);
+    }
+    printf ("i386-sequent-ptx\n"); exit (0);
+
 #endif
 
-#if defined(vax)
+#if defined (vax)
-#if !defined(ultrix)
+#if !defined (ultrix)
-  printf("vax-dec-bsd\n"); exit(0);
+  printf ("vax-dec-bsd\n"); exit (0);
 #else
-  printf("vax-dec-ultrix\n"); exit(0);
+  printf ("vax-dec-ultrix\n"); exit (0);
 #endif
 #endif
 
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
   exit (1);
 }
 EOF
@@ -344,6 +712,32 @@ rm -f dummy.c dummy
 
 test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
 
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+    case `getsysinfo -f cpu_type` in
+    c1*)
+	echo c1-convex-bsd
+	exit 0 ;;
+    c2*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit 0 ;;
+    c34*)
+	echo c34-convex-bsd
+	exit 0 ;;
+    c38*)
+	echo c38-convex-bsd
+	exit 0 ;;
+    c4*)
+	echo c4-convex-bsd
+	exit 0 ;;
+    esac
+fi
+
 #echo '(Unable to guess system type)' 1>&2
 
 exit 1

config.sub

@@ -0,0 +1,939 @@
+#! /bin/sh
+# Configuration validation subroutine script, version 1.1.
+#   Copyright (C) 1991, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine.  It does not imply ALL GNU software can.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+if [ x$1 = x ]
+then
+	echo Configuration name missing. 1>&2
+	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
+	echo "or     $0 ALIAS" 1>&2
+	echo where ALIAS is a recognized configuration type. 1>&2
+	exit 1
+fi
+
+# First pass through any local machine types.
+case $1 in
+	*local*)
+		echo $1
+		exit 0
+		;;
+	*)
+	;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  linux-gnu*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple)
+		os=
+		basic_machine=$1
+		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco5)
+		os=sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+	# Recognize the basic CPU types without company name.
+	# Some are omitted here because they have special meanings below.
+	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arm \
+		| arme[lb] | pyramid | mn10300 \
+		| tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \
+		| alpha | we32k | ns16k | clipper | i370 | sh \
+		| powerpc | powerpcle | 1750a | dsp16xx | mips64 | mipsel \
+		| pdp11 | mips64el | mips64orion | mips64orionel \
+		| sparc | sparclet | sparclite | sparc64)
+		basic_machine=$basic_machine-unknown
+		;;
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i[3456]86)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+	vax-* | tahoe-* | i[3456]86-* | i860-* | m32r-* | m68k-* | m68000-* \
+	      | m88k-* | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \
+	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* | power-* \
+	      | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \
+	      | hppa-* | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \
+	      | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
+	      | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \
+	      | mips64el-* | mips64orion-* | mips64orionel-* | f301-*)
+		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+	3b*)
+		basic_machine=we32k-att
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-cbm
+		;;
+	amigados)
+		basic_machine=m68k-cbm
+		os=-amigados
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-cbm
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	cray2)
+		basic_machine=cray2-cray
+		os=-unicos
+		;;
+	[ctj]90-cray)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
+		;;
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppa-next)
+		os=-nextstep3
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+	i[3456]86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i[3456]86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i[3456]86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i[3456]86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	mipsel*-linux*)
+		basic_machine=mipsel-unknown
+		os=-linux
+		;;
+	mips*-linux*)
+		basic_machine=mips-unknown
+		os=-linux
+		;;
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
+		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	next | m*-next )
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      os=-nextstep3
+			;;
+		esac
+		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	np1)
+		basic_machine=np1-gould
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+        pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pentium | p5)
+		basic_machine=i586-intel
+		;;
+	pentiumpro | p6)
+		basic_machine=i686-intel
+		;;
+	pentium-* | p5-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	k5)
+		# We don't have specific support for AMD's K5 yet, so just call it a Pentium
+		basic_machine=i586-amd
+		;;
+	nexen)
+		# We don't have specific support for Nexgen yet, so just call it a Pentium
+		basic_machine=i586-nexgen
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	power)	basic_machine=rs6000-ibm
+		;;
+	ppc)	basic_machine=powerpc-unknown
+	        ;;
+	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppcle | powerpclittle | ppc-le | powerpc-little)
+		basic_machine=powerpcle-unknown
+	        ;;
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	rm[46]00)
+		basic_machine=mips-siemens
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	sun2)
+		basic_machine=m68000-sun
+		;;
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
+		;;
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
+		;;
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
+		;;
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
+		;;
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
+		;;
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
+		;;
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+       vpp*|vx|vx-*)
+               basic_machine=f301-fujitsu
+               ;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
+	xmp)
+		basic_machine=xmp-cray
+		os=-unicos
+		;;
+        xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
+		;;
+
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+	mips)
+		if [ x$os = x-linux ]; then
+			basic_machine=mips-unknown
+		else
+			basic_machine=mips-mips
+		fi
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	rs6000)
+		basic_machine=rs6000-ibm
+		;;
+	vax)
+		basic_machine=vax-dec
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sparc)
+		basic_machine=sparc-sun
+		;;
+        cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		;;
+	*-commodore*)
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		;;
+	*)
+		;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+        # First match some system type aliases
+        # that might get confused with valid system types.
+	# -solaris* is a basic system type, with this one exception.
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
+	-unixware* | svr4*)
+		os=-sysv4
+		;;
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	# First accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST END IN A *, to match a version number.
+	# -sysv* is not here because it comes later, after sysvr4.
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -amigados* | -msdos* | -newsos* | -unicos* | -aof* | -aos* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -uxpv*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-ns2 )
+	        os=-nextstep2
+		;;
+	# Preserve the version number of sinix5.
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	-sinix*)
+		os=-sysv4
+		;;
+	-triton*)
+		os=-sysv3
+		;;
+	-oss*)
+		os=-sysv3
+		;;
+	-svr4)
+		os=-sysv4
+		;;
+	-svr3)
+		os=-sysv3
+		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
+	-xenix)
+		os=-xenix
+		;;
+	-none)
+		;;
+	*)
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		exit 1
+		;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+	*-acorn)
+		os=-riscix1.2
+		;;
+	arm*-semi)
+		os=-aout
+		;;
+        pdp11-*)
+		os=-none
+		;;
+	*-dec | vax-*)
+		os=-ultrix4.2
+		;;
+	m68*-apollo)
+		os=-domain
+		;;
+	i386-sun)
+		os=-sunos4.0.2
+		;;
+	m68000-sun)
+		os=-sunos3
+		# This also exists in the configure program, but was not the
+		# default.
+		# os=-sunos4
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	*-ibm)
+		os=-aix
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigados
+		;;
+	*-dg)
+		os=-dgux
+		;;
+	*-dolphin)
+		os=-sysv3
+		;;
+	m68k-ccur)
+		os=-rtu
+		;;
+	m88k-omron*)
+		os=-luna
+		;;
+	*-next )
+		os=-nextstep
+		;;
+	*-sequent)
+		os=-ptx
+		;;
+	*-crds)
+		os=-unos
+		;;
+	*-ns)
+		os=-genix
+		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-nextstep3
+		;;
+        *-gould)
+		os=-sysv
+		;;
+        *-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+        *-sgi)
+		os=-irix
+		;;
+        *-siemens)
+		os=-sysv4
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	f301-fujitsu)
+		os=-uxpv
+		;;
+	*)
+		os=-none
+		;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+	*-unknown)
+		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
+			-sunos*)
+				vendor=sun
+				;;
+			-aix*)
+				vendor=ibm
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-vxsim* | -vxworks*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+		esac
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		;;
+esac
+
+echo $basic_machine$os

configure

@@ -11,6 +11,10 @@
 ac_help=
 ac_default_prefix=/usr/local
 # Any additions from configure.in:
+ac_help="$ac_help
+  --disable-static        Do not build the static library"
+ac_help="$ac_help
+  --enable-shared         Build the library as a shared library"
 
 # Initialize some variables set by options.
 # The variables have the same names as the options, with
@@ -543,6 +547,122 @@ fi
 #   If not, write to the Free Software Foundation,
 #   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+#--------------------------------------------------------------------
+# Use a .h file with #define's, instead of -D command-line switches
+#--------------------------------------------------------------------
+
+
+#--------------------------------------------------------------------
+# Determine the host, build, and target systems
+#--------------------------------------------------------------------
+ac_aux_dir=
+for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+  if test -f $ac_dir/install-sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f $ac_dir/install.sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
+fi
+ac_config_guess=$ac_aux_dir/config.guess
+ac_config_sub=$ac_aux_dir/config.sub
+ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
+
+
+# Do some error checking and defaulting for the host and target type.
+# The inputs are:
+#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
+#
+# The rules are:
+# 1. You are not allowed to specify --host, --target, and nonopt at the
+#    same time.
+# 2. Host defaults to nonopt.
+# 3. If nonopt is not specified, then host defaults to the current host,
+#    as determined by config.guess.
+# 4. Target and build default to nonopt.
+# 5. If nonopt is not specified, then target and build default to host.
+
+# The aliases save the names the user supplied, while $host etc.
+# will get canonicalized.
+case $host---$target---$nonopt in
+NONE---*---* | *---NONE---* | *---*---NONE) ;;
+*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
+esac
+
+
+# Make sure we can run config.sub.
+if $ac_config_sub sun4 >/dev/null 2>&1; then :
+else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
+fi
+
+echo $ac_n "checking host system type""... $ac_c" 1>&6
+echo "configure:606: checking host system type" >&5
+
+host_alias=$host
+case "$host_alias" in
+NONE)
+  case $nonopt in
+  NONE)
+    if host_alias=`$ac_config_guess`; then :
+    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
+    fi ;;
+  *) host_alias=$nonopt ;;
+  esac ;;
+esac
+
+host=`$ac_config_sub $host_alias`
+host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$host" 1>&6
+
+echo $ac_n "checking target system type""... $ac_c" 1>&6
+echo "configure:627: checking target system type" >&5
+
+target_alias=$target
+case "$target_alias" in
+NONE)
+  case $nonopt in
+  NONE) target_alias=$host_alias ;;
+  *) target_alias=$nonopt ;;
+  esac ;;
+esac
+
+target=`$ac_config_sub $target_alias`
+target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$target" 1>&6
+
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:645: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`$ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+test "$host_alias" != "$target_alias" &&
+  test "$program_prefix$program_suffix$program_transform_name" = \
+    NONENONEs,x,x, &&
+  program_prefix=${target_alias}-
+
 
 #--------------------------------------------------------------------
 # Find the compiler
@@ -550,7 +670,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:554: checking for $ac_word" >&5
+echo "configure:674: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -579,7 +699,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:583: checking for $ac_word" >&5
+echo "configure:703: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -627,7 +747,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:631: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:751: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -637,11 +757,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS
 cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext <<EOF
-#line 641 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -661,12 +781,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:665: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:785: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:670: checking whether we are using GNU C" >&5
+echo "configure:790: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -675,7 +795,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:679: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -690,7 +810,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:694: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:814: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -718,7 +838,7 @@ else
 fi
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:722: checking how to run the C preprocessor" >&5
+echo "configure:842: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -733,13 +853,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 737 "configure"
+#line 857 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:743: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:863: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -750,13 +870,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 754 "configure"
+#line 874 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:760: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:880: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -782,25 +902,6 @@ echo "$ac_t""$CPP" 1>&6
 #--------------------------------------------------------------------
 # Find some programs
 #--------------------------------------------------------------------
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -812,7 +913,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:816: checking for a BSD compatible install" >&5
+echo "configure:917: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -864,7 +965,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:868: checking for $ac_word" >&5
+echo "configure:969: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -891,7 +992,7 @@ else
 fi
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:895: checking whether ln -s works" >&5
+echo "configure:996: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -913,20 +1014,21 @@ fi
 
 
 #--------------------------------------------------------------------
-# Use a .h file with #define's, instead of -D command-line switches
+# -pipe option for compiler
 #--------------------------------------------------------------------
+PIPE='-pipe'
 
 
 #--------------------------------------------------------------------
 # Standard ANSI headers
 #--------------------------------------------------------------------
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:925: checking for ANSI C header files" >&5
+echo "configure:1027: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 930 "configure"
+#line 1032 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -934,7 +1036,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1040: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -951,7 +1053,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 955 "configure"
+#line 1057 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -969,7 +1071,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 973 "configure"
+#line 1075 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -990,7 +1092,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 994 "configure"
+#line 1096 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1001,7 +1103,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:1005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1032,17 +1134,17 @@ for ac_hdr in tiff.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1036: checking for $ac_hdr" >&5
+echo "configure:1138: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1041 "configure"
+#line 1143 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1046: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1148: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1087,17 +1189,17 @@ for ac_hdr in DPS/dpsclient.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1091: checking for $ac_hdr" >&5
+echo "configure:1193: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1096 "configure"
+#line 1198 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1101: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1203: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1148,7 +1250,7 @@ config_include=''
 
 # Checking for some additional libraries we might need
 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:1152: checking for dlopen in -ldl" >&5
+echo "configure:1254: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1156,7 +1258,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1160 "configure"
+#line 1262 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1167,7 +1269,7 @@ int main() {
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:1171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1195,7 +1297,7 @@ else
 fi
 
 echo $ac_n "checking for pthread_create in -lpcthread""... $ac_c" 1>&6
-echo "configure:1199: checking for pthread_create in -lpcthread" >&5
+echo "configure:1301: checking for pthread_create in -lpcthread" >&5
 ac_lib_var=`echo pcthread'_'pthread_create | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1203,7 +1305,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lpcthread  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1207 "configure"
+#line 1309 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1214,7 +1316,7 @@ int main() {
 pthread_create()
 ; return 0; }
 EOF
-if { (eval echo configure:1218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1240,7 +1342,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-echo "configure:1244: checking for pthread_create in -lpthread" >&5
+echo "configure:1346: checking for pthread_create in -lpthread" >&5
 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1248,7 +1350,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lpthread  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1252 "configure"
+#line 1354 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1259,7 +1361,7 @@ int main() {
 pthread_create()
 ; return 0; }
 EOF
-if { (eval echo configure:1263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1289,7 +1391,7 @@ fi
 fi
 
 echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6
-echo "configure:1293: checking for sqrt in -lm" >&5
+echo "configure:1395: checking for sqrt in -lm" >&5
 ac_lib_var=`echo m'_'sqrt | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1297,7 +1399,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1301 "configure"
+#line 1403 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1308,7 +1410,7 @@ int main() {
 sqrt()
 ; return 0; }
 EOF
-if { (eval echo configure:1312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1338,20 +1440,76 @@ fi
 
 # Determine the Foundation library
 
+echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
+echo "configure:1445: checking how to run the C++ preprocessor" >&5
+if test -z "$CXXCPP"; then
+if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+  CXXCPP="${CXX-g++} -E"
+  cat > conftest.$ac_ext <<EOF
+#line 1458 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1463: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
+if test -z "$ac_err"; then
+  :
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CXXCPP=/lib/cpp
+fi
+rm -f conftest*
+  ac_cv_prog_CXXCPP="$CXXCPP"
+fi
+fi
+CXXCPP="$ac_cv_prog_CXXCPP"
+echo "$ac_t""$CXXCPP" 1>&6
+
 echo $ac_n "checking for the Foundation library""... $ac_c" 1>&6
-echo "configure:1343: checking for the Foundation library" >&5
+echo "configure:1482: checking for the Foundation library" >&5
 OBJC_LIBS=
 if eval "test \"`echo '$''{'ac_cv_foundation_library'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_ext=m
+  if test "$FOUNDATION" = ""; then
+ac_ext=m
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $OBJC_RUNTIME_FLAG'
 ac_compile='${CC-cc} -c $OBJC_RUNTIME_FLAG $CFLAGS conftest.$ac_ext 1>&5 2>&5'
 ac_link='${CC-cc} -o conftest $OBJC_RUNTIME_FLAG $CFLAGS $LDFLAGS conftest.$ac_ext $LIBS $OBJC_LIBS 1>&5 2>&5'
 
 cat > conftest.$ac_ext <<EOF
-#line 1355 "configure"
+#line 1495 "configure"
+#include "confdefs.h"
+#include <foundation/NSObject.h>
+
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1501: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  ac_cv_foundation_library=foundation
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+cat > conftest.$ac_ext <<EOF
+#line 1513 "configure"
 #include "confdefs.h"
 #include <Foundation/preface.h>
 
@@ -1359,16 +1517,16 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1363: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1521: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  ac_cv_foundation_library="$ac_cv_foundation_library gnustep-base"
+  ac_cv_foundation_library="gnustep-base"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
 cat > conftest.$ac_ext <<EOF
-#line 1372 "configure"
+#line 1530 "configure"
 #include "confdefs.h"
 #include <Foundation/exceptions/FoundationException.h>
 
@@ -1376,7 +1534,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_foundation_library="$ac_cv_foundation_library libFoundation"
 else
@@ -1385,17 +1543,18 @@ else
 fi
 rm -f conftest*
 cat > conftest.$ac_ext <<EOF
-#line 1389 "configure"
+#line 1547 "configure"
 #include "confdefs.h"
-#include <objects/stdobjects.h>
+#import <Foundation/NSObject.h>
+#import <synch.h>
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  ac_cv_foundation_library="$ac_cv_foundation_library libobjects"
+  ac_cv_foundation_library=Sun
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
@@ -1407,25 +1566,6 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
-if test "$FOUNDATION" = ""; then
-cat > conftest.$ac_ext <<EOF
-#line 1413 "configure"
-#include "confdefs.h"
-#include <foundation/NSObject.h>
-
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1419: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  ac_cv_foundation_library=foundation
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
 else
     ac_cv_foundation_library=$FOUNDATION
 fi
@@ -1479,7 +1619,7 @@ EOF
 esac
 echo "$ac_t""${ac_cv_foundation_library}" 1>&6
 echo $ac_n "checking for the Objective-C runtime""... $ac_c" 1>&6
-echo "configure:1483: checking for the Objective-C runtime" >&5
+echo "configure:1623: checking for the Objective-C runtime" >&5
 if eval "test \"`echo '$''{'ac_cv_objc_runtime'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1491,7 +1631,7 @@ ac_compile='${CC-cc} -c $OBJC_RUNTIME_FLAG $CFLAGS conftest.$ac_ext 1>&5 2>&5'
 ac_link='${CC-cc} -o conftest $OBJC_RUNTIME_FLAG $CFLAGS $LDFLAGS conftest.$ac_ext $LIBS $OBJC_LIBS 1>&5 2>&5'
 
   cat > conftest.$ac_ext <<EOF
-#line 1495 "configure"
+#line 1635 "configure"
 #include "confdefs.h"
 #include <Foundation/NSString.h>
 int main() {
@@ -1502,7 +1642,7 @@ extern id objc_lookUpClass(char*);
   
 ; return 0; }
 EOF
-if { (eval echo configure:1506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_objc_runtime=NeXT
 else
@@ -1517,7 +1657,7 @@ rm -f conftest*
     saved_LIBS=$LIBS
     LIBS="$OBJC_LIBS -lobjc $LIBS"
     cat > conftest.$ac_ext <<EOF
-#line 1521 "configure"
+#line 1661 "configure"
 #include "confdefs.h"
 #include <Foundation/NSString.h>
     #include <objc/objc-api.h>
@@ -1528,7 +1668,7 @@ id class = objc_lookup_class("NSObject");
     
 ; return 0; }
 EOF
-if { (eval echo configure:1532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_objc_runtime=GNU
 else
@@ -1583,6 +1723,89 @@ LIBS="$OBJC_LIBS $LIBS"
 
 
 
+#--------------------------------------------------------------------
+# Tools for making a DLL.
+#--------------------------------------------------------------------
+DLLTOOL='dlltool'
+
+
+#--------------------------------------------------------------------
+# Make a static library?
+# Import library is the library for linking with a DLL.
+#--------------------------------------------------------------------
+# Check whether --enable-static or --disable-static was given.
+if test "${enable_static+set}" = set; then
+  enableval="$enable_static"
+  echo $enable_static
+if  x$enable_static = xno ; then
+	STATIC_LIBRARY=''
+else
+	STATIC_LIBRARY='lib$(LIBRARY_NAME)$(libext)'
+fi
+else
+  STATIC_LIBRARY='$(MAIN_FILE)$(libext)'
+fi
+
+IMPORT_LIBRARY=$STATIC_LIBRARY
+
+
+
+#--------------------------------------------------------------------
+# Make a shared library?
+#--------------------------------------------------------------------
+# Check whether --enable-shared or --disable-shared was given.
+if test "${enable_shared+set}" = set; then
+  enableval="$enable_shared"
+  SHARED_LIBRARY='$(MAIN_FILE).so.$(VERSION)'
+else
+  SHARED_LIBRARY=
+fi
+
+
+
+#--------------------------------------------------------------------
+# Custom configuration based upon the target
+#--------------------------------------------------------------------
+
+# On some platforms, ld doesn't link in the complete library which
+# can cause problems with the dynamic nature of ObjC.  Programs call
+# methods for classes which don't exist in the executable!!
+# The variables turn on/off the behaviour of ld to include the
+# whole archive.
+# Note that executable sizes will be larger.
+# Note that these variables are passed to GCC not ld directly
+whole_archive=''
+no_whole_archive=''
+
+case "${target}" in
+  i[345]86-*-cygwin32)
+        whole_archive='-Wl,--whole-archive'
+	no_whole_archive='-Wl,--no-whole-archive'
+	LIBS="$LIBS -ladvapi32"
+	# -pipe not supported
+	PIPE=''
+	;;
+  i[345]86-*-mingw32)
+        whole_archive='-Wl,--whole-archive'
+	no_whole_archive='-Wl,--no-whole-archive'
+	LIBS="$LIBS -lwsock32 -ladvapi32"
+	# Shared library is a DLL
+	if [ x$SHARED_LIBRARY != x ]; then
+		SHARED_LIBRARY='$(MAIN_FILE).dll'
+		# Rename static library if also building a shared library
+		if [ x$STATIC_LIBRARY != x ]; then
+			STATIC_LIBRARY='$(MAIN_FILE)_s$(libext)'
+			IMPORT_LIBRARY='$(MAIN_FILE)$(libext)'
+		fi
+	fi
+	# -pipe not supported
+	PIPE=''
+	;;
+esac
+
+
+
+
 #--------------------------------------------------------------------
 # Write the Makefiles and configuration files
 #--------------------------------------------------------------------
@@ -1717,16 +1940,39 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
+s%@host@%$host%g
+s%@host_alias@%$host_alias%g
+s%@host_cpu@%$host_cpu%g
+s%@host_vendor@%$host_vendor%g
+s%@host_os@%$host_os%g
+s%@target@%$target%g
+s%@target_alias@%$target_alias%g
+s%@target_cpu@%$target_cpu%g
+s%@target_vendor@%$target_vendor%g
+s%@target_os@%$target_os%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@CC@%$CC%g
 s%@CPP@%$CPP%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
 s%@RANLIB@%$RANLIB%g
 s%@LN_S@%$LN_S%g
+s%@PIPE@%$PIPE%g
 s%@config_include@%$config_include%g
 s%@FOUNDATION_LIBRARY@%$FOUNDATION_LIBRARY%g
+s%@CXXCPP@%$CXXCPP%g
 s%@OBJC_RUNTIME@%$OBJC_RUNTIME%g
 s%@OBJC_RUNTIME_FLAG@%$OBJC_RUNTIME_FLAG%g
+s%@DLLTOOL@%$DLLTOOL%g
+s%@STATIC_LIBRARY@%$STATIC_LIBRARY%g
+s%@IMPORT_LIBRARY@%$IMPORT_LIBRARY%g
+s%@SHARED_LIBRARY@%$SHARED_LIBRARY%g
+s%@whole_archive@%$whole_archive%g
+s%@no_whole_archive@%$no_whole_archive%g
 
 CEOF
 EOF

configure.in

@@ -24,6 +24,15 @@ AC_INIT(Source/NSApplication.m)
 #   If not, write to the Free Software Foundation,
 #   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+#--------------------------------------------------------------------
+# Use a .h file with #define's, instead of -D command-line switches
+#--------------------------------------------------------------------
+AC_CONFIG_HEADER(Headers/gnustep/gui/config.h)
+
+#--------------------------------------------------------------------
+# Determine the host, build, and target systems
+#--------------------------------------------------------------------
+AC_CANONICAL_SYSTEM
 
 #--------------------------------------------------------------------
 # Find the compiler
@@ -39,9 +48,10 @@ AC_PROG_RANLIB
 AC_LN_S
 
 #--------------------------------------------------------------------
-# Use a .h file with #define's, instead of -D command-line switches
+# -pipe option for compiler
 #--------------------------------------------------------------------
-AC_CONFIG_HEADER(Headers/gnustep/gui/config.h)
+PIPE='-pipe'
+AC_SUBST(PIPE)
 
 #--------------------------------------------------------------------
 # Standard ANSI headers
@@ -101,6 +111,81 @@ AC_CHECK_LIB(m, sqrt)
 # Determine the Foundation library
 AC_FIND_FOUNDATION
 
+#--------------------------------------------------------------------
+# Tools for making a DLL.
+#--------------------------------------------------------------------
+DLLTOOL='dlltool'
+AC_SUBST(DLLTOOL)
+
+#--------------------------------------------------------------------
+# Make a static library?
+# Import library is the library for linking with a DLL.
+#--------------------------------------------------------------------
+AC_ARG_ENABLE(static,
+[  --disable-static        Do not build the static library],
+echo $enable_static
+if [[ x$enable_static = xno ]]; then
+	STATIC_LIBRARY=''
+else
+	STATIC_LIBRARY='lib$(LIBRARY_NAME)$(libext)'
+fi,
+STATIC_LIBRARY='$(MAIN_FILE)$(libext)')
+IMPORT_LIBRARY=$STATIC_LIBRARY
+AC_SUBST(STATIC_LIBRARY)
+AC_SUBST(IMPORT_LIBRARY)
+
+#--------------------------------------------------------------------
+# Make a shared library?
+#--------------------------------------------------------------------
+AC_ARG_ENABLE(shared,
+[  --enable-shared         Build the library as a shared library],
+        SHARED_LIBRARY='$(MAIN_FILE).so.$(VERSION)',
+    SHARED_LIBRARY=)
+AC_SUBST(SHARED_LIBRARY)
+
+#--------------------------------------------------------------------
+# Custom configuration based upon the target
+#--------------------------------------------------------------------
+
+# On some platforms, ld doesn't link in the complete library which
+# can cause problems with the dynamic nature of ObjC.  Programs call
+# methods for classes which don't exist in the executable!!
+# The variables turn on/off the behaviour of ld to include the
+# whole archive.
+# Note that executable sizes will be larger.
+# Note that these variables are passed to GCC not ld directly
+whole_archive=''
+no_whole_archive=''
+
+case "${target}" in
+  i[[345]]86-*-cygwin32)
+        whole_archive='-Wl,--whole-archive'
+	no_whole_archive='-Wl,--no-whole-archive'
+	LIBS="$LIBS -ladvapi32"
+	# -pipe not supported
+	PIPE=''
+	;;
+  i[[345]]86-*-mingw32)
+        whole_archive='-Wl,--whole-archive'
+	no_whole_archive='-Wl,--no-whole-archive'
+	LIBS="$LIBS -lwsock32 -ladvapi32"
+	# Shared library is a DLL
+	if [[ x$SHARED_LIBRARY != x ]]; then
+		SHARED_LIBRARY='$(MAIN_FILE).dll'
+		# Rename static library if also building a shared library
+		if [[ x$STATIC_LIBRARY != x ]]; then
+			STATIC_LIBRARY='$(MAIN_FILE)_s$(libext)'
+			IMPORT_LIBRARY='$(MAIN_FILE)$(libext)'
+		fi
+	fi
+	# -pipe not supported
+	PIPE=''
+	;;
+esac
+
+AC_SUBST(whole_archive)
+AC_SUBST(no_whole_archive)
+
 #--------------------------------------------------------------------
 # Write the Makefiles and configuration files
 #--------------------------------------------------------------------