From 8156ae951cd638bc15cad97c1249128f44a42778 Mon Sep 17 00:00:00 2001 From: fedor Date: Thu, 22 Jun 2000 03:15:27 +0000 Subject: [PATCH] Shared library on Windows fixes git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@6768 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 19 + Documentation/.cvsignore | 3 + Headers/gnustep/base/Foundation.h | 1 + Headers/gnustep/base/NSObjCRuntime.h | 9 +- Headers/gnustep/base/NSZone.h | 78 ++- Headers/gnustep/base/config.h.in | 6 + Source/Makefile.preamble | 7 + Source/NSConcreteNumber.m | 1 + Source/NSZone.m | 81 +-- Source/UdpPort.m | 4 +- Source/behavior.m | 34 +- Source/libgnustep-base.def | 776 +---------------------- Source/objc-load.m | 5 + acconfig.h | 3 + configure | 881 +++++++++++++-------------- configure.in | 39 ++ 16 files changed, 580 insertions(+), 1367 deletions(-) diff --git a/ChangeLog b/ChangeLog index 474d0addf..a6fc71675 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +2000-06-21 Adam Fedor + + * Shared library (DLL) fixes on Windows + * configure.in: Check for alternate objc (DLL) libraries. + Look for objc_get_uninstalled_dtable. + * Source/behavior.m (behavior_class_add_methods): Don't look for + uninstalled_dtable if no objc_get_uninstalled_dtable. + (check_class_methods): Remove unused. + * Source/objc-load.m: Likewise. + + * Headers/gnustep/base/NSObjCRuntime.h: Define GS_EXPORT + * Headers/gnustep/base/NSZone.h: Define functions either static + or extern depending on whether NSZone.m is being compiled. + * Source/NSZone.m: Remove duplicate functions. + * Source/Makefile.preamble (LIBRARIES_DEPEND_UPON): Add -lobjc + if on windows. + + * Source/UdpPort.m: Use NSMutableArray. + 2000-06-19 Adam Fedor * Source/NSBundle.m (_bundle_name_first_match): Work even when diff --git a/Documentation/.cvsignore b/Documentation/.cvsignore index 7558498ba..b9f4ce3a6 100644 --- a/Documentation/.cvsignore +++ b/Documentation/.cvsignore @@ -1,5 +1,6 @@ =* version.tmpl.texi +version.texi gnustep-base.texi gnustep-zones.texi announce.texi @@ -39,4 +40,6 @@ ANNOUNCE *.pg *.ps *.vrs +*.cl +*.pr diff --git a/Headers/gnustep/base/Foundation.h b/Headers/gnustep/base/Foundation.h index 735ad5325..6ab364984 100644 --- a/Headers/gnustep/base/Foundation.h +++ b/Headers/gnustep/base/Foundation.h @@ -26,6 +26,7 @@ #ifndef __Foundation_h_GNUSTEP_BASE_INCLUDE #define __Foundation_h_GNUSTEP_BASE_INCLUDE +#include #include #include #include diff --git a/Headers/gnustep/base/NSObjCRuntime.h b/Headers/gnustep/base/NSObjCRuntime.h index 3268f347f..f730d2eac 100644 --- a/Headers/gnustep/base/NSObjCRuntime.h +++ b/Headers/gnustep/base/NSObjCRuntime.h @@ -27,14 +27,15 @@ #include #include -#if BUILD_libgnustep-base_DLL -# define GS_EXPORT __declspec(dllexport) -#elif libgnustep-base_ISDLL -# define GS_EXPORT extern __declspec(dllimport) +#if BUILD_libgnustep_base_DLL +# define GS_EXPORT __declspec(dllexport) +#elif libgnustep_base_ISDLL +# define GS_EXPORT extern __declspec(dllimport) #else # define GS_EXPORT extern #endif #define GS_IMPORT extern +#define GS_DECLARE @class NSString; diff --git a/Headers/gnustep/base/NSZone.h b/Headers/gnustep/base/NSZone.h index 2afd7e477..b81362374 100644 --- a/Headers/gnustep/base/NSZone.h +++ b/Headers/gnustep/base/NSZone.h @@ -58,6 +58,14 @@ struct _NSZone void *GSOutOfMemory(size_t size, BOOL retry); +#ifdef IN_NSZONE_M +#define GS_ZONE_SCOPE extern +#define GS_ZONE_ATTR +#else +#define GS_ZONE_SCOPE static inline +#define GS_ZONE_ATTR __attribute__((unused)) +#endif + /* Default zone. Name is hopelessly long so that no one will ever want to use it. ;) Private variable. */ GS_EXPORT NSZone* __nszone_private_hidden_default_zone; @@ -71,19 +79,19 @@ GS_EXPORT NSZone* __nszone_private_hidden_default_zone; GS_EXPORT NSZone* __nszone_private_hidden_atomic_zone; -GS_EXPORT inline NSZone* NSCreateZone (size_t start, size_t gran, BOOL canFree) +GS_ZONE_SCOPE NSZone* NSCreateZone (size_t start, size_t gran, BOOL canFree) { return __nszone_private_hidden_default_zone; } -GS_EXPORT inline NSZone* NSDefaultMallocZone (void) +GS_ZONE_SCOPE NSZone* NSDefaultMallocZone (void) { return __nszone_private_hidden_default_zone; } -GS_EXPORT inline NSZone* GSAtomicMallocZone (void) +GS_ZONE_SCOPE NSZone* GSAtomicMallocZone (void) { return __nszone_private_hidden_atomic_zone; } -GS_EXPORT inline NSZone* NSZoneFromPointer (void *ptr) +GS_ZONE_SCOPE NSZone* NSZoneFromPointer (void *ptr) { return __nszone_private_hidden_default_zone; } -GS_EXPORT inline void* NSZoneMalloc (NSZone *zone, size_t size) +GS_ZONE_SCOPE void* NSZoneMalloc (NSZone *zone, size_t size) { void *ptr; @@ -97,7 +105,7 @@ GS_EXPORT inline void* NSZoneMalloc (NSZone *zone, size_t size) return ptr; } -GS_EXPORT inline void* NSZoneCalloc (NSZone *zone, size_t elems, size_t bytes) +GS_ZONE_SCOPE void* NSZoneCalloc (NSZone *zone, size_t elems, size_t bytes) { size_t size = elems * bytes; void *ptr; @@ -113,7 +121,7 @@ GS_EXPORT inline void* NSZoneCalloc (NSZone *zone, size_t elems, size_t bytes) return ptr; } -GS_EXPORT inline void* NSZoneRealloc (NSZone *zone, void *ptr, size_t size) +GS_ZONE_SCOPE void* NSZoneRealloc (NSZone *zone, void *ptr, size_t size) { ptr = GC_REALLOC(ptr, size); if (ptr == 0) @@ -121,37 +129,37 @@ GS_EXPORT inline void* NSZoneRealloc (NSZone *zone, void *ptr, size_t size) return ptr; } -GS_EXPORT inline void NSRecycleZone (NSZone *zone) +GS_ZONE_SCOPE void NSRecycleZone (NSZone *zone) { } -GS_EXPORT inline void NSZoneFree (NSZone *zone, void *ptr) +GS_ZONE_SCOPE void NSZoneFree (NSZone *zone, void *ptr) { GC_FREE(ptr); } -GS_EXPORT inline void NSSetZoneName (NSZone *zone, NSString *name) +GS_ZONE_SCOPE void NSSetZoneName (NSZone *zone, NSString *name) { } -GS_EXPORT inline NSString* NSZoneName (NSZone *zone) +GS_ZONE_SCOPE NSString* NSZoneName (NSZone *zone) { return nil; } #ifndef NO_GNUSTEP -GS_EXPORT inline void* NSZoneMallocAtomic (NSZone *zone, size_t size) +GS_ZONE_SCOPE void* NSZoneMallocAtomic (NSZone *zone, size_t size) { return NSZoneMalloc(GSAtomicMallocZone(), size); } -GS_EXPORT inline BOOL NSZoneCheck (NSZone *zone) +GS_ZONE_SCOPE BOOL NSZoneCheck (NSZone *zone) { return YES; } -GS_EXPORT inline struct NSZoneStats NSZoneStats (NSZone *zone) +GS_ZONE_SCOPE struct NSZoneStats NSZoneStats (NSZone *zone) { struct NSZoneStats stats = { 0 }; return stats; @@ -162,19 +170,25 @@ GS_EXPORT inline struct NSZoneStats NSZoneStats (NSZone *zone) GS_EXPORT NSZone* NSCreateZone (size_t start, size_t gran, BOOL canFree); -GS_EXPORT inline NSZone* NSDefaultMallocZone (void) +GS_ZONE_SCOPE NSZone* NSDefaultMallocZone (void) GS_ZONE_ATTR; + +GS_ZONE_SCOPE NSZone* NSDefaultMallocZone (void) { return __nszone_private_hidden_default_zone; } -GS_EXPORT inline NSZone* GSAtomicMallocZone (void) +GS_ZONE_SCOPE NSZone* GSAtomicMallocZone (void) GS_ZONE_ATTR; + +GS_ZONE_SCOPE NSZone* GSAtomicMallocZone (void) { return NSDefaultMallocZone(); } GS_EXPORT NSZone* NSZoneFromPointer (void *ptr); -GS_EXPORT inline void* NSZoneMalloc (NSZone *zone, size_t size) +GS_ZONE_SCOPE void* NSZoneMalloc (NSZone *zone, size_t size) GS_ZONE_ATTR; + +GS_ZONE_SCOPE void* NSZoneMalloc (NSZone *zone, size_t size) { if (!zone) zone = NSDefaultMallocZone(); @@ -183,21 +197,28 @@ GS_EXPORT inline void* NSZoneMalloc (NSZone *zone, size_t size) GS_EXPORT void* NSZoneCalloc (NSZone *zone, size_t elems, size_t bytes); -GS_EXPORT inline void* NSZoneRealloc (NSZone *zone, void *ptr, size_t size) +GS_ZONE_SCOPE void* +NSZoneRealloc (NSZone *zone, void *ptr, size_t size) GS_ZONE_ATTR; + +GS_ZONE_SCOPE void* NSZoneRealloc (NSZone *zone, void *ptr, size_t size) { if (!zone) zone = NSDefaultMallocZone(); return (zone->realloc)(zone, ptr, size); } -GS_EXPORT inline void NSRecycleZone (NSZone *zone) +GS_ZONE_SCOPE void NSRecycleZone (NSZone *zone) GS_ZONE_ATTR; + +GS_ZONE_SCOPE void NSRecycleZone (NSZone *zone) { if (!zone) zone = NSDefaultMallocZone(); (zone->recycle)(zone); } -GS_EXPORT inline void NSZoneFree (NSZone *zone, void *ptr) +GS_ZONE_SCOPE void NSZoneFree (NSZone *zone, void *ptr) GS_ZONE_ATTR; + +GS_ZONE_SCOPE void NSZoneFree (NSZone *zone, void *ptr) { if (!zone) zone = NSDefaultMallocZone(); @@ -206,7 +227,9 @@ GS_EXPORT inline void NSZoneFree (NSZone *zone, void *ptr) GS_EXPORT void NSSetZoneName (NSZone *zone, NSString *name); -GS_EXPORT inline NSString* NSZoneName (NSZone *zone) +GS_ZONE_SCOPE NSString* NSZoneName (NSZone *zone) GS_ZONE_ATTR; + +GS_ZONE_SCOPE NSString* NSZoneName (NSZone *zone) { if (!zone) zone = NSDefaultMallocZone(); @@ -214,21 +237,28 @@ GS_EXPORT inline NSString* NSZoneName (NSZone *zone) } #ifndef NO_GNUSTEP -GS_EXPORT inline void* NSZoneMallocAtomic (NSZone *zone, size_t size) +GS_ZONE_SCOPE void* +NSZoneMallocAtomic (NSZone *zone, size_t size) GS_ZONE_ATTR; + +GS_ZONE_SCOPE void* NSZoneMallocAtomic (NSZone *zone, size_t size) { if (!zone) zone = NSDefaultMallocZone(); return (zone->malloc)(zone, size); } -GS_EXPORT inline BOOL NSZoneCheck (NSZone *zone) +GS_ZONE_SCOPE BOOL NSZoneCheck (NSZone *zone) GS_ZONE_ATTR; + +GS_ZONE_SCOPE BOOL NSZoneCheck (NSZone *zone) { if (!zone) zone = NSDefaultMallocZone(); return (zone->check)(zone); } -GS_EXPORT inline struct NSZoneStats NSZoneStats (NSZone *zone) +GS_ZONE_SCOPE struct NSZoneStats NSZoneStats (NSZone *zone) GS_ZONE_ATTR; + +GS_ZONE_SCOPE struct NSZoneStats NSZoneStats (NSZone *zone) { if (!zone) zone = NSDefaultMallocZone(); diff --git a/Headers/gnustep/base/config.h.in b/Headers/gnustep/base/config.h.in index e4c312b7f..b2655afaf 100644 --- a/Headers/gnustep/base/config.h.in +++ b/Headers/gnustep/base/config.h.in @@ -36,6 +36,9 @@ /* Define if your Obj-C compiler calls +load methods before main */ #undef HAVE_LOAD_METHOD +/* Define if objc-api.h defines this function */ +#undef HAVE_OBJC_GET_UNINSTALLED_DTABLE + /* Define if your Lib C defines program_invocation_name */ #undef HAVE_PROGRAM_INVOCATION_NAME @@ -126,6 +129,9 @@ /* Define if you have the header file. */ #undef HAVE_GRP_H +/* Define if you have the header file. */ +#undef HAVE_LIBXML_XMLVERSION_H + /* Define if you have the header file. */ #undef HAVE_MEMORY_H diff --git a/Source/Makefile.preamble b/Source/Makefile.preamble index 0a97580e6..3e1f29a85 100644 --- a/Source/Makefile.preamble +++ b/Source/Makefile.preamble @@ -57,6 +57,13 @@ ADDITIONAL_LDFLAGS = # Additional library directories the linker should search ADDITIONAL_LIB_DIRS = +ifeq ($(GNUSTEP_TARGET_OS),mingw32) +libgnustep-base_LIBRARIES_DEPEND_UPON += -lobjc +endif +ifeq ($(GNUSTEP_TARGET_OS),cygwin) +libgnustep-base_LIBRARIES_DEPEND_UPON += -lobjc +endif + # # Flags dealing with installing and uninstalling # diff --git a/Source/NSConcreteNumber.m b/Source/NSConcreteNumber.m index 9b56e46bb..2cfc2624a 100644 --- a/Source/NSConcreteNumber.m +++ b/Source/NSConcreteNumber.m @@ -27,6 +27,7 @@ #include #include +#include #include #include #include diff --git a/Source/NSZone.m b/Source/NSZone.m index 336269ffd..23a9f0fd3 100644 --- a/Source/NSZone.m +++ b/Source/NSZone.m @@ -79,6 +79,7 @@ /* Define to turn off NSAssertions. */ #define NS_BLOCK_ASSERTIONS 1 +#define IN_NSZONE_M 1 #include #include @@ -410,7 +411,7 @@ NSZone* __nszone_private_hidden_default_zone = &default_zone; */ static NSZone *zone_list = 0; -inline NSZone* +GS_DECLARE NSZone* NSZoneFromPointer(void *ptr) { NSZone *zone; @@ -1695,56 +1696,12 @@ NSCreateZone (size_t start, size_t gran, BOOL canFree) return newZone; } -inline NSZone* -NSDefaultMallocZone (void) -{ - return __nszone_private_hidden_default_zone; -} - -NSZone* GSAtomicMallocZone (void) -{ - return NSDefaultMallocZone(); -} - -inline void* -NSZoneMalloc (NSZone *zone, size_t size) -{ - if (!zone) - zone = NSDefaultMallocZone(); - return (zone->malloc)(zone, size); -} - void* NSZoneCalloc (NSZone *zone, size_t elems, size_t bytes) { return memset(NSZoneMalloc(zone, elems*bytes), 0, elems*bytes); } -inline void* -NSZoneRealloc (NSZone *zone, void *ptr, size_t size) -{ - if (!zone) - zone = NSDefaultMallocZone(); - return (zone->realloc)(zone, ptr, size); -} - -inline void -NSRecycleZone (NSZone *zone) -{ - if (zone == 0) - zone = NSDefaultMallocZone(); - - (zone->recycle)(zone); -} - -inline void -NSZoneFree (NSZone *zone, void *ptr) -{ - if (!zone) - zone = NSDefaultMallocZone(); - (zone->free)(zone, ptr); -} - void NSSetZoneName (NSZone *zone, NSString *name) { @@ -1758,40 +1715,6 @@ NSSetZoneName (NSZone *zone, NSString *name) [gnustep_global_lock unlock]; } -inline NSString* -NSZoneName (NSZone *zone) -{ - if (!zone) - zone = NSDefaultMallocZone(); - return zone->name; -} - -/* Not in OpenStep. */ - -void* -NSZoneMallocAtomic (NSZone *zone, size_t size) -{ - return NSZoneMalloc(GSAtomicMallocZone(), size); -} - -/* Not in OpenStep. */ -inline BOOL -NSZoneCheck (NSZone *zone) -{ - if (!zone) - zone = NSDefaultMallocZone(); - return (zone->check)(zone); -} - -/* Not in OpenStep. */ -inline struct NSZoneStats -NSZoneStats (NSZone *zone) -{ - if (!zone) - zone = NSDefaultMallocZone(); - return (zone->stats)(zone); -} - #else #include diff --git a/Source/UdpPort.m b/Source/UdpPort.m index b592f9d5f..3e03cf7fb 100644 --- a/Source/UdpPort.m +++ b/Source/UdpPort.m @@ -326,13 +326,13 @@ static NSMapTable *port_number_2_in_port = NULL; @implementation UdpOutPort -static NSArray *udp_out_port_array; +static NSMutableArray *udp_out_port_array; + (void) initialize { if (self == [UdpOutPort class]) { - udp_out_port_array = [NSArray new]; + udp_out_port_array = [NSMutableArray new]; } } diff --git a/Source/behavior.m b/Source/behavior.m index 5ab82e917..663c237af 100644 --- a/Source/behavior.m +++ b/Source/behavior.m @@ -63,7 +63,6 @@ static void __objc_class_add_protocols (Class class, struct objc_protocol_list* protos); #endif static BOOL class_is_kind_of(Class self, Class class); -static void check_class_methods(Class class); /* xxx consider using sendmsg.c:__objc_update_dispatch_table_for_class, but, I think it will be slower than the current method. */ @@ -205,6 +204,7 @@ behavior_class_add_methods (Class class, the dtable sarray, but if it isn't, let __objc_install_dispatch_table_for_class do it. */ +#ifdef HAVE_OBJC_GET_UNINSTALLED_DTABLE if (class->dtable != objc_get_uninstalled_dtable()) { sarray_at_put_safe (class->dtable, @@ -214,6 +214,7 @@ behavior_class_add_methods (Class class, fprintf(stderr, "\tinstalled method\n"); } else +#endif { if (behavior_debug) fprintf(stderr, "\tappended method\n"); @@ -427,34 +428,3 @@ static BOOL class_is_kind_of(Class self, Class aClassObject) return YES; return NO; } - -void -check_class_methods(Class class) -{ - int counter; - MethodList_t mlist; - - if (class->dtable == objc_get_uninstalled_dtable()) - return; - - for (mlist = class->methods; mlist; mlist = mlist->method_next) - { - counter = mlist->method_count - 1; - while (counter >= 0) - { - Method_t method = &(mlist->method_list[counter]); - IMP imp = sarray_get(class->dtable, - (size_t)method->method_name->sel_id); - NSCAssert((imp == method->method_imp), NSInvalidArgumentException); - sarray_at_put_safe (class->dtable, - (sidx) method->method_name->sel_id, - method->method_imp); - counter -= 1; - } - } - if (class->super_class) - check_class_methods(class->super_class); - - (void) &check_class_methods; /* to prevent compiler warning about unused */ -} - diff --git a/Source/libgnustep-base.def b/Source/libgnustep-base.def index a20107702..d5916b882 100644 --- a/Source/libgnustep-base.def +++ b/Source/libgnustep-base.def @@ -28,779 +28,5 @@ ; License along with this library; if not, write to the Free ; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. ; - -LIBRARY libgstep +LIBRARY libgnustep-base EXPORTS -__objc_class_name_Archiver -__objc_class_name_Unarchiver -__objc_class_name_Array -__objc_class_name_ConstantArray -__objc_class_name_Bag -__objc_class_name_BinaryCStream -__objc_class_name_BinaryTree -__objc_class_name_BinaryTreeNode -__objc_class_name_CircularArray -__objc_category_name_ConstantCollection_ArchivingHelpers -__objc_category_name_ConstantCollection_DeallocationHelpers -__objc_class_name_Collection -__objc_class_name_ConstantCollection -__objc_class_name_Enumerator -__objc_category_name_NSObject_ConnectedCoderCallbacks -__objc_class_name_ConnectedDecoder -__objc_class_name_ConnectedEncoder -__objc_category_name_Coder_NSArchiverCompatibility -__objc_category_name_Coder_NSCoderCompatibility -__objc_class_name_Coder -__objc_class_name_CStream -__objc_class_name_Decoder -__objc_class_name_DelegatePool -__objc_class_name_Dictionary -__objc_class_name_Encoder -__objc_class_name_GapArray -__objc_class_name_Heap -__objc_class_name_ConstantIndexedCollection -__objc_class_name_IndexedCollection -__objc_class_name_ReverseEnumerator -__objc_class_name_ArgframeInvocation -__objc_class_name_Invocation -__objc_class_name_MethodInvocation -__objc_class_name_ObjectFunctionInvocation -__objc_class_name_ObjectMethodInvocation -__objc_class_name_VoidFunctionInvocation -__objc_class_name_ConstantKeyedCollection -__objc_class_name_KeyEnumerator -__objc_class_name_KeyedCollection -__objc_class_name_LinkedList -__objc_class_name_LinkedListNode -__objc_class_name_Magnitude -__objc_class_name_MappedCollector -__objc_class_name_MemoryStream -inchar_func -outchar_func -unchar_func -__objc_category_name_NotificationDispatcher_OpenStepCompat -__objc_class_name_NotificationDispatcher -__objc_class_name_NotificationInvocation -__objc_class_name_NotificationPerformer -__objc_class_name_NotificationRequest -__objc_class_name_OrderedCollection -__objc_class_name_InPacket -__objc_class_name_InPort -__objc_class_name_OutPacket -__objc_class_name_OutPort -__objc_class_name_Port -__objc_category_name_NSObject_ForProxy -__objc_category_name_Protocol_RemoteSelfCoding -__objc_class_name_Queue -__objc_class_name_Random -__objc_class_name_RawCStream -__objc_class_name_RBTree -__objc_class_name_RBTreeNode -__objc_class_name_RNGAdditiveCongruential -__objc_class_name_RNGBerkeley -__objc_category_name_NSObject_PerformingAfterDelay -__objc_category_name_RunLoop_GNUstepExtensions -__objc_class_name_FdInfo -__objc_class_name_RunLoop -__objc_class_name_Set -__objc_class_name_SplayTree -__objc_class_name_Stack -__objc_class_name_StdioStream -__objc_class_name_Stream -__objc_class_name_TcpInPacket -__objc_class_name_TcpInPort -__objc_class_name_TcpOutPacket -__objc_class_name_TcpOutPort -__objc_class_name_TextCStream -__objc_class_name_Time -gettimeofday -times -__objc_class_name_UdpInPacket -__objc_class_name_UdpInPort -__objc_class_name_UdpOutPort -behavior_class_add_category -behavior_class_add_class -behavior_class_add_methods -behavior_set_debug -class_add_behavior -pl_create_buffer -pl_delete_buffer -pl_flush_buffer -pl_init_buffer -pl_load_buffer_state -pl_scan_buffer -pl_scan_bytes -pl_scan_string -pl_switch_to_buffer -pllex -plrestart -plwrap -str2data -strdup -unescstr -sf_create_buffer -sf_delete_buffer -sf_flush_buffer -sf_init_buffer -sf_load_buffer_state -sf_scan_buffer -sf_scan_bytes -sf_scan_string -sf_switch_to_buffer -sflex -sfrestart -sfwrap -ostream_at_eos -ostream_close -ostream_close_memory -ostream_flush -ostream_get_memory_buffer -ostream_getc -ostream_gets -ostream_map_file -ostream_open_descriptor -ostream_open_memory -ostream_printf -ostream_putc -ostream_read -ostream_save_to_file -ostream_scanf -ostream_seek -ostream_tell -ostream_ungetc -ostream_vprintf -ostream_vscanf -ostream_write -o_array_all_elements -o_array_all_elements_ascending -o_array_all_elements_descending -o_array_alloc -o_array_alloc_with_zone -o_array_ascending_enumerator -o_array_at_index_put_element -o_array_capacity -o_array_check -o_array_contains_element -o_array_count -o_array_dealloc -o_array_descending_enumerator -o_array_element_at_index -o_array_empty -o_array_enumerator -o_array_enumerator_next_element -o_array_enumerator_next_index -o_array_enumerator_next_index_and_element -o_array_index_of_element -o_array_init -o_array_init_from_array -o_array_init_with_callbacks -o_array_is_empty -o_array_is_equal_to_array -o_array_map_elements -o_array_of_char_p -o_array_of_id -o_array_of_int -o_array_of_non_owned_void_p -o_array_of_owned_void_p -o_array_remove_element -o_array_remove_element_at_index -o_array_remove_element_known_present -o_array_with_callbacks -o_array_with_zone -o_array_with_zone_with_callbacks -o_hash_init_from_array -_o_array_alloc_with_zone -_o_array_copy_with_zone -_o_array_dealloc -_o_array_description -_o_array_set_serial_number -o_array_extra -o_array_extra_callbacks -o_array_magic_number -o_array_name -o_array_serial_number -o_array_set_extra -o_array_set_extra_callbacks -o_array_set_name -o_array_unset_extra -o_array_unset_name -o_array_zone -o_array_element_callbacks -o_array_not_an_element_marker -o_callbacks_standard -o_callbacks_standardize -o_compare -o_describe -o_hash -o_is_equal -o_release -o_retain -o_char_p_compare -o_char_p_describe -o_char_p_hash -o_char_p_is_equal -o_char_p_release -o_char_p_retain -o_id_compare -o_id_describe -o_id_hash -o_id_is_equal -o_id_release -o_id_retain -o_int_compare -o_int_describe -o_int_hash -o_int_is_equal -o_int_release -o_int_retain -o_int_p_compare -o_int_p_describe -o_int_p_hash -o_int_p_is_equal -o_int_p_release -o_int_p_retain -o_non_owned_void_p_compare -o_non_owned_void_p_describe -o_non_owned_void_p_hash -o_non_owned_void_p_is_equal -o_non_owned_void_p_release -o_non_owned_void_p_retain -o_owned_void_p_compare -o_owned_void_p_describe -o_owned_void_p_hash -o_owned_void_p_is_equal -o_owned_void_p_release -o_owned_void_p_retain -_o_hash_hash -_o_hash_retain -o_callbacks_for_hash -o_hash_add_element -o_hash_add_element_if_absent -o_hash_add_element_known_absent -o_hash_all_elements -o_hash_alloc -o_hash_alloc_with_zone -o_hash_capacity -o_hash_check -o_hash_contains_element -o_hash_contains_hash -o_hash_copy -o_hash_copy_with_zone -o_hash_count -o_hash_dealloc -o_hash_description -o_hash_element -o_hash_empty -o_hash_enumerator_for_hash -o_hash_enumerator_next_element -o_hash_init -o_hash_init_from_hash -o_hash_init_with_callbacks -o_hash_intersect_hash -o_hash_intersects_hash -o_hash_is_empty -o_hash_is_equal_to_hash -o_hash_map_elements -o_hash_minus_hash -o_hash_of_char_p -o_hash_of_id -o_hash_of_int -o_hash_of_int_p -o_hash_of_non_owned_void_p -o_hash_of_owned_void_p -o_hash_remove_element -o_hash_replace_element -o_hash_resize -o_hash_rightsize -o_hash_union_hash -o_hash_with_callbacks -o_hash_with_zone -o_hash_with_zone_with_callbacks -_o_hash_alloc_with_zone -_o_hash_copy_with_zone -_o_hash_dealloc -_o_hash_description -_o_hash_set_serial_number -o_hash_extra -o_hash_extra_callbacks -o_hash_magic_number -o_hash_name -o_hash_serial_number -o_hash_set_extra -o_hash_set_extra_callbacks -o_hash_set_name -o_hash_unset_extra -o_hash_unset_name -o_hash_zone -o_hash_element_callbacks -o_hash_not_an_element_marker -_o_list_free_node -o_hash_init_from_list -o_list -o_list_all_elements -o_list_alloc -o_list_alloc_with_zone -o_list_append_element -o_list_append_element_if_absent -o_list_append_list -o_list_at_index_insert_element -o_list_at_index_insert_element_if_absent -o_list_at_index_insert_list -o_list_capacity -o_list_check -o_list_contains_element -o_list_copy -o_list_copy_with_zone -o_list_count -o_list_dealloc -o_list_element -o_list_empty -o_list_enumerator -o_list_enumerator_next_element -o_list_first_element -o_list_forward_enumerator -o_list_init -o_list_init_from_list -o_list_init_with_callbacks -o_list_is_empty -o_list_is_equal_to_list -o_list_last_element -o_list_map_elements -o_list_nth_element -o_list_of_char_p -o_list_of_id -o_list_of_int -o_list_of_non_owned_void_p -o_list_of_owned_void_p -o_list_prepend_element -o_list_prepend_element_if_absent -o_list_prepend_list -o_list_remove_element -o_list_remove_first_element -o_list_remove_last_element -o_list_remove_nth_element -o_list_remove_nth_occurrance_of_element -o_list_replace_element -o_list_replace_first_element -o_list_replace_last_element -o_list_replace_nth_element -o_list_replace_nth_occurrance_of_element -o_list_reverse_enumerator -o_list_with_callbacks -o_list_with_zone -o_list_with_zone_with_callbacks -_o_list_alloc_with_zone -_o_list_copy_with_zone -_o_list_dealloc -_o_list_description -_o_list_set_serial_number -o_list_extra -o_list_extra_callbacks -o_list_magic_number -o_list_name -o_list_serial_number -o_list_set_extra -o_list_set_extra_callbacks -o_list_set_name -o_list_unset_extra -o_list_unset_name -o_list_zone -o_list_element_callbacks -o_list_not_an_element_marker -_o_map_enumerator_next_node -_o_map_hash -_o_map_retain -o_callbacks_for_map -o_map_all_keys -o_map_all_keys_and_values -o_map_all_values -o_map_alloc -o_map_alloc_with_zone -o_map_at_key_put_value -o_map_at_key_put_value_if_absent -o_map_at_key_put_value_known_absent -o_map_capacity -o_map_check -o_map_contains_key -o_map_contains_map -o_map_contains_value -o_map_copy -o_map_copy_with_zone -o_map_count -o_map_dealloc -o_map_description -o_map_empty -o_map_enumerator_for_map -o_map_enumerator_next_key -o_map_enumerator_next_key_and_value -o_map_enumerator_next_value -o_map_init -o_map_init_from_map -o_map_init_with_callbacks -o_map_intersect_map -o_map_intersects_map -o_map_is_empty -o_map_is_equal_to_map -o_map_key_and_value_at_key -o_map_key_at_key -o_map_keys_contain_keys_of_map -o_map_keys_intersect_keys_of_map -o_map_map_keys -o_map_map_values -o_map_minus_map -o_map_node_for_key -o_map_of_char_p -o_map_of_char_p_to_id -o_map_of_char_p_to_int -o_map_of_char_p_to_non_owned_void_p -o_map_of_id -o_map_of_id_to_char_p -o_map_of_id_to_int -o_map_of_id_to_non_owned_void_p -o_map_of_int -o_map_of_int_to_char_p -o_map_of_int_to_id -o_map_of_int_to_non_owned_void_p -o_map_of_non_owned_void_p -o_map_remove_key -o_map_remove_node -o_map_replace_key -o_map_resize -o_map_rightsize -o_map_union_map -o_map_value_at_key -o_map_with_callbacks -o_map_with_zone -o_map_with_zone_with_callbacks -_o_map_alloc_with_zone -_o_map_copy_with_zone -_o_map_dealloc -_o_map_description -_o_map_set_serial_number -o_map_extra -o_map_extra_callbacks -o_map_magic_number -o_map_name -o_map_serial_number -o_map_set_extra -o_map_set_extra_callbacks -o_map_set_name -o_map_unset_extra -o_map_unset_name -o_map_zone -o_map_key_callbacks -o_map_not_a_key_marker -o_map_not_a_value_marker -o_map_value_callbacks -gnustep_base_version -o_gcc_version -plerror -plparse -sfSetDict -sferror -sfparse -method_types_get_next_argument -method_types_get_number_of_arguments -method_types_get_size_of_register_arguments -method_types_get_size_of_stack_arguments -mframe_build_return -mframe_dissect_call -mframe_do_call -md5_buffer -md5_init_ctx -md5_process_block -md5_read_ctx -md5_stream -_o_next_power_of_two -_o_number_allocated -_o_number_deallocated -_o_number_serialized -o_vscanf -__objc_class_name_HashTable -__objc_class_name_List -CopyStringBuffer -__objc_class_name_NXStringTable -__objc_class_name_Storage -NXlex__create_buffer -NXlex__delete_buffer -NXlex__flush_buffer -NXlex__init_buffer -NXlex__load_buffer_state -NXlex__scan_buffer -NXlex__scan_bytes -NXlex__scan_string -NXlex__switch_to_buffer -NXlex_lex -NXlex_restart -NXlex_wrap -NSAllocateObject -__objc_category_name_NSObject_NSArchiver -__objc_class_name_NSArchiver -__objc_class_name_NSUnarchiver -__objc_class_name_NSArray -__objc_class_name_NSArrayEnumerator -__objc_class_name_NSArrayEnumeratorReverse -__objc_class_name_NSArrayNonCore -__objc_class_name_NSMutableArray -__objc_class_name_NSMutableArrayNonCore -__objc_class_name_NSAssertionHandler -__objc_class_name_NSAutoreleasePool -__objc_class_name_NSBitmapCharSet -__objc_class_name_NSMutableBitmapCharSet -__objc_category_name_NSBundle_Private -__objc_class_name_NSBundle -_bundle_load_callback -objc_executable_location -__objc_category_name_NSCalendarDate_GregorianDate -__objc_class_name_NSCalendarDate -_NS_id_describe -_NS_id_hash -_NS_id_is_equal -_NS_id_release -_NS_id_retain -_NS_int_describe -_NS_int_hash -_NS_int_is_equal -_NS_int_p_describe -_NS_int_p_hash -_NS_int_p_is_equal -_NS_int_p_release -_NS_int_p_retain -_NS_int_release -_NS_int_retain -_NS_non_owned_void_p_describe -_NS_non_owned_void_p_hash -_NS_non_owned_void_p_is_equal -_NS_non_owned_void_p_release -_NS_non_owned_void_p_retain -_NS_non_retained_id_describe -_NS_non_retained_id_hash -_NS_non_retained_id_is_equal -_NS_non_retained_id_release -_NS_non_retained_id_retain -_NS_owned_void_p_describe -_NS_owned_void_p_hash -_NS_owned_void_p_is_equal -_NS_owned_void_p_release -_NS_owned_void_p_retain -__objc_class_name_NSCharacterSet -__objc_class_name_NSMutableCharacterSet -__objc_class_name_NSCoder -__objc_class_name_NSCoderNonCore -NSCopyObject -__objc_class_name_NSConcreteValue -__objc_class_name_NSCountedSet -__objc_class_name_NSData -__objc_class_name_NSMutableData -__objc_class_name_NSDate -NSDeallocateObject -__objc_class_name_NSDictionary -__objc_class_name_NSMutableDictionary -__objc_class_name_NSEnumerator -_NSAddHandler -_NSRemoveHandler -__objc_class_name_NSException -__objc_category_name_NSDictionary_NSFileAttributes -__objc_class_name_NSDirectoryEnumerator -__objc_class_name_NSFileManager -NSContainsRect -NSDivideRect -NSEqualPoints -NSEqualRects -NSEqualSizes -NSHeight -NSInsetRect -NSIntegralRect -NSIntersectionRect -NSIntersectsRect -NSIsEmptyRect -NSMakePoint -NSMakeRect -NSMakeSize -NSMaxX -NSMaxY -NSMidX -NSMidY -NSMinX -NSMinY -NSMouseInRect -NSOffsetRect -NSPointInRect -NSStringFromPoint -NSStringFromRect -NSStringFromSize -NSUnionRect -NSWidth -__objc_class_name_NSGArchiver -__objc_class_name_NSGArchiverNullCStream -__objc_class_name_NSGUnarchiver -__objc_class_name_NSGArray -__objc_class_name_NSGMutableArray -__objc_class_name_NSGCountedSet -__objc_class_name_NSGCountedSetEnumerator -__objc_class_name_NSGCString -__objc_class_name_NSGMutableCString -__objc_class_name_NSGData -__objc_class_name_NSGMutableData -__objc_class_name_NSGDictionary -__objc_class_name_NSGDictionaryKeyEnumerator -__objc_class_name_NSGDictionaryObjectEnumerator -__objc_class_name_NSGMutableDictionary -__objc_class_name_NSGMutableSet -__objc_class_name_NSGSet -__objc_class_name_NSGSetEnumerator -NSAllHashTableObjects -NSCompareHashTables -NSCopyHashTableWithZone -NSCountHashTable -NSCreateHashTable -NSCreateHashTableWithZone -NSEnumerateHashTable -NSFreeHashTable -NSHashGet -NSHashInsert -NSHashInsertIfAbsent -NSHashInsertKnownAbsent -NSHashRemove -NSNextHashEnumeratorItem -NSResetHashTable -NSStringFromHashTable -_NSHT_compare -_NSHT_describe -_NSHT_extra_describe -_NSHT_extra_release -_NSHT_extra_retain -_NSHT_hash -_NSHT_is_equal -_NSHT_release -_NSHT_retain -__objc_class_name_NSInvocation -__objc_class_name_NSConditionLock -__objc_class_name_NSLock -__objc_class_name_NSRecursiveLock -NSLog -NSLogv -NSAllMapTableKeys -NSAllMapTableValues -NSCompareMapTables -NSCopyMapTableWithZone -NSCountMapTable -NSCreateMapTable -NSCreateMapTableWithZone -NSEnumerateMapTable -NSFreeMapTable -NSMapGet -NSMapInsert -NSMapInsertIfAbsent -NSMapInsertKnownAbsent -NSMapMember -NSMapRemove -NSNextMapEnumeratorPair -NSResetMapTable -NSStringFromMapTable -_NSMT_extra_describe -_NSMT_extra_release -_NSMT_extra_retain -_NSMT_key_compare -_NSMT_key_describe -_NSMT_key_hash -_NSMT_key_is_equal -_NSMT_key_release -_NSMT_key_retain -_NSMT_value_describe -_NSMT_value_release -_NSMT_value_retain -__objc_class_name_NSMethodSignature -__objc_class_name_NSNotification -__objc_class_name_NSNotificationCenter -__objc_class_name_NSNumber -NSClassFromString -NSSelectorFromString -NSStringFromClass -NSStringFromSelector -NSDecrementExtraRefCountWasZero -NSIncrementExtraRefCount -NSShouldRetainWithZone -__objc_category_name_NSObject_GNU -__objc_category_name_NSObject_NEXTSTEP -__objc_class_name_NSObject -NSAllocateMemoryPages -NSCopyMemoryPages -NSDeallocateMemoryPages -NSLogPageSize -NSPageSize -NSRealMemoryAvailable -NSRoundDownToMultipleOfPageSize -NSRoundUpToMultipleOfPageSize -__objc_class_name_NSProcessInfo -__objc_class_name__NSConcreteProcessInfo -NSEqualRanges -NSIntersectionRange -NSMakeRange -NSStringFromRange -NSUnionRange -__objc_class_name_NSRunLoop -__objc_class_name_NSScanner -__objc_class_name_NSMutableSet -__objc_class_name_NSSet -__objc_class_name_NSMutableString -__objc_class_name_NSString -__objc_class_name_NXConstantString -__objc_class_name_NSThread -__objc_class_name_NSTimer -__objc_category_name_NSConcreteTimeZoneDetail_NSCoding -__objc_category_name_NSConcreteTimeZoneDetail_NSCopying -__objc_category_name_NSTimeZone_Archiving -__objc_category_name_NSTimeZone_NSCopying -__objc_class_name_NSConcreteTimeZoneDetail -__objc_class_name_NSTimeZone -__objc_class_name_NSTimeZoneDetail -NSHomeDirectory -NSHomeDirectoryForUser -NSUserName -__objc_class_name_NSUserDefaults -__objc_class_name_NSValue -__objc_class_name_NSValueDecoder -NSCreateChildZone -NSCreateZone -NSDefaultMallocZone -NSDestroyZone -NSMallocCheck -NSMergeZone -NSNameZone -NSSetZoneName -NSZoneCalloc -NSZoneFree -NSZoneFromPointer -NSZoneMalloc -NSZoneName -NSZonePtrInfo -NSZoneRealloc -addtolist -delfromlist -searchheap -lstat -objc_find_executable -readlink -objc_load_module -objc_load_modules -objc_unload_module -objc_unload_modules -__objc_class_name_NSNonretainedObjectValue -__objc_class_name_NSPointValue -__objc_class_name_NSPointerValue -__objc_class_name_NSRectValue -__objc_class_name_NSSizeValue -__objc_class_name_NSBoolNumber -__objc_class_name_NSUCharNumber -__objc_class_name_NSCharNumber -__objc_class_name_NSUShortNumber -__objc_class_name_NSShortNumber -__objc_class_name_NSUIntNumber -__objc_class_name_NSIntNumber -__objc_class_name_NSULongNumber -__objc_class_name_NSLongNumber -__objc_class_name_NSULongLongNumber -__objc_class_name_NSLongLongNumber -__objc_class_name_NSFloatNumber -__objc_class_name_NSDoubleNumber diff --git a/Source/objc-load.m b/Source/objc-load.m index 69d873b4c..dec434f3b 100644 --- a/Source/objc-load.m +++ b/Source/objc-load.m @@ -85,8 +85,13 @@ objc_invalidate_dtable(Class class) { Class s; +#ifdef HAVE_OBJC_GET_UNINSTALLED_DTABLE if (class->dtable == objc_get_uninstalled_dtable()) return; +#else + if (class->dtable == NULL) + return; +#endif sarray_free(class->dtable); __objc_install_premature_dtable(class); for (s=class->subclass_list; s; s=s->sibling_class) diff --git a/acconfig.h b/acconfig.h index 6465e83fe..d549bebc2 100644 --- a/acconfig.h +++ b/acconfig.h @@ -127,6 +127,9 @@ /* Define if your Obj-C compiler calls +load methods before main */ #undef HAVE_LOAD_METHOD +/* Define if objc-api.h defines this function */ +#undef HAVE_OBJC_GET_UNINSTALLED_DTABLE + /* Define if your Lib C defines program_invocation_name */ #undef HAVE_PROGRAM_INVOCATION_NAME diff --git a/configure b/configure index bb780154a..3a5741e5f 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.13.1 +# Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -335,7 +335,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.13.1" + echo "configure generated by autoconf version 2.13" exit 0 ;; -with-* | --with-*) @@ -495,7 +495,7 @@ done if test -r "$cache_file"; then echo "loading cache $cache_file" - test -f "$cache_file" && . $cache_file + . $cache_file else echo "creating cache $cache_file" > $cache_file @@ -571,130 +571,9 @@ 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="$SHELL $ac_aux_dir/config.guess" -ac_config_sub="$SHELL $ac_aux_dir/config.sub" -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. - - -echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:581: checking host system type" >&5 -if test "x$ac_cv_host" = "x" || (test "x$host" != "xNONE" && test "x$host" != "x$ac_cv_host_alias"); then - -# 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 - - ac_cv_host_alias=$host - case "$ac_cv_host_alias" in - NONE) - case $nonopt in - NONE) - if ac_cv_host_alias=`$ac_config_guess`; then : - else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } - fi ;; - *) ac_cv_host_alias=$nonopt ;; - esac ;; - esac - - ac_cv_host=`$ac_config_sub $ac_cv_host_alias` - ac_cv_host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` - ac_cv_host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` - ac_cv_host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -else - echo $ac_n "(cached) $ac_c" 1>&6 -fi - -echo "$ac_t""$ac_cv_host" 1>&6 - -host=$ac_cv_host -host_alias=$ac_cv_host_alias -host_cpu=$ac_cv_host_cpu -host_vendor=$ac_cv_host_vendor -host_os=$ac_cv_host_os - - - - - -echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:622: checking target system type" >&5 -if test "x$ac_cv_target" = "x" || (test "x$target" != "xNONE" && test "x$target" != "x$ac_cv_target_alias"); then - -# 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 - - ac_cv_target_alias=$target - case "$ac_cv_target_alias" in - NONE) - case $nonopt in - NONE) - ac_cv_target_alias=$host_alias ;; - - *) ac_cv_target_alias=$nonopt ;; - esac ;; - esac - - ac_cv_target=`$ac_config_sub $ac_cv_target_alias` - ac_cv_target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` - ac_cv_target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` - ac_cv_target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -else - echo $ac_n "(cached) $ac_c" 1>&6 -fi - -echo "$ac_t""$ac_cv_target" 1>&6 - -target=$ac_cv_target -target_alias=$ac_cv_target_alias -target_cpu=$ac_cv_target_cpu -target_vendor=$ac_cv_target_vendor -target_os=$ac_cv_target_os - - - - - -echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:662: checking build system type" >&5 -if test "x$ac_cv_build" = "x" || (test "x$build" != "xNONE" && test "x$build" != "x$ac_cv_build_alias"); then - -# 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 - - ac_cv_build_alias=$build - case "$ac_cv_build_alias" in - NONE) - case $nonopt in - NONE) - ac_cv_build_alias=$host_alias ;; - - *) ac_cv_build_alias=$nonopt ;; - esac ;; - esac - - ac_cv_build=`$ac_config_sub $ac_cv_build_alias` - ac_cv_build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` - ac_cv_build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` - ac_cv_build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -else - echo $ac_n "(cached) $ac_c" 1>&6 -fi - -echo "$ac_t""$ac_cv_build" 1>&6 - -build=$ac_cv_build -build_alias=$ac_cv_build_alias -build_cpu=$ac_cv_build_cpu -build_vendor=$ac_cv_build_vendor -build_os=$ac_cv_build_os - - - +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. @@ -717,6 +596,69 @@ 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 ${CONFIG_SHELL-/bin/sh} $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:607: checking host system type" >&5 + +host_alias=$host +case "$host_alias" in +NONE) + case $nonopt in + NONE) + if host_alias=`${CONFIG_SHELL-/bin/sh} $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=`${CONFIG_SHELL-/bin/sh} $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:628: 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=`${CONFIG_SHELL-/bin/sh} $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:646: 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=`${CONFIG_SHELL-/bin/sh} $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, && @@ -729,8 +671,8 @@ test "$host_alias" != "$target_alias" && # 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:733: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then +echo "configure:675: 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 if test -n "$CC"; then @@ -759,8 +701,8 @@ 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:763: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then +echo "configure:705: 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 if test -n "$CC"; then @@ -806,12 +748,12 @@ fi if test -z "$CC"; then case "`uname -s`" in - *win32* | *WIN32* | *CYGWIN*) + *win32* | *WIN32*) # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:814: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then +echo "configure:756: 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 if test -n "$CC"; then @@ -841,8 +783,8 @@ fi test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:846: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works" >&5 +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +echo "configure:788: 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. @@ -853,12 +795,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 857 "configure" +#line 799 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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 @@ -883,14 +825,14 @@ echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 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 $CPPFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:888: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +echo "configure:830: 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:893: checking whether we are using GNU C" >&5 -if eval "test \"\${ac_cv_prog_gcc+set}\" = set"; then +echo "configure:835: 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 cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:844: \"$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 @@ -917,8 +859,8 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:921: checking whether ${CC-cc} accepts -g" >&5 -if eval "test \"\${ac_cv_prog_cc_g+set}\" = set"; then +echo "configure:863: 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 echo 'void f(){}' > conftest.c @@ -949,13 +891,13 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:953: checking how to run the C preprocessor" >&5 +echo "configure:895: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then -if eval "test \"\${ac_cv_prog_CPP+set}\" = set"; then +if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else # This must be in double quotes, not single quotes, because CPP may get @@ -964,13 +906,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:974: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:916: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -981,13 +923,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:991: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:933: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -998,13 +940,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1008: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:950: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1043,14 +985,14 @@ PIPE='-pipe' # include implementations of List, HashTable etc. #-------------------------------------------------------------------- echo $ac_n "checking whether we are using NeXT's compiler""... $ac_c" 1>&6 -echo "configure:1047: checking whether we are using NeXT's compiler" >&5 +echo "configure:989: checking whether we are using NeXT's compiler" >&5 cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:996: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1070,16 +1012,16 @@ if test $NeXTCC = 0; then # Find out if nested functions work on this machine #---------------------------------------------------------------- echo $ac_n "checking whether nested functions work""... $ac_c" 1>&6 -echo "configure:1074: checking whether nested functions work" >&5 +echo "configure:1016: checking whether nested functions work" >&5 if test "$cross_compiling" = yes; then gcc_nested=1 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then gcc_nested=1 else @@ -1111,16 +1053,16 @@ fi # Find out if we're on a NEXTSTEP machine #---------------------------------------------------------------- echo $ac_n "checking whether we are running under NEXTSTEP""... $ac_c" 1>&6 -echo "configure:1115: checking whether we are running under NEXTSTEP" >&5 +echo "configure:1057: checking whether we are running under NEXTSTEP" >&5 cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1066: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1148,16 +1090,16 @@ rm -f conftest* saved_ac_ext=$ac_ext ac_ext=m echo $ac_n "checking whether we are using GNU Objective C runtime""... $ac_c" 1>&6 -echo "configure:1152: checking whether we are using GNU Objective C runtime" >&5 +echo "configure:1094: checking whether we are using GNU Objective C runtime" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* NeXT_runtime=1 else @@ -1203,16 +1145,16 @@ else # Find out if we have NEXTSTEP 3.2 or lower #---------------------------------------------------------------- echo "checking NEXTSTEP version" 1>&6 -echo "configure:1207: checking NEXTSTEP version" >&5 +echo "configure:1149: checking NEXTSTEP version" >&5 cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1158: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1256,24 +1198,63 @@ EOF +#-------------------------------------------------------------------- +# Check for alternate Objective-C libraries +#-------------------------------------------------------------------- +if test x$GNUSTEP_SYSTEM_ROOT != "x"; then + gnustep_obj_dir=${target_cpu}/${target_os}/${ac_cv_library_combo} + # May have a private version of libobj installed here + if test -f $GNUSTEP_SYSTEM_ROOT/Headers/objc/objc.h; then + CPPFLAGS="$CPPFLAGS -I$GNUSTEP_SYSTEM_ROOT/Headers" + LDFLAGS="$LDFLAGS -L$GNUSTEP_SYSTEM_ROOT/Libraries/$gnustep_obj_dir" + echo "Using Objective-C library from $GNUSTEP_SYSTEM_ROOT, if available" + fi +fi + #-------------------------------------------------------------------- # Check if Objective-C is installed #-------------------------------------------------------------------- +echo $ac_n "checking for alternate objc library""... $ac_c" 1>&6 +echo "configure:1219: checking for alternate objc library" >&5 +if eval "test \"`echo '$''{'gs_cv_objc_libdir'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + gs_cv_objc_libdir=NONE +if test -f $GNUSTEP_SYSTEM_ROOT/Headers/objc/objc.h; then + clean_target_os=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_os.sh $target_os` + clean_target_cpu=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_cpu.sh $target_cpu` + obj_dir=$clean_target_cpu/$clean_target_os/$ac_cv_library_combo + if test -f $GNUSTEP_SYSTEM_ROOT/Libraries/$obj_dir/libobjc.a; then + gs_cv_objc_libdir=$GNUSTEP_SYSTEM_ROOT/Libraries/$obj_dir + else + gs_cv_objc_libdir=NONE + fi +fi + +fi + +echo "$ac_t""$gs_cv_objc_libdir" 1>&6 + +if test "$gs_cv_objc_libdir" != "NONE"; then + CPPFLAGS="$CPPFLAGS -I$GNUSTEP_SYSTEM_ROOT/Headers/" + LDFLAGS="$LDFLAGS -L$gs_cv_objc_libdir" +fi + for ac_hdr in objc/objc.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1267: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:1248: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1277: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1258: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1310,7 +1291,7 @@ fi # Check if libobjc was compiled with thread support. #-------------------------------------------------------------------- echo $ac_n "checking whether objc has thread support""... $ac_c" 1>&6 -echo "configure:1314: checking whether objc has thread support" >&5 +echo "configure:1295: checking whether objc has thread support" >&5 saved_LIBS="$LIBS" extra_LIBS="" case "${target_os}" in @@ -1325,11 +1306,11 @@ if test $host_os = linux-gnu; then objc_threaded="-lpthread" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then objc_threaded="-lpthread" else @@ -1347,11 +1328,11 @@ fi objc_threaded="-lpcthread" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then objc_threaded="-lpcthread" else @@ -1370,11 +1351,11 @@ elif test "`echo $host_os|sed 's/[0-9].*//'|sed s/elf//`" = freebsd; then objc_threaded="-pthread" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then objc_threaded="-pthread" else @@ -1392,11 +1373,11 @@ fi objc_threaded="-lpthread" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then objc_threaded="-lpthread" else @@ -1415,11 +1396,11 @@ fi objc_threaded="-lpcthread" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then objc_threaded="-lpcthread" else @@ -1438,11 +1419,11 @@ else objc_threaded="-lthread" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then objc_threaded="-lthread" else @@ -1469,14 +1450,14 @@ ac_cv_objc_threaded=$objc_threaded # Byte order information needed for foundation headers. #-------------------------------------------------------------------- echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:1473: checking whether byte ordering is bigendian" >&5 -if eval "test \"\${ac_cv_c_bigendian+set}\" = set"; then +echo "configure:1454: checking whether byte ordering is bigendian" >&5 +if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -1487,11 +1468,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:1491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1472: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -1502,7 +1483,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:1506: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1487: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -1522,7 +1503,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -1569,15 +1550,15 @@ fi # Type size information needed for foundation headers. #-------------------------------------------------------------------- echo $ac_n "checking size of void*""... $ac_c" 1>&6 -echo "configure:1573: checking size of void*" >&5 -if eval "test \"\${ac_cv_sizeof_voidp+set}\" = set"; then +echo "configure:1554: checking size of void*" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_voidp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -1588,7 +1569,7 @@ main() exit(0); } EOF -if { (eval echo configure:1592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_voidp=`cat conftestval` else @@ -1614,15 +1595,15 @@ GS_UINT8="unsigned char" echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:1618: checking size of short" >&5 -if eval "test \"\${ac_cv_sizeof_short+set}\" = set"; then +echo "configure:1599: checking size of short" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -1633,7 +1614,7 @@ main() exit(0); } EOF -if { (eval echo configure:1637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_short=`cat conftestval` else @@ -1655,15 +1636,15 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:1659: checking size of int" >&5 -if eval "test \"\${ac_cv_sizeof_int+set}\" = set"; then +echo "configure:1640: checking size of int" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -1674,7 +1655,7 @@ main() exit(0); } EOF -if { (eval echo configure:1678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -1696,15 +1677,15 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:1700: checking size of long" >&5 -if eval "test \"\${ac_cv_sizeof_long+set}\" = set"; then +echo "configure:1681: checking size of long" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -1715,7 +1696,7 @@ main() exit(0); } EOF -if { (eval echo configure:1719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -1737,15 +1718,15 @@ EOF echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:1741: checking size of long long" >&5 -if eval "test \"\${ac_cv_sizeof_long_long+set}\" = set"; then +echo "configure:1722: checking size of long long" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -1756,7 +1737,7 @@ main() exit(0); } EOF -if { (eval echo configure:1760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long=`cat conftestval` else @@ -1778,15 +1759,15 @@ EOF echo $ac_n "checking size of float""... $ac_c" 1>&6 -echo "configure:1782: checking size of float" >&5 -if eval "test \"\${ac_cv_sizeof_float+set}\" = set"; then +echo "configure:1763: checking size of float" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_float'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -1797,7 +1778,7 @@ main() exit(0); } EOF -if { (eval echo configure:1801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_float=`cat conftestval` else @@ -1819,15 +1800,15 @@ EOF echo $ac_n "checking size of double""... $ac_c" 1>&6 -echo "configure:1823: checking size of double" >&5 -if eval "test \"\${ac_cv_sizeof_double+set}\" = set"; then +echo "configure:1804: checking size of double" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -1838,7 +1819,7 @@ main() exit(0); } EOF -if { (eval echo configure:1842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_double=`cat conftestval` else @@ -2041,8 +2022,8 @@ fi # Defines CON_AUTOLOAD (whether constructor functions are autoloaded) #-------------------------------------------------------------------- echo $ac_n "checking loading of constructor functions""... $ac_c" 1>&6 -echo "configure:2045: checking loading of constructor functions" >&5 -if eval "test \"\${objc_cv_con_autoload+set}\" = set"; then +echo "configure:2026: checking loading of constructor functions" >&5 +if eval "test \"`echo '$''{'objc_cv_con_autoload'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.constructor.c <&6 -echo "configure:2086: checking for dlfcn.h" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:2067: checking for dlfcn.h" >&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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2096: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2077: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2116,17 +2097,17 @@ fi if test $DYNAMIC_LINKER = null; then ac_safe=`echo "dl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dl.h""... $ac_c" 1>&6 -echo "configure:2120: checking for dl.h" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:2101: checking for dl.h" >&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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2130: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2111: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2151,17 +2132,17 @@ fi if test $DYNAMIC_LINKER = null; then ac_safe=`echo "windows.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for windows.h""... $ac_c" 1>&6 -echo "configure:2155: checking for windows.h" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:2136: checking for windows.h" >&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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2146: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2186,17 +2167,17 @@ fi if test $DYNAMIC_LINKER = null; then ac_safe=`echo "dld/defs.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dld/defs.h""... $ac_c" 1>&6 -echo "configure:2190: checking for dld/defs.h" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:2171: checking for dld/defs.h" >&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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2200: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2181: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2236,19 +2217,19 @@ if test x"$ac_cv_objc_threaded" != x""; then fi LIBS="$LIBS $extra_LIBS" echo $ac_n "checking if +load method is executed before main""... $ac_c" 1>&6 -echo "configure:2240: checking if +load method is executed before main" >&5 -if eval "test \"\${objc_load_method_worked+set}\" = set"; then +echo "configure:2221: checking if +load method is executed before main" >&5 +if eval "test \"`echo '$''{'objc_load_method_worked'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then objc_load_method_worked=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then objc_load_method_worked=yes else @@ -2278,16 +2259,17 @@ CPPFLAGS="$saved_CPPFLAGS" #-------------------------------------------------------------------- # This function needed by NSLock.m for conditioned wait +# get_uninstalled_dtable used by behavior.m and objc-load.m #-------------------------------------------------------------------- for ac_func in objc_condition_timedwait do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2286: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:2268: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2336,18 +2317,34 @@ fi done +cat > conftest.$ac_ext < +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "objc_get_uninstalled_dtable" >/dev/null 2>&1; then + rm -rf conftest* + cat >> confdefs.h <<\EOF +#define HAVE_OBJC_GET_UNINSTALLED_DTABLE 1 +EOF + +fi +rm -f conftest* + + LIBS="$saved_LIBS" #-------------------------------------------------------------------- # Generic settings needed by NSZone.m #-------------------------------------------------------------------- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2346: checking for ANSI C header files" >&5 -if eval "test \"\${ac_cv_header_stdc+set}\" = set"; then +echo "configure:2343: 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 < #include @@ -2355,7 +2352,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2359: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2356: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2372,7 +2369,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 @@ -2390,7 +2387,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 @@ -2411,7 +2408,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2422,7 +2419,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:2426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2446,12 +2443,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2450: checking for size_t" >&5 -if eval "test \"\${ac_cv_type_size_t+set}\" = set"; then +echo "configure:2447: checking for size_t" >&5 +if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2462,40 +2459,38 @@ EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* - eval "ac_cv_type_size_t=yes" + ac_cv_type_size_t=yes else rm -rf conftest* - eval "ac_cv_type_size_t=no" + ac_cv_type_size_t=no fi rm -f conftest* fi -if eval "test \"`echo '$ac_cv_type_'size_t`\" = yes"; then - echo "$ac_t""yes" 1>&6 -else - echo "$ac_t""no" 1>&6 - cat >> confdefs.h <&6 +if test $ac_cv_type_size_t = no; then + cat >> confdefs.h <<\EOF #define size_t unsigned EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:2485: checking for inline" >&5 -if eval "test \"\${ac_cv_c_inline+set}\" = set"; then +echo "configure:2480: checking for inline" >&5 +if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2494: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -2525,12 +2520,12 @@ esac # Following header checks needed for bzero in Storage.m and other places #-------------------------------------------------------------------- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2529: checking for ANSI C header files" >&5 -if eval "test \"\${ac_cv_header_stdc+set}\" = set"; then +echo "configure:2524: 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 < #include @@ -2538,7 +2533,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2542: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2537: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2555,7 +2550,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 @@ -2573,7 +2568,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 @@ -2594,7 +2589,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2605,7 +2600,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:2609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2632,17 +2627,17 @@ for ac_hdr in string.h memory.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2636: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:2631: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2646: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2641: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2676,17 +2671,17 @@ for ac_hdr in values.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2680: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:2675: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2690: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2685: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2720,17 +2715,17 @@ for ac_hdr in sys/stat.h sys/vfs.h sys/statfs.h sys/statvfs.h pwd.h grp.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2724: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:2719: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2734: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2729: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2760,17 +2755,17 @@ for ac_hdr in sys/mount.h sys/types.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2764: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:2759: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2774: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2769: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2799,12 +2794,12 @@ done for ac_func in statvfs do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2803: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:2798: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2861,17 +2855,17 @@ for ac_hdr in sys/time.h sys/rusage.h ucbinclude/sys/resource.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2865: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:2859: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2875: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2869: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2905,17 +2899,17 @@ for ac_hdr in sys/socket.h netinet/in.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2909: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:2903: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2919: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2913: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2949,17 +2943,17 @@ for ac_hdr in syslog.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2953: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:2947: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2963: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2957: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2988,12 +2982,12 @@ done for ac_func in syslog do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2992: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:2986: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3048,12 +3041,12 @@ done for ac_func in vsprintf vasprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3052: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:3045: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3106,11 +3098,11 @@ if test $ac_cv_func_vsprintf = yes ; then VSPRINTF_RETURNS_LENGTH=1 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then VSPRINTF_RETURNS_LENGTH=1 else @@ -3132,11 +3124,11 @@ if test $ac_cv_func_vasprintf = yes ; then VASPRINTF_RETURNS_LENGTH=1 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then VASPRINTF_RETURNS_LENGTH=1 else @@ -3160,12 +3152,12 @@ fi for ac_func in getcwd do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3164: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:3156: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3218,12 +3209,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:3222: checking for $ac_hdr that defines DIR" >&5 -if eval "test \"\${ac_cv_header_dirent_$ac_safe+set}\" = set"; then +echo "configure:3213: checking for $ac_hdr that defines DIR" >&5 +if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -3231,7 +3222,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:3235: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3226: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -3256,15 +3247,15 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:3260: checking for opendir in -ldir" >&5 -ac_lib_var=`echo dir'_'opendir | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:3251: checking for opendir in -ldir" >&5 +ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3297,15 +3288,15 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:3301: checking for opendir in -lx" >&5 -ac_lib_var=`echo x'_'opendir | sed 'y%./+-:%__p__%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +echo "configure:3292: checking for opendir in -lx" >&5 +ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3346,17 +3337,17 @@ for ac_hdr in getopt.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3350: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:3341: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3360: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3351: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3389,12 +3380,12 @@ done for ac_func in valloc do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3393: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:3384: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3449,12 +3439,12 @@ done for ac_func in times do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3453: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:3443: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3509,12 +3498,12 @@ done for ac_func in mkstemp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3513: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:3502: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3565,12 +3553,12 @@ done for ac_func in shmctl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3569: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:3557: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3621,12 +3608,12 @@ done for ac_func in mmap do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3625: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:3612: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3677,12 +3663,12 @@ done for ac_func in mkstemp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3681: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:3667: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3737,12 +3722,12 @@ done for ac_func in inet_aton do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3741: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:3726: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3797,12 +3781,12 @@ done for ac_func in killpg setpgrp setpgid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3801: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:3785: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3851,15 +3834,15 @@ fi done echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6 -echo "configure:3855: checking whether setpgrp takes no argument" >&5 -if eval "test \"\${ac_cv_func_setpgrp_void+set}\" = set"; then +echo "configure:3838: checking whether setpgrp takes no argument" >&5 +if eval "test \"`echo '$''{'ac_cv_func_setpgrp_void'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then { echo "configure: error: cannot check setpgrp if cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_setpgrp_void=no else @@ -3909,12 +3892,12 @@ fi for ac_func in usleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3913: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:3896: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3969,12 +3951,12 @@ done for ac_func in strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3973: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:3955: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4027,12 +4008,12 @@ done # This function needed by NSString for handling of %@ printf directive. #-------------------------------------------------------------------- echo $ac_n "checking for register_printf_function""... $ac_c" 1>&6 -echo "configure:4031: checking for register_printf_function" >&5 -if eval "test \"\${ac_cv_func_register_printf_function+set}\" = set"; then +echo "configure:4012: checking for register_printf_function" >&5 +if eval "test \"`echo '$''{'ac_cv_func_register_printf_function'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_register_printf_function=yes" else @@ -4081,11 +4061,11 @@ if test $register_printf = 1; then working_register_printf=1 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then working_register_printf=1 else @@ -4111,12 +4091,12 @@ fi for ac_func in realpath do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4115: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:4095: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4170,15 +4149,15 @@ done # Used in critical cases by NSProcessInfo.m #-------------------------------------------------------------------- echo $ac_n "checking program_invocation_name in C Library""... $ac_c" 1>&6 -echo "configure:4174: checking program_invocation_name in C Library" >&5 -if eval "test \"\${program_invocation_name_worked+set}\" = set"; then +echo "configure:4153: checking program_invocation_name in C Library" >&5 +if eval "test \"`echo '$''{'program_invocation_name_worked'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then program_invocation_name_worked=no else cat > conftest.$ac_ext < @@ -4190,7 +4169,7 @@ main (int argc, char *argv[]) } EOF -if { (eval echo configure:4194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then program_invocation_name_worked=yes else @@ -4219,7 +4198,7 @@ fi # Needed by NSProcessInfo.m #-------------------------------------------------------------------- echo $ac_n "checking kernel support for /proc filesystem""... $ac_c" 1>&6 -echo "configure:4223: checking kernel support for /proc filesystem" >&5 +echo "configure:4202: checking kernel support for /proc filesystem" >&5 if (grep proc /etc/fstab >/dev/null 2>/dev/null); then sys_proc_fs=yes; cat >> confdefs.h <<\EOF @@ -4242,7 +4221,7 @@ fi sys_proc_fs_exe=no; if test $sys_proc_fs = yes; then echo $ac_n "checking link to executable in /proc""... $ac_c" 1>&6 -echo "configure:4246: checking link to executable in /proc" >&5 +echo "configure:4225: checking link to executable in /proc" >&5 if test -L /proc/self/exe; then sys_proc_fs_exe=yes; echo "$ac_t""yes" 1>&6 @@ -4255,16 +4234,16 @@ fi # Check if short and int values need to be word aligned #-------------------------------------------------------------------- echo $ac_n "checking short/int needs to be word aligned""... $ac_c" 1>&6 -echo "configure:4259: checking short/int needs to be word aligned" >&5 +echo "configure:4238: checking short/int needs to be word aligned" >&5 if test "$cross_compiling" = yes; then NEED_WORD_ALIGNMENT=1 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then NEED_WORD_ALIGNMENT=0 else @@ -4333,17 +4312,17 @@ for ac_hdr in libxml/xmlversion.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4337: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:4316: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4347: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4326: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4376,7 +4355,7 @@ if test $ac_cv_header_libxml_xmlversion_h = no; then HAVE_LIBXML=0 else cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4367: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4507,7 +4486,7 @@ do echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.13.1" + echo "$CONFIG_STATUS generated by autoconf version 2.13" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -4816,7 +4795,7 @@ exit 0 EOF chmod +x $CONFIG_STATUS rm -fr confdefs* $ac_clean_files -test "$no_create" = yes || $SHELL $CONFIG_STATUS || exit 1 +test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 if test "$no_recursion" != yes; then @@ -4880,7 +4859,7 @@ if test "$no_recursion" != yes; then # Check for guested configure; otherwise get Cygnus style configure. if test -f $ac_sub_srcdir/configure; then - ac_sub_configure="$SHELL $ac_sub_srcdir/configure" + ac_sub_configure=$ac_sub_srcdir/configure elif test -f $ac_sub_srcdir/configure.in; then ac_sub_configure=$ac_configure else @@ -4898,9 +4877,9 @@ if test "$no_recursion" != yes; then ac_sub_cache_file="$ac_dots$cache_file" ;; esac - echo "running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" + echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" # The eval makes quoting arguments work. - if eval $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir + if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir then : else { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; } diff --git a/configure.in b/configure.in index 48a4b35bf..83de82ee8 100644 --- a/configure.in +++ b/configure.in @@ -169,9 +169,44 @@ AC_DEFINE_UNQUOTED(NeXT_runtime, $NeXT_runtime) AC_DEFINE_UNQUOTED(NeXT_cc, $NeXT_cc) AC_SUBST(NEXT_INCLUDES) +#-------------------------------------------------------------------- +# Check for alternate Objective-C libraries +#-------------------------------------------------------------------- +if test x$GNUSTEP_SYSTEM_ROOT != "x"; then + gnustep_obj_dir=${target_cpu}/${target_os}/${ac_cv_library_combo} + # May have a private version of libobj installed here + if test -f $GNUSTEP_SYSTEM_ROOT/Headers/objc/objc.h; then + CPPFLAGS="$CPPFLAGS -I$GNUSTEP_SYSTEM_ROOT/Headers" + LDFLAGS="$LDFLAGS -L$GNUSTEP_SYSTEM_ROOT/Libraries/$gnustep_obj_dir" + echo "Using Objective-C library from $GNUSTEP_SYSTEM_ROOT, if available" + fi +fi + #-------------------------------------------------------------------- # Check if Objective-C is installed #-------------------------------------------------------------------- +AC_MSG_CHECKING(for alternate objc library) +AC_CACHE_VAL(gs_cv_objc_libdir, +[dnl +gs_cv_objc_libdir=NONE +if test -f $GNUSTEP_SYSTEM_ROOT/Headers/objc/objc.h; then + clean_target_os=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_os.sh $target_os` + clean_target_cpu=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_cpu.sh $target_cpu` + obj_dir=$clean_target_cpu/$clean_target_os/$ac_cv_library_combo + if test -f $GNUSTEP_SYSTEM_ROOT/Libraries/$obj_dir/libobjc.a; then + gs_cv_objc_libdir=$GNUSTEP_SYSTEM_ROOT/Libraries/$obj_dir + else + gs_cv_objc_libdir=NONE + fi +fi +]) +AC_MSG_RESULT($gs_cv_objc_libdir) + +if test "$gs_cv_objc_libdir" != "NONE"; then + CPPFLAGS="$CPPFLAGS -I$GNUSTEP_SYSTEM_ROOT/Headers/" + LDFLAGS="$LDFLAGS -L$gs_cv_objc_libdir" +fi + AC_CHECK_HEADERS(objc/objc.h) if test $ac_cv_header_objc_objc_h = no; then echo "Could not find Objective-C headers" @@ -472,9 +507,13 @@ CPPFLAGS="$saved_CPPFLAGS" #-------------------------------------------------------------------- # This function needed by NSLock.m for conditioned wait +# get_uninstalled_dtable used by behavior.m and objc-load.m #-------------------------------------------------------------------- AC_CHECK_FUNCS(objc_condition_timedwait) +AC_EGREP_HEADER(objc_get_uninstalled_dtable, objc/objc-api.h, + AC_DEFINE(HAVE_OBJC_GET_UNINSTALLED_DTABLE),) + LIBS="$saved_LIBS" #--------------------------------------------------------------------