Add Vladimir Marangozov's object allocator. It is disabled by default. This
closes SF patch #401229.
diff --git a/Include/objimpl.h b/Include/objimpl.h
index 9c13e71..4197bde 100644
--- a/Include/objimpl.h
+++ b/Include/objimpl.h
@@ -76,6 +76,13 @@
memory management purposes exclusively. Both the core and extension
modules should use the PyObject_* API. */
+#ifdef WITH_PYMALLOC
+#define PyCore_OBJECT_MALLOC_FUNC _PyCore_ObjectMalloc
+#define PyCore_OBJECT_REALLOC_FUNC _PyCore_ObjectRealloc
+#define PyCore_OBJECT_FREE_FUNC _PyCore_ObjectFree
+#define NEED_TO_DECLARE_OBJECT_MALLOC_AND_FRIEND
+#endif /* !WITH_PYMALLOC */
+
#ifndef PyCore_OBJECT_MALLOC_FUNC
#undef PyCore_OBJECT_REALLOC_FUNC
#undef PyCore_OBJECT_FREE_FUNC
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 61c31da..f8a0ae2 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -399,6 +399,7 @@
Python/importdl.o: $(srcdir)/Python/importdl.c
$(CC) -c $(CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
+Objects/object.o: $(srcdir)/Objects/object.c $(srcdir)/Objects/obmalloc.c
Objects/unicodectype.o: $(srcdir)/Objects/unicodectype.c \
$(srcdir)/Objects/unicodetype_db.h
diff --git a/Misc/NEWS b/Misc/NEWS
index dce6780..179d10a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -3,6 +3,15 @@
Core language, builtins, and interpreter
+- An optional object allocator has been included. This allocator is
+ optimized for Python objects and should be faster and use less memory
+ than the standard system allocator. It is not enabled by default
+ because of possible thread safety problems. The allocator is only
+ protected by the Python interpreter lock and it is possible that some
+ extension modules require a thread safe allocator. The object
+ allocator can be enabled by providing the "--with-pymalloc" option to
+ configure.
+
Standard library
- pyexpat now detects the expat version if expat.h defines it. A
diff --git a/Objects/object.c b/Objects/object.c
index db7d518..e1dd470 100644
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -1641,3 +1641,7 @@
--_PyTrash_delete_nesting;
}
}
+
+#ifdef WITH_PYMALLOC
+#include "obmalloc.c"
+#endif
diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
new file mode 100644
index 0000000..4fcd187
--- /dev/null
+++ b/Objects/obmalloc.c
@@ -0,0 +1,743 @@
+/* An object allocator for Python.
+
+ Here is an introduction to the layers of the Python memory architecture,
+ showing where the object allocator is actually used (layer +2), It is
+ called for every object allocation and deallocation (PyObject_New/Del),
+ unless the object-specific allocators implement a proprietary allocation
+ scheme (ex.: ints use a simple free list). This is also the place where
+ the cyclic garbage collector operates selectively on container objects.
+
+
+ Object-specific allocators
+ _____ ______ ______ ________
+ [ int ] [ dict ] [ list ] ... [ string ] Python core |
++3 | <----- Object-specific memory -----> | <-- Non-object memory --> |
+ _______________________________ | |
+ [ Python's object allocator ] | |
++2 | ####### Object memory ####### | <------ Internal buffers ------> |
+ ______________________________________________________________ |
+ [ Python's raw memory allocator (PyMem_ API) ] |
++1 | <----- Python memory (under PyMem manager's control) ------> | |
+ __________________________________________________________________
+ [ Underlying general-purpose allocator (ex: C library malloc) ]
+ 0 | <------ Virtual memory allocated for the python process -------> |
+
+ =========================================================================
+ _______________________________________________________________________
+ [ OS-specific Virtual Memory Manager (VMM) ]
+-1 | <--- Kernel dynamic storage allocation & management (page-based) ---> |
+ __________________________________ __________________________________
+ [ ] [ ]
+-2 | <-- Physical memory: ROM/RAM --> | | <-- Secondary storage (swap) --> |
+
+*/
+/*==========================================================================*/
+
+/* A fast, special-purpose memory allocator for small blocks, to be used
+ on top of a general-purpose malloc -- heavily based on previous art. */
+
+/* Vladimir Marangozov -- August 2000 */
+
+/*
+ * "Memory management is where the rubber meets the road -- if we do the wrong
+ * thing at any level, the results will not be good. And if we don't make the
+ * levels work well together, we are in serious trouble." (1)
+ *
+ * (1) Paul R. Wilson, Mark S. Johnstone, Michael Neely, and David Boles,
+ * "Dynamic Storage Allocation: A Survey and Critical Review",
+ * in Proc. 1995 Int'l. Workshop on Memory Management, September 1995.
+ */
+
+/* #undef WITH_MEMORY_LIMITS */ /* disable mem limit checks */
+#define WITH_MALLOC_HOOKS /* for profiling & debugging */
+
+/*==========================================================================*/
+
+/*
+ * Public functions exported by this allocator.
+ *
+ * -- Define and use these names in your code to obtain or release memory --
+ */
+#define _THIS_MALLOC PyCore_OBJECT_MALLOC_FUNC
+#define _THIS_CALLOC /* unused */
+#define _THIS_REALLOC PyCore_OBJECT_REALLOC_FUNC
+#define _THIS_FREE PyCore_OBJECT_FREE_FUNC
+
+/*
+ * Underlying allocator's functions called by this allocator.
+ * The underlying allocator is usually the one which comes with libc.
+ *
+ * -- Don't use these functions in your code (to avoid mixing allocators) --
+ *
+ * Redefine these __only__ if you are using a 3rd party general purpose
+ * allocator which exports functions with names _other_ than the standard
+ * malloc, calloc, realloc, free.
+ */
+#define _SYSTEM_MALLOC PyCore_MALLOC_FUNC
+#define _SYSTEM_CALLOC /* unused */
+#define _SYSTEM_REALLOC PyCore_REALLOC_FUNC
+#define _SYSTEM_FREE PyCore_FREE_FUNC
+
+/*
+ * If malloc hooks are needed, names of the hooks' set & fetch
+ * functions exported by this allocator.
+ */
+#ifdef WITH_MALLOC_HOOKS
+#define _SET_HOOKS _PyCore_ObjectMalloc_SetHooks
+#define _FETCH_HOOKS _PyCore_ObjectMalloc_FetchHooks
+#endif
+
+/*==========================================================================*/
+
+/*
+ * Allocation strategy abstract:
+ *
+ * For small requests, the allocator sub-allocates <Big> blocks of memory.
+ * Requests greater than 256 bytes are routed to the system's allocator.
+ *
+ * Small requests are grouped in size classes spaced 8 bytes apart, due
+ * to the required valid alignment of the returned address. Requests of
+ * a particular size are serviced from memory pools of 4K (one VMM page).
+ * Pools are fragmented on demand and contain free lists of blocks of one
+ * particular size class. In other words, there is a fixed-size allocator
+ * for each size class. Free pools are shared by the different allocators
+ * thus minimizing the space reserved for a particular size class.
+ *
+ * This allocation strategy is a variant of what is known as "simple
+ * segregated storage based on array of free lists". The main drawback of
+ * simple segregated storage is that we might end up with lot of reserved
+ * memory for the different free lists, which degenerate in time. To avoid
+ * this, we partition each free list in pools and we share dynamically the
+ * reserved space between all free lists. This technique is quite efficient
+ * for memory intensive programs which allocate mainly small-sized blocks.
+ *
+ * For small requests we have the following table:
+ *
+ * Request in bytes Size of allocated block Size class idx
+ * ----------------------------------------------------------------
+ * 1-8 8 0
+ * 9-16 16 1
+ * 17-24 24 2
+ * 25-32 32 3
+ * 33-40 40 4
+ * 41-48 48 5
+ * 49-56 56 6
+ * 57-64 64 7
+ * 65-72 72 8
+ * ... ... ...
+ * 241-248 248 30
+ * 249-256 256 31
+ *
+ * 0, 257 and up: routed to the underlying allocator.
+ */
+
+/*==========================================================================*/
+
+/*
+ * -- Main tunable settings section --
+ */
+
+/*
+ * Alignment of addresses returned to the user. 8-bytes alignment works
+ * on most current architectures (with 32-bit or 64-bit address busses).
+ * The alignment value is also used for grouping small requests in size
+ * classes spaced ALIGNMENT bytes apart.
+ *
+ * You shouldn't change this unless you know what you are doing.
+ */
+
+#define ALIGNMENT 8 /* must be 2^N */
+#define ALIGNMENT_SHIFT 3
+#define ALIGNMENT_MASK (ALIGNMENT - 1)
+
+/*
+ * Max size threshold below which malloc requests are considered to be
+ * small enough in order to use preallocated memory pools. You can tune
+ * this value according to your application behaviour and memory needs.
+ *
+ * The following invariants must hold:
+ * 1) ALIGNMENT <= SMALL_REQUEST_THRESHOLD <= 256
+ * 2) SMALL_REQUEST_THRESHOLD == N * ALIGNMENT
+ *
+ * Although not required, for better performance and space efficiency,
+ * it is recommended that SMALL_REQUEST_THRESHOLD is set to a power of 2.
+ */
+
+/*
+ * For Python compiled on systems with 32 bit pointers and integers,
+ * a value of 64 (= 8 * 8) is a reasonable speed/space tradeoff for
+ * the object allocator. To adjust automatically this threshold for
+ * systems with 64 bit pointers, we make this setting depend on a
+ * Python-specific slot size unit = sizeof(long) + sizeof(void *),
+ * which is expected to be 8, 12 or 16 bytes.
+ */
+
+#define _PYOBJECT_THRESHOLD ((SIZEOF_LONG + SIZEOF_VOID_P) * ALIGNMENT)
+
+#define SMALL_REQUEST_THRESHOLD _PYOBJECT_THRESHOLD /* must be N * ALIGNMENT */
+
+#define NB_SMALL_SIZE_CLASSES (SMALL_REQUEST_THRESHOLD / ALIGNMENT)
+
+/*
+ * The system's VMM page size can be obtained on most unices with a
+ * getpagesize() call or deduced from various header files. To make
+ * things simpler, we assume that it is 4K, which is OK for most systems.
+ * It is probably better if this is the native page size, but it doesn't
+ * have to be.
+ */
+
+#define SYSTEM_PAGE_SIZE (4 * 1024)
+#define SYSTEM_PAGE_SIZE_MASK (SYSTEM_PAGE_SIZE - 1)
+
+/*
+ * Maximum amount of memory managed by the allocator for small requests.
+ */
+
+#ifdef WITH_MEMORY_LIMITS
+#ifndef SMALL_MEMORY_LIMIT
+#define SMALL_MEMORY_LIMIT (64 * 1024 * 1024) /* 64 MB -- more? */
+#endif
+#endif
+
+/*
+ * The allocator sub-allocates <Big> blocks of memory (called arenas) aligned
+ * on a page boundary. This is a reserved virtual address space for the
+ * current process (obtained through a malloc call). In no way this means
+ * that the memory arenas will be used entirely. A malloc(<Big>) is usually
+ * an address range reservation for <Big> bytes, unless all pages within this
+ * space are referenced subsequently. So malloc'ing big blocks and not using
+ * them does not mean "wasting memory". It's an addressable range wastage...
+ *
+ * Therefore, allocating arenas with malloc is not optimal, because there is
+ * some address space wastage, but this is the most portable way to request
+ * memory from the system accross various platforms.
+ */
+
+#define ARENA_SIZE (256 * 1024 - SYSTEM_PAGE_SIZE) /* 256k - 1p */
+
+#ifdef WITH_MEMORY_LIMITS
+#define MAX_ARENAS (SMALL_MEMORY_LIMIT / ARENA_SIZE)
+#endif
+
+/*
+ * Size of the pools used for small blocks. Should be a power of 2,
+ * between 1K and SYSTEM_PAGE_SIZE, that is: 1k, 2k, 4k, eventually 8k.
+ */
+
+#define POOL_SIZE SYSTEM_PAGE_SIZE /* must be 2^N */
+#define POOL_SIZE_MASK SYSTEM_PAGE_SIZE_MASK
+#define POOL_MAGIC 0x74D3A651 /* authentication id */
+
+#define ARENA_NB_POOLS (ARENA_SIZE / POOL_SIZE)
+#define ARENA_NB_PAGES (ARENA_SIZE / SYSTEM_PAGE_SIZE)
+
+/*
+ * -- End of tunable settings section --
+ */
+
+/*==========================================================================*/
+
+/*
+ * Locking
+ *
+ * To reduce lock contention, it would probably be better to refine the
+ * crude function locking with per size class locking. I'm not positive
+ * however, whether it's worth switching to such locking policy because
+ * of the performance penalty it might introduce.
+ *
+ * The following macros describe the simplest (should also be the fastest)
+ * lock object on a particular platform and the init/fini/lock/unlock
+ * operations on it. The locks defined here are not expected to be recursive
+ * because it is assumed that they will always be called in the order:
+ * INIT, [LOCK, UNLOCK]*, FINI.
+ */
+
+/*
+ * Python's threads are serialized, so object malloc locking is disabled.
+ */
+#define SIMPLELOCK_DECL(lock) /* simple lock declaration */
+#define SIMPLELOCK_INIT(lock) /* allocate (if needed) and initialize */
+#define SIMPLELOCK_FINI(lock) /* free/destroy an existing lock */
+#define SIMPLELOCK_LOCK(lock) /* acquire released lock */
+#define SIMPLELOCK_UNLOCK(lock) /* release acquired lock */
+
+/*
+ * Basic types
+ * I don't care if these are defined in <sys/types.h> or elsewhere. Axiom.
+ */
+
+#undef uchar
+#define uchar unsigned char /* assuming == 8 bits */
+
+#undef ushort
+#define ushort unsigned short /* assuming >= 16 bits */
+
+#undef uint
+#define uint unsigned int /* assuming >= 16 bits */
+
+#undef ulong
+#define ulong unsigned long /* assuming >= 32 bits */
+
+#undef off_t
+#define off_t uint /* 16 bits <= off_t <= 64 bits */
+
+/* When you say memory, my mind reasons in terms of (pointers to) blocks */
+typedef uchar block;
+
+/* Pool for small blocks */
+struct pool_header {
+ union { block *__padding;
+ uint count; } ref; /* number of allocated blocks */
+ block *freeblock; /* pool's free list head */
+ struct pool_header *nextpool; /* next pool of this size class */
+ struct pool_header *prevpool; /* previous pool "" */
+ struct pool_header *pooladdr; /* pool address (always aligned) */
+ uint magic; /* pool magic number */
+ uint szidx; /* block size class index */
+ uint capacity; /* pool capacity in # of blocks */
+};
+
+typedef struct pool_header *poolp;
+
+#undef ROUNDUP
+#define ROUNDUP(x) (((x) + ALIGNMENT_MASK) & ~ALIGNMENT_MASK)
+#define POOL_OVERHEAD ROUNDUP(sizeof(struct pool_header))
+
+#define DUMMY_SIZE_IDX 0xffff /* size class of newly cached pools */
+
+/*==========================================================================*/
+
+/*
+ * This malloc lock
+ */
+SIMPLELOCK_DECL(__malloc_lock);
+#define LOCK() SIMPLELOCK_LOCK(__malloc_lock)
+#define UNLOCK() SIMPLELOCK_UNLOCK(__malloc_lock)
+#define LOCK_INIT() SIMPLELOCK_INIT(__malloc_lock)
+#define LOCK_FINI() SIMPLELOCK_FINI(__malloc_lock)
+
+/*
+ * Pool table -- doubly linked lists of partially used pools
+ */
+#define PTA(x) ((poolp )((uchar *)&(usedpools[2*(x)]) - 2*sizeof(block *)))
+#define PT(x) PTA(x), PTA(x)
+
+static poolp usedpools[2 * ((NB_SMALL_SIZE_CLASSES + 7) / 8) * 8] = {
+ PT(0), PT(1), PT(2), PT(3), PT(4), PT(5), PT(6), PT(7)
+#if NB_SMALL_SIZE_CLASSES > 8
+ , PT(8), PT(9), PT(10), PT(11), PT(12), PT(13), PT(14), PT(15)
+#if NB_SMALL_SIZE_CLASSES > 16
+ , PT(16), PT(17), PT(18), PT(19), PT(20), PT(21), PT(22), PT(23)
+#if NB_SMALL_SIZE_CLASSES > 24
+ , PT(24), PT(25), PT(26), PT(27), PT(28), PT(29), PT(30), PT(31)
+#if NB_SMALL_SIZE_CLASSES > 32
+ , PT(32), PT(33), PT(34), PT(35), PT(36), PT(37), PT(38), PT(39)
+#if NB_SMALL_SIZE_CLASSES > 40
+ , PT(40), PT(41), PT(42), PT(43), PT(44), PT(45), PT(46), PT(47)
+#if NB_SMALL_SIZE_CLASSES > 48
+ , PT(48), PT(49), PT(50), PT(51), PT(52), PT(53), PT(54), PT(55)
+#if NB_SMALL_SIZE_CLASSES > 56
+ , PT(56), PT(57), PT(58), PT(59), PT(60), PT(61), PT(62), PT(63)
+#endif /* NB_SMALL_SIZE_CLASSES > 56 */
+#endif /* NB_SMALL_SIZE_CLASSES > 48 */
+#endif /* NB_SMALL_SIZE_CLASSES > 40 */
+#endif /* NB_SMALL_SIZE_CLASSES > 32 */
+#endif /* NB_SMALL_SIZE_CLASSES > 24 */
+#endif /* NB_SMALL_SIZE_CLASSES > 16 */
+#endif /* NB_SMALL_SIZE_CLASSES > 8 */
+};
+
+/*
+ * Free (cached) pools
+ */
+static poolp freepools = NULL; /* free list for cached pools */
+
+/*
+ * Arenas
+ */
+static uint arenacnt = 0; /* number of allocated arenas */
+static uint watermark = ARENA_NB_POOLS; /* number of pools allocated from
+ the current arena */
+static block *arenalist = NULL; /* list of allocated arenas */
+static block *arenabase = NULL; /* free space start address in
+ current arena */
+
+/*
+ * Hooks
+ */
+#ifdef WITH_MALLOC_HOOKS
+static void *(*malloc_hook)(size_t) = NULL;
+static void *(*calloc_hook)(size_t, size_t) = NULL;
+static void *(*realloc_hook)(void *, size_t) = NULL;
+static void (*free_hook)(void *) = NULL;
+#endif /* !WITH_MALLOC_HOOKS */
+
+/*==========================================================================*/
+
+/* malloc */
+
+/*
+ * The basic blocks are ordered by decreasing execution frequency,
+ * which minimizes the number of jumps in the most common cases,
+ * improves branching prediction and instruction scheduling (small
+ * block allocations typically result in a couple of instructions).
+ * Unless the optimizer reorders everything, being too smart...
+ */
+
+void *
+_THIS_MALLOC(size_t nbytes)
+{
+ block *bp;
+ poolp pool;
+ poolp next;
+ uint size;
+
+#ifdef WITH_MALLOC_HOOKS
+ if (malloc_hook != NULL)
+ return (*malloc_hook)(nbytes);
+#endif
+
+ /*
+ * This implicitly redirects malloc(0)
+ */
+ if ((nbytes - 1) < SMALL_REQUEST_THRESHOLD) {
+ LOCK();
+ /*
+ * Most frequent paths first
+ */
+ size = (uint )(nbytes - 1) >> ALIGNMENT_SHIFT;
+ pool = usedpools[size + size];
+ if (pool != pool->nextpool) {
+ /*
+ * There is a used pool for this size class.
+ * Pick up the head block of its free list.
+ */
+ ++pool->ref.count;
+ bp = pool->freeblock;
+ if ((pool->freeblock = *(block **)bp) != NULL) {
+ UNLOCK();
+ return (void *)bp;
+ }
+ /*
+ * Reached the end of the free list, try to extend it
+ */
+ if (pool->ref.count < pool->capacity) {
+ /*
+ * There is room for another block
+ */
+ size++;
+ size <<= ALIGNMENT_SHIFT; /* block size */
+ pool->freeblock = (block *)pool + \
+ POOL_OVERHEAD + \
+ pool->ref.count * size;
+ *(block **)(pool->freeblock) = NULL;
+ UNLOCK();
+ return (void *)bp;
+ }
+ /*
+ * Pool is full, unlink from used pools
+ */
+ next = pool->nextpool;
+ pool = pool->prevpool;
+ next->prevpool = pool;
+ pool->nextpool = next;
+ UNLOCK();
+ return (void *)bp;
+ }
+ /*
+ * Try to get a cached free pool
+ */
+ pool = freepools;
+ if (pool != NULL) {
+ /*
+ * Unlink from cached pools
+ */
+ freepools = pool->nextpool;
+ init_pool:
+ /*
+ * Frontlink to used pools
+ */
+ next = usedpools[size + size]; /* == prev */
+ pool->nextpool = next;
+ pool->prevpool = next;
+ next->nextpool = pool;
+ next->prevpool = pool;
+ pool->ref.count = 1;
+ if (pool->szidx == size) {
+ /*
+ * Luckily, this pool last contained blocks
+ * of the same size class, so its header
+ * and free list are already initialized.
+ */
+ bp = pool->freeblock;
+ pool->freeblock = *(block **)bp;
+ UNLOCK();
+ return (void *)bp;
+ }
+ /*
+ * Initialize the pool header and free list
+ * then return the first block.
+ */
+ pool->szidx = size;
+ size++;
+ size <<= ALIGNMENT_SHIFT; /* block size */
+ bp = (block *)pool + POOL_OVERHEAD;
+ pool->freeblock = bp + size;
+ *(block **)(pool->freeblock) = NULL;
+ pool->capacity = (POOL_SIZE - POOL_OVERHEAD) / size;
+ UNLOCK();
+ return (void *)bp;
+ }
+ /*
+ * Allocate new pool
+ */
+ if (watermark < ARENA_NB_POOLS) {
+ /* commit malloc(POOL_SIZE) from the current arena */
+ commit_pool:
+ watermark++;
+ pool = (poolp )arenabase;
+ arenabase += POOL_SIZE;
+ pool->pooladdr = pool;
+ pool->magic = (uint )POOL_MAGIC;
+ pool->szidx = DUMMY_SIZE_IDX;
+ goto init_pool;
+ }
+ /*
+ * Allocate new arena
+ */
+#ifdef WITH_MEMORY_LIMITS
+ if (!(arenacnt < MAX_ARENAS)) {
+ UNLOCK();
+ goto redirect;
+ }
+#endif
+ /*
+ * With malloc, we can't avoid loosing one page address space
+ * per arena due to the required alignment on page boundaries.
+ */
+ bp = (block *)_SYSTEM_MALLOC(ARENA_SIZE + SYSTEM_PAGE_SIZE);
+ if (bp == NULL) {
+ UNLOCK();
+ goto redirect;
+ }
+ /*
+ * Keep a reference in the list of allocated arenas. We might
+ * want to release (some of) them in the future. The first
+ * word is never used, no matter whether the returned address
+ * is page-aligned or not, so we safely store a pointer in it.
+ */
+ *(block **)bp = arenalist;
+ arenalist = bp;
+ arenacnt++;
+ watermark = 0;
+ /* Page-round up */
+ arenabase = bp + (SYSTEM_PAGE_SIZE -
+ ((off_t )bp & SYSTEM_PAGE_SIZE_MASK));
+ goto commit_pool;
+ }
+
+ /* The small block allocator ends here. */
+
+ redirect:
+
+ /*
+ * Redirect the original request to the underlying (libc) allocator.
+ * We jump here on bigger requests, on error in the code above (as a
+ * last chance to serve the request) or when the max memory limit
+ * has been reached.
+ */
+ return (void *)_SYSTEM_MALLOC(nbytes);
+}
+
+/* free */
+
+void
+_THIS_FREE(void *p)
+{
+ poolp pool;
+ poolp next, prev;
+ uint size;
+ off_t offset;
+
+#ifdef WITH_MALLOC_HOOKS
+ if (free_hook != NULL) {
+ (*free_hook)(p);
+ return;
+ }
+#endif
+
+ if (p == NULL) /* free(NULL) has no effect */
+ return;
+
+ offset = (off_t )p & POOL_SIZE_MASK;
+ pool = (poolp )((block *)p - offset);
+ if (pool->pooladdr != pool || pool->magic != (uint )POOL_MAGIC) {
+ _SYSTEM_FREE(p);
+ return;
+ }
+
+ LOCK();
+ /*
+ * At this point, the pool is not empty
+ */
+ if ((*(block **)p = pool->freeblock) == NULL) {
+ /*
+ * Pool was full
+ */
+ pool->freeblock = (block *)p;
+ --pool->ref.count;
+ /*
+ * Frontlink to used pools
+ * This mimics LRU pool usage for new allocations and
+ * targets optimal filling when several pools contain
+ * blocks of the same size class.
+ */
+ size = pool->szidx;
+ next = usedpools[size + size];
+ prev = next->prevpool;
+ pool->nextpool = next;
+ pool->prevpool = prev;
+ next->prevpool = pool;
+ prev->nextpool = pool;
+ UNLOCK();
+ return;
+ }
+ /*
+ * Pool was not full
+ */
+ pool->freeblock = (block *)p;
+ if (--pool->ref.count != 0) {
+ UNLOCK();
+ return;
+ }
+ /*
+ * Pool is now empty, unlink from used pools
+ */
+ next = pool->nextpool;
+ prev = pool->prevpool;
+ next->prevpool = prev;
+ prev->nextpool = next;
+ /*
+ * Frontlink to free pools
+ * This ensures that previously freed pools will be allocated
+ * later (being not referenced, they are perhaps paged out).
+ */
+ pool->nextpool = freepools;
+ freepools = pool;
+ UNLOCK();
+ return;
+}
+
+/* realloc */
+
+void *
+_THIS_REALLOC(void *p, size_t nbytes)
+{
+ block *bp;
+ poolp pool;
+ uint size;
+
+#ifdef WITH_MALLOC_HOOKS
+ if (realloc_hook != NULL)
+ return (*realloc_hook)(p, nbytes);
+#endif
+
+ if (p == NULL)
+ return _THIS_MALLOC(nbytes);
+
+ /* realloc(p, 0) on big blocks is redirected. */
+ pool = (poolp )((block *)p - ((off_t )p & POOL_SIZE_MASK));
+ if (pool->pooladdr != pool || pool->magic != (uint )POOL_MAGIC) {
+ /* We haven't allocated this block */
+ if (!(nbytes > SMALL_REQUEST_THRESHOLD) && nbytes) {
+ /* small request */
+ size = nbytes;
+ goto malloc_copy_free;
+ }
+ bp = (block *)_SYSTEM_REALLOC(p, nbytes);
+ }
+ else {
+ /* We're in charge of this block */
+ size = (pool->szidx + 1) << ALIGNMENT_SHIFT; /* block size */
+ if (size >= nbytes) {
+ /* Don't bother if a smaller size was requested
+ except for realloc(p, 0) == free(p), ret NULL */
+ if (nbytes == 0) {
+ _THIS_FREE(p);
+ bp = NULL;
+ }
+ else
+ bp = (block *)p;
+ }
+ else {
+
+ malloc_copy_free:
+
+ bp = (block *)_THIS_MALLOC(nbytes);
+ if (bp != NULL) {
+ memcpy(bp, p, size);
+ _THIS_FREE(p);
+ }
+ }
+ }
+ return (void *)bp;
+}
+
+/* calloc */
+
+/* -- unused --
+void *
+_THIS_CALLOC(size_t nbel, size_t elsz)
+{
+ void *p;
+ size_t nbytes;
+
+#ifdef WITH_MALLOC_HOOKS
+ if (calloc_hook != NULL)
+ return (*calloc_hook)(nbel, elsz);
+#endif
+
+ nbytes = nbel * elsz;
+ p = _THIS_MALLOC(nbytes);
+ if (p != NULL)
+ memset(p, 0, nbytes);
+ return p;
+}
+*/
+
+/*==========================================================================*/
+
+/*
+ * Hooks
+ */
+
+#ifdef WITH_MALLOC_HOOKS
+
+void
+_SET_HOOKS( void *(*malloc_func)(size_t),
+ void *(*calloc_func)(size_t, size_t),
+ void *(*realloc_func)(void *, size_t),
+ void (*free_func)(void *) )
+{
+ LOCK();
+ malloc_hook = malloc_func;
+ calloc_hook = calloc_func;
+ realloc_hook = realloc_func;
+ free_hook = free_func;
+ UNLOCK();
+}
+
+void
+_FETCH_HOOKS( void *(**malloc_funcp)(size_t),
+ void *(**calloc_funcp)(size_t, size_t),
+ void *(**realloc_funcp)(void *, size_t),
+ void (**free_funcp)(void *) )
+{
+ LOCK();
+ *malloc_funcp = malloc_hook;
+ *calloc_funcp = calloc_hook;
+ *realloc_funcp = realloc_hook;
+ *free_funcp = free_hook;
+ UNLOCK();
+}
+#endif /* !WITH_MALLOC_HOOKS */
diff --git a/acconfig.h b/acconfig.h
index 27a0a31..045e454 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -175,6 +175,9 @@
/* Define if you want to use ndbm. */
#undef WITH_LIBNDBM
+/* Define if you want to compile in Python-specific mallocs */
+#undef WITH_PYMALLOC
+
/* Define if you want to produce an OpenStep/Rhapsody framework
(shared library plus accessory files). */
#undef WITH_NEXT_FRAMEWORK
diff --git a/config.h.in b/config.h.in
index da32b69..9c0483f 100644
--- a/config.h.in
+++ b/config.h.in
@@ -222,6 +222,9 @@
linker (rld). Dyld is necessary to support frameworks. */
#undef WITH_DYLD
+/* Define if you want to compile in Python-specific mallocs */
+#undef WITH_PYMALLOC
+
/* Define if you want to produce an OpenStep/Rhapsody framework
(shared library plus accessory files). */
#undef WITH_NEXT_FRAMEWORK
diff --git a/configure b/configure
index 57545d3..4a176fe 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
-# From configure.in Revision: 1.205
+# From configure.in Revision: 1.206
# Guess values for system-dependent variables and create Makefiles.
# Generated automatically using autoconf version 2.13
@@ -42,6 +42,8 @@
ac_help="$ac_help
--with(out)-cycle-gc disable/enable garbage collection"
ac_help="$ac_help
+ --with(out)-pymalloc disable/enable specialized mallocs"
+ac_help="$ac_help
--with-wctype-functions use wctype.h functions"
ac_help="$ac_help
--with-sgi-dl=DIRECTORY IRIX 4 dynamic linking"
@@ -575,7 +577,7 @@
if test -f /usr/lib/NextStep/software_version -o -f /System/Library/CoreServices/software_version ; then
echo $ac_n "checking for --with-next-archs""... $ac_c" 1>&6
-echo "configure:579: checking for --with-next-archs" >&5
+echo "configure:581: checking for --with-next-archs" >&5
# Check whether --with-next-archs or --without-next-archs was given.
if test "${with_next_archs+set}" = set; then
withval="$with_next_archs"
@@ -623,7 +625,7 @@
# Set name for machine-dependent library files
echo $ac_n "checking MACHDEP""... $ac_c" 1>&6
-echo "configure:627: checking MACHDEP" >&5
+echo "configure:629: checking MACHDEP" >&5
if test -z "$MACHDEP"
then
ac_sys_system=`uname -s`
@@ -663,7 +665,7 @@
# checks for alternative programs
echo $ac_n "checking for --without-gcc""... $ac_c" 1>&6
-echo "configure:667: checking for --without-gcc" >&5
+echo "configure:669: checking for --without-gcc" >&5
# Check whether --with-gcc or --without-gcc was given.
if test "${with_gcc+set}" = set; then
withval="$with_gcc"
@@ -717,7 +719,7 @@
MAINOBJ=Modules/python.o
echo $ac_n "checking for --with-cxx=<compiler>""... $ac_c" 1>&6
-echo "configure:721: checking for --with-cxx=<compiler>" >&5
+echo "configure:723: checking for --with-cxx=<compiler>" >&5
# Check whether --with-cxx or --without-cxx was given.
if test "${with_cxx+set}" = set; then
withval="$with_cxx"
@@ -747,7 +749,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:751: checking for $ac_word" >&5
+echo "configure:753: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -782,7 +784,7 @@
CXX=
else
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:786: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:788: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -793,12 +795,12 @@
cat > conftest.$ac_ext << EOF
-#line 797 "configure"
+#line 799 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:802: \"$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_cxx_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -824,7 +826,7 @@
{ 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 ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:828: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:830: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
cross_compiling=$ac_cv_prog_cxx_cross
@@ -841,7 +843,7 @@
# 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:845: checking for $ac_word" >&5
+echo "configure:847: 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
@@ -871,7 +873,7 @@
# 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:875: checking for $ac_word" >&5
+echo "configure:877: 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
@@ -922,7 +924,7 @@
# 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:926: checking for $ac_word" >&5
+echo "configure:928: 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
@@ -954,7 +956,7 @@
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:958: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:960: 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.
@@ -965,12 +967,12 @@
cat > conftest.$ac_ext << EOF
-#line 969 "configure"
+#line 971 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:976: \"$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
@@ -996,12 +998,12 @@
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1000: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1002: 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:1005: checking whether we are using GNU C" >&5
+echo "configure:1007: 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
@@ -1010,7 +1012,7 @@
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1014: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1016: \"$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
@@ -1029,7 +1031,7 @@
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1033: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1035: 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
@@ -1061,12 +1063,12 @@
fi
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:1065: checking for Cygwin environment" >&5
+echo "configure:1067: checking for Cygwin environment" >&5
if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1070 "configure"
+#line 1072 "configure"
#include "confdefs.h"
int main() {
@@ -1077,7 +1079,7 @@
return __CYGWIN__;
; return 0; }
EOF
-if { (eval echo configure:1081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1083: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_cygwin=yes
else
@@ -1094,19 +1096,19 @@
CYGWIN=
test "$ac_cv_cygwin" = yes && CYGWIN=yes
echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:1098: checking for mingw32 environment" >&5
+echo "configure:1100: checking for mingw32 environment" >&5
if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1103 "configure"
+#line 1105 "configure"
#include "confdefs.h"
int main() {
return __MINGW32__;
; return 0; }
EOF
-if { (eval echo configure:1110: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1112: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_mingw32=yes
else
@@ -1125,7 +1127,7 @@
echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1129: checking for executable suffix" >&5
+echo "configure:1131: checking for executable suffix" >&5
if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1135,7 +1137,7 @@
rm -f conftest*
echo 'int main () { return 0; }' > conftest.$ac_ext
ac_cv_exeext=
- if { (eval echo configure:1139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ if { (eval echo configure:1141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
for file in conftest.*; do
case $file in
*.c | *.o | *.obj) ;;
@@ -1156,7 +1158,7 @@
ac_exeext=$EXEEXT
echo $ac_n "checking for --with-suffix""... $ac_c" 1>&6
-echo "configure:1160: checking for --with-suffix" >&5
+echo "configure:1162: checking for --with-suffix" >&5
# Check whether --with-suffix or --without-suffix was given.
if test "${with_suffix+set}" = set; then
withval="$with_suffix"
@@ -1190,7 +1192,7 @@
echo $ac_n "checking LIBRARY""... $ac_c" 1>&6
-echo "configure:1194: checking LIBRARY" >&5
+echo "configure:1196: checking LIBRARY" >&5
if test -z "$LIBRARY"
then
LIBRARY='libpython$(VERSION).a'
@@ -1212,7 +1214,7 @@
# linking.
echo $ac_n "checking LINKCC""... $ac_c" 1>&6
-echo "configure:1216: checking LINKCC" >&5
+echo "configure:1218: checking LINKCC" >&5
if test -z "$LINKCC"
then
case $ac_sys_system in
@@ -1228,7 +1230,7 @@
echo "$ac_t""$LINKCC" 1>&6
echo $ac_n "checking LDLIBRARY""... $ac_c" 1>&6
-echo "configure:1232: checking LDLIBRARY" >&5
+echo "configure:1234: checking LDLIBRARY" >&5
# NeXT framework builds require that the 'ar' library be converted into
# a bundle using libtool.
@@ -1256,7 +1258,7 @@
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1260: checking for $ac_word" >&5
+echo "configure:1262: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1289,7 +1291,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1295: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1350,7 +1352,7 @@
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1354: checking for a BSD compatible install" >&5
+echo "configure:1356: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1439,7 +1441,7 @@
fi
# checks for UNIX variants that set C preprocessor variables
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1443: checking how to run the C preprocessor" >&5
+echo "configure:1445: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -1454,13 +1456,13 @@
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 1458 "configure"
+#line 1460 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1464: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1466: \"$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
:
@@ -1471,13 +1473,13 @@
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1475 "configure"
+#line 1477 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1481: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1483: \"$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
:
@@ -1488,13 +1490,13 @@
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 1492 "configure"
+#line 1494 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1498: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1500: \"$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
:
@@ -1519,9 +1521,9 @@
echo "$ac_t""$CPP" 1>&6
echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:1523: checking for AIX" >&5
+echo "configure:1525: checking for AIX" >&5
cat > conftest.$ac_ext <<EOF
-#line 1525 "configure"
+#line 1527 "configure"
#include "confdefs.h"
#ifdef _AIX
yes
@@ -1544,17 +1546,17 @@
ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6
-echo "configure:1548: checking for minix/config.h" >&5
+echo "configure:1550: checking for minix/config.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
-#line 1553 "configure"
+#line 1555 "configure"
#include "confdefs.h"
#include <minix/config.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1558: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1560: \"$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*
@@ -1593,7 +1595,7 @@
echo $ac_n "checking whether $CC accepts -OPT:Olimit=0""... $ac_c" 1>&6
-echo "configure:1597: checking whether $CC accepts -OPT:Olimit=0" >&5
+echo "configure:1599: checking whether $CC accepts -OPT:Olimit=0" >&5
if eval "test \"`echo '$''{'ac_cv_opt_olimit_ok'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1603,11 +1605,11 @@
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 1607 "configure"
+#line 1609 "configure"
#include "confdefs.h"
int main() { return 0; }
EOF
-if { (eval echo configure:1611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_opt_olimit_ok=yes
else
@@ -1630,7 +1632,7 @@
esac
else
echo $ac_n "checking whether $CC accepts -Olimit 1500""... $ac_c" 1>&6
-echo "configure:1634: checking whether $CC accepts -Olimit 1500" >&5
+echo "configure:1636: checking whether $CC accepts -Olimit 1500" >&5
if eval "test \"`echo '$''{'ac_cv_olimit_ok'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1640,11 +1642,11 @@
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 1644 "configure"
+#line 1646 "configure"
#include "confdefs.h"
int main() { return 0; }
EOF
-if { (eval echo configure:1648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_olimit_ok=yes
else
@@ -1668,12 +1670,12 @@
# checks for header files
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1672: checking for ANSI C header files" >&5
+echo "configure:1674: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1677 "configure"
+#line 1679 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -1681,7 +1683,7 @@
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1685: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1687: \"$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*
@@ -1698,7 +1700,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1702 "configure"
+#line 1704 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -1716,7 +1718,7 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1720 "configure"
+#line 1722 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -1737,7 +1739,7 @@
:
else
cat > conftest.$ac_ext <<EOF
-#line 1741 "configure"
+#line 1743 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1748,7 +1750,7 @@
exit (0); }
EOF
-if { (eval echo configure:1752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -1780,17 +1782,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1784: checking for $ac_hdr" >&5
+echo "configure:1786: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1789 "configure"
+#line 1791 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1794: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1796: \"$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*
@@ -1821,12 +1823,12 @@
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:1825: checking for $ac_hdr that defines DIR" >&5
+echo "configure:1827: 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 <<EOF
-#line 1830 "configure"
+#line 1832 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_hdr>
@@ -1834,7 +1836,7 @@
DIR *dirp = 0;
; return 0; }
EOF
-if { (eval echo configure:1838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1840: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_dirent_$ac_safe=yes"
else
@@ -1859,7 +1861,7 @@
# 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:1863: checking for opendir in -ldir" >&5
+echo "configure:1865: 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
@@ -1867,7 +1869,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldir $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1871 "configure"
+#line 1873 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1878,7 +1880,7 @@
opendir()
; return 0; }
EOF
-if { (eval echo configure:1882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1884: \"$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
@@ -1900,7 +1902,7 @@
else
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:1904: checking for opendir in -lx" >&5
+echo "configure:1906: 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
@@ -1908,7 +1910,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lx $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1912 "configure"
+#line 1914 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1919,7 +1921,7 @@
opendir()
; return 0; }
EOF
-if { (eval echo configure:1923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1925: \"$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
@@ -1945,9 +1947,9 @@
# checks for typedefs
was_it_defined=no
echo $ac_n "checking for clock_t in time.h""... $ac_c" 1>&6
-echo "configure:1949: checking for clock_t in time.h" >&5
+echo "configure:1951: checking for clock_t in time.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 1951 "configure"
+#line 1953 "configure"
#include "confdefs.h"
#include <time.h>
EOF
@@ -1975,12 +1977,12 @@
# Type availability checks
echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:1979: checking for mode_t" >&5
+echo "configure:1981: checking for mode_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1984 "configure"
+#line 1986 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -2008,12 +2010,12 @@
fi
echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:2012: checking for off_t" >&5
+echo "configure:2014: checking for off_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2017 "configure"
+#line 2019 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -2041,12 +2043,12 @@
fi
echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:2045: checking for pid_t" >&5
+echo "configure:2047: checking for pid_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2050 "configure"
+#line 2052 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -2074,12 +2076,12 @@
fi
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:2078: checking return type of signal handlers" >&5
+echo "configure:2080: checking return type of signal handlers" >&5
if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2083 "configure"
+#line 2085 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -2096,7 +2098,7 @@
int i;
; return 0; }
EOF
-if { (eval echo configure:2100: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2102: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
@@ -2115,12 +2117,12 @@
echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:2119: checking for size_t" >&5
+echo "configure:2121: 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 <<EOF
-#line 2124 "configure"
+#line 2126 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -2148,12 +2150,12 @@
fi
echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:2152: checking for uid_t in sys/types.h" >&5
+echo "configure:2154: checking for uid_t in sys/types.h" >&5
if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2157 "configure"
+#line 2159 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
@@ -2184,7 +2186,7 @@
# Sizes of various common basic types
echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:2188: checking size of int" >&5
+echo "configure:2190: 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
@@ -2192,7 +2194,7 @@
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 2196 "configure"
+#line 2198 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2203,7 +2205,7 @@
exit(0);
}
EOF
-if { (eval echo configure:2207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2209: \"$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
@@ -2223,7 +2225,7 @@
echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:2227: checking size of long" >&5
+echo "configure:2229: 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
@@ -2231,7 +2233,7 @@
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 2235 "configure"
+#line 2237 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2242,7 +2244,7 @@
exit(0);
}
EOF
-if { (eval echo configure:2246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2248: \"$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
@@ -2262,7 +2264,7 @@
echo $ac_n "checking size of void *""... $ac_c" 1>&6
-echo "configure:2266: checking size of void *" >&5
+echo "configure:2268: checking size of void *" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_void_p'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2270,7 +2272,7 @@
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 2274 "configure"
+#line 2276 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2281,7 +2283,7 @@
exit(0);
}
EOF
-if { (eval echo configure:2285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_void_p=`cat conftestval`
else
@@ -2301,7 +2303,7 @@
echo $ac_n "checking size of char""... $ac_c" 1>&6
-echo "configure:2305: checking size of char" >&5
+echo "configure:2307: checking size of char" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2309,7 +2311,7 @@
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 2313 "configure"
+#line 2315 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2320,7 +2322,7 @@
exit(0);
}
EOF
-if { (eval echo configure:2324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_char=`cat conftestval`
else
@@ -2340,7 +2342,7 @@
echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:2344: checking size of short" >&5
+echo "configure:2346: 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
@@ -2348,7 +2350,7 @@
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 2352 "configure"
+#line 2354 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2359,7 +2361,7 @@
exit(0);
}
EOF
-if { (eval echo configure:2363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2365: \"$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
@@ -2379,7 +2381,7 @@
echo $ac_n "checking size of float""... $ac_c" 1>&6
-echo "configure:2383: checking size of float" >&5
+echo "configure:2385: 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
@@ -2387,7 +2389,7 @@
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 2391 "configure"
+#line 2393 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2398,7 +2400,7 @@
exit(0);
}
EOF
-if { (eval echo configure:2402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2404: \"$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
@@ -2418,7 +2420,7 @@
echo $ac_n "checking size of double""... $ac_c" 1>&6
-echo "configure:2422: checking size of double" >&5
+echo "configure:2424: 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
@@ -2426,7 +2428,7 @@
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 2430 "configure"
+#line 2432 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2437,7 +2439,7 @@
exit(0);
}
EOF
-if { (eval echo configure:2441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2443: \"$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
@@ -2457,7 +2459,7 @@
echo $ac_n "checking size of fpos_t""... $ac_c" 1>&6
-echo "configure:2461: checking size of fpos_t" >&5
+echo "configure:2463: checking size of fpos_t" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_fpos_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2465,7 +2467,7 @@
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 2469 "configure"
+#line 2471 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2476,7 +2478,7 @@
exit(0);
}
EOF
-if { (eval echo configure:2480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_fpos_t=`cat conftestval`
else
@@ -2497,17 +2499,17 @@
echo $ac_n "checking for long long support""... $ac_c" 1>&6
-echo "configure:2501: checking for long long support" >&5
+echo "configure:2503: checking for long long support" >&5
have_long_long=no
cat > conftest.$ac_ext <<EOF
-#line 2504 "configure"
+#line 2506 "configure"
#include "confdefs.h"
int main() {
long long x; x = (long long)0;
; return 0; }
EOF
-if { (eval echo configure:2511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2513: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE_LONG_LONG 1
@@ -2521,7 +2523,7 @@
echo "$ac_t""$have_long_long" 1>&6
if test "$have_long_long" = yes ; then
echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:2525: checking size of long long" >&5
+echo "configure:2527: 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
@@ -2529,7 +2531,7 @@
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 2533 "configure"
+#line 2535 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2540,7 +2542,7 @@
exit(0);
}
EOF
-if { (eval echo configure:2544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2546: \"$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
@@ -2562,17 +2564,17 @@
fi
echo $ac_n "checking for uintptr_t support""... $ac_c" 1>&6
-echo "configure:2566: checking for uintptr_t support" >&5
+echo "configure:2568: checking for uintptr_t support" >&5
have_uintptr_t=no
cat > conftest.$ac_ext <<EOF
-#line 2569 "configure"
+#line 2571 "configure"
#include "confdefs.h"
int main() {
uintptr_t x; x = (uintptr_t)0;
; return 0; }
EOF
-if { (eval echo configure:2576: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2578: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE_UINTPTR_T 1
@@ -2586,7 +2588,7 @@
echo "$ac_t""$have_uintptr_t" 1>&6
if test "$have_uintptr_t" = yes ; then
echo $ac_n "checking size of uintptr_t""... $ac_c" 1>&6
-echo "configure:2590: checking size of uintptr_t" >&5
+echo "configure:2592: checking size of uintptr_t" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_uintptr_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2594,7 +2596,7 @@
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 2598 "configure"
+#line 2600 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2605,7 +2607,7 @@
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:2611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_uintptr_t=`cat conftestval`
else
@@ -2628,7 +2630,7 @@
# Hmph. AC_CHECK_SIZEOF() doesn't include <sys/types.h>.
echo $ac_n "checking size of off_t""... $ac_c" 1>&6
-echo "configure:2632: checking size of off_t" >&5
+echo "configure:2634: checking size of off_t" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_off_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2636,7 +2638,7 @@
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 2640 "configure"
+#line 2642 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/types.h>
@@ -2648,7 +2650,7 @@
exit(0);
}
EOF
-if { (eval echo configure:2652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_off_t=`cat conftestval`
else
@@ -2670,7 +2672,7 @@
echo $ac_n "checking whether to enable large file support""... $ac_c" 1>&6
-echo "configure:2674: checking whether to enable large file support" >&5
+echo "configure:2676: checking whether to enable large file support" >&5
if test "$have_long_long" = yes -a \
"$ac_cv_sizeof_off_t" -gt "$ac_cv_sizeof_long" -a \
"$ac_cv_sizeof_long_long" -ge "$ac_cv_sizeof_off_t"; then
@@ -2685,7 +2687,7 @@
# AC_CHECK_SIZEOF() doesn't include <time.h>.
echo $ac_n "checking size of time_t""... $ac_c" 1>&6
-echo "configure:2689: checking size of time_t" >&5
+echo "configure:2691: checking size of time_t" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_time_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2693,7 +2695,7 @@
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 2697 "configure"
+#line 2699 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <time.h>
@@ -2705,7 +2707,7 @@
exit(0);
}
EOF
-if { (eval echo configure:2709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_time_t=`cat conftestval`
else
@@ -2729,17 +2731,17 @@
# if have pthread_t then define SIZEOF_PTHREAD_T
echo $ac_n "checking for pthread_t""... $ac_c" 1>&6
-echo "configure:2733: checking for pthread_t" >&5
+echo "configure:2735: checking for pthread_t" >&5
have_pthread_t=no
cat > conftest.$ac_ext <<EOF
-#line 2736 "configure"
+#line 2738 "configure"
#include "confdefs.h"
#include <pthread.h>
int main() {
pthread_t x; x = *(pthread_t*)0;
; return 0; }
EOF
-if { (eval echo configure:2743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
have_pthread_t=yes
else
@@ -2751,7 +2753,7 @@
if test "$have_pthread_t" = yes ; then
# AC_CHECK_SIZEOF() doesn't include <pthread.h>.
echo $ac_n "checking size of pthread_t""... $ac_c" 1>&6
-echo "configure:2755: checking size of pthread_t" >&5
+echo "configure:2757: checking size of pthread_t" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_pthread_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2759,7 +2761,7 @@
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 2763 "configure"
+#line 2765 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <pthread.h>
@@ -2771,7 +2773,7 @@
exit(0);
}
EOF
-if { (eval echo configure:2775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_pthread_t=`cat conftestval`
else
@@ -2809,7 +2811,7 @@
esac
echo $ac_n "checking for --with-next-framework""... $ac_c" 1>&6
-echo "configure:2813: checking for --with-next-framework" >&5
+echo "configure:2815: checking for --with-next-framework" >&5
if test "$with_next_framework"
then
OPT="$OPT -fno-common"
@@ -2826,7 +2828,7 @@
fi
echo $ac_n "checking for --with-dyld""... $ac_c" 1>&6
-echo "configure:2830: checking for --with-dyld" >&5
+echo "configure:2832: checking for --with-dyld" >&5
if test "$with_next_framework" -o "$with_dyld"
then
if test "$with_dyld"
@@ -2853,7 +2855,7 @@
# SO is the extension of shared libraries `(including the dot!)
# -- usually .so, .sl on HP-UX, .dll on Cygwin
echo $ac_n "checking SO""... $ac_c" 1>&6
-echo "configure:2857: checking SO" >&5
+echo "configure:2859: checking SO" >&5
if test -z "$SO"
then
case $ac_sys_system in
@@ -2868,7 +2870,7 @@
# (Shared libraries in this instance are shared modules to be loaded into
# Python, as opposed to building Python itself as a shared library.)
echo $ac_n "checking LDSHARED""... $ac_c" 1>&6
-echo "configure:2872: checking LDSHARED" >&5
+echo "configure:2874: checking LDSHARED" >&5
if test -z "$LDSHARED"
then
case $ac_sys_system/$ac_sys_release in
@@ -2928,7 +2930,7 @@
# CCSHARED are the C *flags* used to create objects to go into a shared
# library (module) -- this is only needed for a few systems
echo $ac_n "checking CCSHARED""... $ac_c" 1>&6
-echo "configure:2932: checking CCSHARED" >&5
+echo "configure:2934: checking CCSHARED" >&5
if test -z "$CCSHARED"
then
case $ac_sys_system/$ac_sys_release in
@@ -2956,7 +2958,7 @@
# LINKFORSHARED are the flags passed to the $(CC) command that links
# the python executable -- this is only needed for a few systems
echo $ac_n "checking LINKFORSHARED""... $ac_c" 1>&6
-echo "configure:2960: checking LINKFORSHARED" >&5
+echo "configure:2962: checking LINKFORSHARED" >&5
if test -z "$LINKFORSHARED"
then
case $ac_sys_system/$ac_sys_release in
@@ -2993,7 +2995,7 @@
echo $ac_n "checking CFLAGSFORSHARED""... $ac_c" 1>&6
-echo "configure:2997: checking CFLAGSFORSHARED" >&5
+echo "configure:2999: checking CFLAGSFORSHARED" >&5
if test ! "$LIBRARY" = "$LDLIBRARY"
then
case $ac_sys_system in
@@ -3009,7 +3011,7 @@
# checks for libraries
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:3013: checking for dlopen in -ldl" >&5
+echo "configure:3015: checking for dlopen in -ldl" >&5
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3017,7 +3019,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3021 "configure"
+#line 3023 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3028,7 +3030,7 @@
dlopen()
; return 0; }
EOF
-if { (eval echo configure:3032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3034: \"$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
@@ -3056,7 +3058,7 @@
fi
# Dynamic linking for SunOS/Solaris and SYSV
echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:3060: checking for shl_load in -ldld" >&5
+echo "configure:3062: checking for shl_load in -ldld" >&5
ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3064,7 +3066,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldld $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3068 "configure"
+#line 3070 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3075,7 +3077,7 @@
shl_load()
; return 0; }
EOF
-if { (eval echo configure:3079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3081: \"$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
@@ -3105,7 +3107,7 @@
# Check for --with-pydebug
echo $ac_n "checking for --with-pydebug""... $ac_c" 1>&6
-echo "configure:3109: checking for --with-pydebug" >&5
+echo "configure:3111: checking for --with-pydebug" >&5
# Check whether --with-pydebug or --without-pydebug was given.
if test "${with_pydebug+set}" = set; then
withval="$with_pydebug"
@@ -3125,16 +3127,16 @@
# checks for system dependent C++ extensions support
case "$ac_sys_system" in
AIX*) echo $ac_n "checking for genuine AIX C++ extensions support""... $ac_c" 1>&6
-echo "configure:3129: checking for genuine AIX C++ extensions support" >&5
+echo "configure:3131: checking for genuine AIX C++ extensions support" >&5
cat > conftest.$ac_ext <<EOF
-#line 3131 "configure"
+#line 3133 "configure"
#include "confdefs.h"
#include "/usr/lpp/xlC/include/load.h"
int main() {
loadAndInit("", 0, "")
; return 0; }
EOF
-if { (eval echo configure:3138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define AIX_GENUINE_CPLUSPLUS 1
@@ -3158,7 +3160,7 @@
IRIX*) ;;
*)
echo $ac_n "checking for t_open in -lnsl""... $ac_c" 1>&6
-echo "configure:3162: checking for t_open in -lnsl" >&5
+echo "configure:3164: checking for t_open in -lnsl" >&5
ac_lib_var=`echo nsl'_'t_open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3166,7 +3168,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3170 "configure"
+#line 3172 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3177,7 +3179,7 @@
t_open()
; return 0; }
EOF
-if { (eval echo configure:3181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3183: \"$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
@@ -3198,7 +3200,7 @@
fi
# SVR4
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:3202: checking for socket in -lsocket" >&5
+echo "configure:3204: checking for socket in -lsocket" >&5
ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3206,7 +3208,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3210 "configure"
+#line 3212 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3217,7 +3219,7 @@
socket()
; return 0; }
EOF
-if { (eval echo configure:3221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3223: \"$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
@@ -3242,7 +3244,7 @@
case "$ac_sys_system" in
BeOS*)
echo $ac_n "checking for socket in -lnet""... $ac_c" 1>&6
-echo "configure:3246: checking for socket in -lnet" >&5
+echo "configure:3248: checking for socket in -lnet" >&5
ac_lib_var=`echo net'_'socket | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3250,7 +3252,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lnet $LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3254 "configure"
+#line 3256 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3261,7 +3263,7 @@
socket()
; return 0; }
EOF
-if { (eval echo configure:3265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3267: \"$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
@@ -3285,7 +3287,7 @@
esac
echo $ac_n "checking for --with-libs""... $ac_c" 1>&6
-echo "configure:3289: checking for --with-libs" >&5
+echo "configure:3291: checking for --with-libs" >&5
# Check whether --with-libs or --without-libs was given.
if test "${with_libs+set}" = set; then
withval="$with_libs"
@@ -3302,7 +3304,7 @@
echo $ac_n "checking for --with-signal-module""... $ac_c" 1>&6
-echo "configure:3306: checking for --with-signal-module" >&5
+echo "configure:3308: checking for --with-signal-module" >&5
# Check whether --with-signal-module or --without-signal-module was given.
if test "${with_signal_module+set}" = set; then
withval="$with_signal_module"
@@ -3328,7 +3330,7 @@
USE_THREAD_MODULE=""
echo $ac_n "checking for --with-dec-threads""... $ac_c" 1>&6
-echo "configure:3332: checking for --with-dec-threads" >&5
+echo "configure:3334: checking for --with-dec-threads" >&5
# Check whether --with-dec-threads or --without-dec-threads was given.
if test "${with_dec_threads+set}" = set; then
@@ -3345,7 +3347,7 @@
echo $ac_n "checking for --with-threads""... $ac_c" 1>&6
-echo "configure:3349: checking for --with-threads" >&5
+echo "configure:3351: checking for --with-threads" >&5
# Check whether --with-threads or --without-threads was given.
if test "${with_threads+set}" = set; then
withval="$with_threads"
@@ -3383,17 +3385,17 @@
ac_safe=`echo "mach/cthreads.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for mach/cthreads.h""... $ac_c" 1>&6
-echo "configure:3387: checking for mach/cthreads.h" >&5
+echo "configure:3389: checking for mach/cthreads.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
-#line 3392 "configure"
+#line 3394 "configure"
#include "confdefs.h"
#include <mach/cthreads.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3397: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3399: \"$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*
@@ -3422,7 +3424,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for --with-pth""... $ac_c" 1>&6
-echo "configure:3426: checking for --with-pth" >&5
+echo "configure:3428: checking for --with-pth" >&5
# Check whether --with-pth or --without-pth was given.
if test "${with_pth+set}" = set; then
withval="$with_pth"
@@ -3442,7 +3444,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-echo "configure:3446: checking for pthread_create in -lpthread" >&5
+echo "configure:3448: checking for pthread_create in -lpthread" >&5
ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3450,7 +3452,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpthread $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3454 "configure"
+#line 3456 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3461,7 +3463,7 @@
pthread_create()
; return 0; }
EOF
-if { (eval echo configure:3465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3467: \"$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
@@ -3490,12 +3492,12 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for pthread_detach""... $ac_c" 1>&6
-echo "configure:3494: checking for pthread_detach" >&5
+echo "configure:3496: checking for pthread_detach" >&5
if eval "test \"`echo '$''{'ac_cv_func_pthread_detach'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3499 "configure"
+#line 3501 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char pthread_detach(); below. */
@@ -3518,7 +3520,7 @@
; return 0; }
EOF
-if { (eval echo configure:3522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_pthread_detach=yes"
else
@@ -3549,17 +3551,17 @@
ac_safe=`echo "kernel/OS.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for kernel/OS.h""... $ac_c" 1>&6
-echo "configure:3553: checking for kernel/OS.h" >&5
+echo "configure:3555: checking for kernel/OS.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
-#line 3558 "configure"
+#line 3560 "configure"
#include "confdefs.h"
#include <kernel/OS.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3563: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3565: \"$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*
@@ -3588,7 +3590,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
-echo "configure:3592: checking for pthread_create in -lpthreads" >&5
+echo "configure:3594: checking for pthread_create in -lpthreads" >&5
ac_lib_var=`echo pthreads'_'pthread_create | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3596,7 +3598,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpthreads $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3600 "configure"
+#line 3602 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3607,7 +3609,7 @@
pthread_create()
; return 0; }
EOF
-if { (eval echo configure:3611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3613: \"$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
@@ -3636,7 +3638,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
-echo "configure:3640: checking for pthread_create in -lc_r" >&5
+echo "configure:3642: checking for pthread_create in -lc_r" >&5
ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3644,7 +3646,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lc_r $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3648 "configure"
+#line 3650 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3655,7 +3657,7 @@
pthread_create()
; return 0; }
EOF
-if { (eval echo configure:3659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3661: \"$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
@@ -3684,7 +3686,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __d6_pthread_create in -lthread""... $ac_c" 1>&6
-echo "configure:3688: checking for __d6_pthread_create in -lthread" >&5
+echo "configure:3690: checking for __d6_pthread_create in -lthread" >&5
ac_lib_var=`echo thread'_'__d6_pthread_create | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3692,7 +3694,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lthread $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3696 "configure"
+#line 3698 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3703,7 +3705,7 @@
__d6_pthread_create()
; return 0; }
EOF
-if { (eval echo configure:3707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3709: \"$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
@@ -3732,7 +3734,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __pthread_create_system in -lpthread""... $ac_c" 1>&6
-echo "configure:3736: checking for __pthread_create_system in -lpthread" >&5
+echo "configure:3738: checking for __pthread_create_system in -lpthread" >&5
ac_lib_var=`echo pthread'_'__pthread_create_system | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3740,7 +3742,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpthread $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3744 "configure"
+#line 3746 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3751,7 +3753,7 @@
__pthread_create_system()
; return 0; }
EOF
-if { (eval echo configure:3755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3757: \"$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
@@ -3780,7 +3782,7 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for pthread_create in -lcma""... $ac_c" 1>&6
-echo "configure:3784: checking for pthread_create in -lcma" >&5
+echo "configure:3786: checking for pthread_create in -lcma" >&5
ac_lib_var=`echo cma'_'pthread_create | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3788,7 +3790,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lcma $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3792 "configure"
+#line 3794 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3799,7 +3801,7 @@
pthread_create()
; return 0; }
EOF
-if { (eval echo configure:3803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3805: \"$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
@@ -3851,7 +3853,7 @@
echo $ac_n "checking for usconfig in -lmpc""... $ac_c" 1>&6
-echo "configure:3855: checking for usconfig in -lmpc" >&5
+echo "configure:3857: checking for usconfig in -lmpc" >&5
ac_lib_var=`echo mpc'_'usconfig | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3859,7 +3861,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lmpc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3863 "configure"
+#line 3865 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3870,7 +3872,7 @@
usconfig()
; return 0; }
EOF
-if { (eval echo configure:3874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3876: \"$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
@@ -3897,7 +3899,7 @@
fi
echo $ac_n "checking for thr_create in -lthread""... $ac_c" 1>&6
-echo "configure:3901: checking for thr_create in -lthread" >&5
+echo "configure:3903: checking for thr_create in -lthread" >&5
ac_lib_var=`echo thread'_'thr_create | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3905,7 +3907,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lthread $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3909 "configure"
+#line 3911 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3916,7 +3918,7 @@
thr_create()
; return 0; }
EOF
-if { (eval echo configure:3920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3922: \"$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
@@ -3957,7 +3959,7 @@
USE_GC_MODULE=""
echo $ac_n "checking for --with-cycle-gc""... $ac_c" 1>&6
-echo "configure:3961: checking for --with-cycle-gc" >&5
+echo "configure:3963: checking for --with-cycle-gc" >&5
# Check whether --with-cycle-gc or --without-cycle-gc was given.
if test "${with_cycle_gc+set}" = set; then
withval="$with_cycle_gc"
@@ -3979,9 +3981,28 @@
fi
echo "$ac_t""$with_cycle_gc" 1>&6
+# Check for Python-specific malloc support
+echo $ac_n "checking for --with-pymalloc""... $ac_c" 1>&6
+echo "configure:3987: checking for --with-pymalloc" >&5
+# Check whether --with-pymalloc or --without-pymalloc was given.
+if test "${with_pymalloc+set}" = set; then
+ withval="$with_pymalloc"
+
+if test "$withval" != no
+then cat >> confdefs.h <<\EOF
+#define WITH_PYMALLOC 1
+EOF
+ echo "$ac_t""yes" 1>&6
+else echo "$ac_t""no" 1>&6
+fi
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+
# Check for --with-wctype-functions
echo $ac_n "checking for --with-wctype-functions""... $ac_c" 1>&6
-echo "configure:3985: checking for --with-wctype-functions" >&5
+echo "configure:4006: checking for --with-wctype-functions" >&5
# Check whether --with-wctype-functions or --without-wctype-functions was given.
if test "${with_wctype_functions+set}" = set; then
withval="$with_wctype_functions"
@@ -4003,7 +4024,7 @@
DLINCLDIR=/
echo $ac_n "checking for --with-sgi-dl""... $ac_c" 1>&6
-echo "configure:4007: checking for --with-sgi-dl" >&5
+echo "configure:4028: checking for --with-sgi-dl" >&5
# Check whether --with-sgi-dl or --without-sgi-dl was given.
if test "${with_sgi_dl+set}" = set; then
withval="$with_sgi_dl"
@@ -4027,7 +4048,7 @@
echo $ac_n "checking for --with-dl-dld""... $ac_c" 1>&6
-echo "configure:4031: checking for --with-dl-dld" >&5
+echo "configure:4052: checking for --with-dl-dld" >&5
# Check whether --with-dl-dld or --without-dl-dld was given.
if test "${with_dl_dld+set}" = set; then
withval="$with_dl_dld"
@@ -4056,12 +4077,12 @@
for ac_func in dlopen
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4060: checking for $ac_func" >&5
+echo "configure:4081: 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 <<EOF
-#line 4065 "configure"
+#line 4086 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4084,7 +4105,7 @@
; return 0; }
EOF
-if { (eval echo configure:4088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4109: \"$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
@@ -4113,7 +4134,7 @@
# loading of modules.
echo $ac_n "checking DYNLOADFILE""... $ac_c" 1>&6
-echo "configure:4117: checking DYNLOADFILE" >&5
+echo "configure:4138: checking DYNLOADFILE" >&5
if test -z "$DYNLOADFILE"
then
case $ac_sys_system/$ac_sys_release in
@@ -4154,12 +4175,12 @@
truncate uname waitpid _getpty
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4158: checking for $ac_func" >&5
+echo "configure:4179: 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 <<EOF
-#line 4163 "configure"
+#line 4184 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4182,7 +4203,7 @@
; return 0; }
EOF
-if { (eval echo configure:4186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4207: \"$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
@@ -4212,12 +4233,12 @@
for ac_func in openpty
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4216: checking for $ac_func" >&5
+echo "configure:4237: 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 <<EOF
-#line 4221 "configure"
+#line 4242 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4240,7 +4261,7 @@
; return 0; }
EOF
-if { (eval echo configure:4244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4265: \"$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
@@ -4262,7 +4283,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-echo "configure:4266: checking for openpty in -lutil" >&5
+echo "configure:4287: checking for openpty in -lutil" >&5
ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4270,7 +4291,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lutil $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4274 "configure"
+#line 4295 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4281,7 +4302,7 @@
openpty()
; return 0; }
EOF
-if { (eval echo configure:4285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4306: \"$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
@@ -4310,12 +4331,12 @@
for ac_func in forkpty
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4314: checking for $ac_func" >&5
+echo "configure:4335: 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 <<EOF
-#line 4319 "configure"
+#line 4340 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4338,7 +4359,7 @@
; return 0; }
EOF
-if { (eval echo configure:4342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4363: \"$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
@@ -4360,7 +4381,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for forkpty in -lutil""... $ac_c" 1>&6
-echo "configure:4364: checking for forkpty in -lutil" >&5
+echo "configure:4385: checking for forkpty in -lutil" >&5
ac_lib_var=`echo util'_'forkpty | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4368,7 +4389,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lutil $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4372 "configure"
+#line 4393 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4379,7 +4400,7 @@
forkpty()
; return 0; }
EOF
-if { (eval echo configure:4383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4404: \"$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
@@ -4410,12 +4431,12 @@
for ac_func in fseek64 fseeko fstatvfs ftell64 ftello statvfs
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4414: checking for $ac_func" >&5
+echo "configure:4435: 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 <<EOF
-#line 4419 "configure"
+#line 4440 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4438,7 +4459,7 @@
; return 0; }
EOF
-if { (eval echo configure:4442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4463: \"$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
@@ -4466,12 +4487,12 @@
for ac_func in dup2 getcwd strdup strerror memmove
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4470: checking for $ac_func" >&5
+echo "configure:4491: 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 <<EOF
-#line 4475 "configure"
+#line 4496 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4494,7 +4515,7 @@
; return 0; }
EOF
-if { (eval echo configure:4498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4519: \"$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
@@ -4523,12 +4544,12 @@
for ac_func in getpgrp
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4527: checking for $ac_func" >&5
+echo "configure:4548: 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 <<EOF
-#line 4532 "configure"
+#line 4553 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4551,7 +4572,7 @@
; return 0; }
EOF
-if { (eval echo configure:4555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4576: \"$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
@@ -4570,14 +4591,14 @@
#define $ac_tr_func 1
EOF
cat > conftest.$ac_ext <<EOF
-#line 4574 "configure"
+#line 4595 "configure"
#include "confdefs.h"
#include <unistd.h>
int main() {
getpgrp(0);
; return 0; }
EOF
-if { (eval echo configure:4581: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4602: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define GETPGRP_HAVE_ARG 1
@@ -4596,12 +4617,12 @@
for ac_func in setpgrp
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4600: checking for $ac_func" >&5
+echo "configure:4621: 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 <<EOF
-#line 4605 "configure"
+#line 4626 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4624,7 +4645,7 @@
; return 0; }
EOF
-if { (eval echo configure:4628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4649: \"$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
@@ -4643,14 +4664,14 @@
#define $ac_tr_func 1
EOF
cat > conftest.$ac_ext <<EOF
-#line 4647 "configure"
+#line 4668 "configure"
#include "confdefs.h"
#include <unistd.h>
int main() {
setpgrp(0,0);
; return 0; }
EOF
-if { (eval echo configure:4654: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4675: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define SETPGRP_HAVE_ARG 1
@@ -4669,12 +4690,12 @@
for ac_func in gettimeofday
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4673: checking for $ac_func" >&5
+echo "configure:4694: 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 <<EOF
-#line 4678 "configure"
+#line 4699 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4697,7 +4718,7 @@
; return 0; }
EOF
-if { (eval echo configure:4701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4722: \"$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
@@ -4716,14 +4737,14 @@
#define $ac_tr_func 1
EOF
cat > conftest.$ac_ext <<EOF
-#line 4720 "configure"
+#line 4741 "configure"
#include "confdefs.h"
#include <sys/time.h>
int main() {
gettimeofday((struct timeval*)0,(struct timezone*)0);
; return 0; }
EOF
-if { (eval echo configure:4727: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4748: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -4743,12 +4764,12 @@
# checks for structures
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:4747: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:4768: checking whether time.h and sys/time.h may both be included" >&5
if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4752 "configure"
+#line 4773 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -4757,7 +4778,7 @@
struct tm *tp;
; return 0; }
EOF
-if { (eval echo configure:4761: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4782: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
@@ -4778,12 +4799,12 @@
fi
echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:4782: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:4803: checking whether struct tm is in sys/time.h or time.h" >&5
if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4787 "configure"
+#line 4808 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <time.h>
@@ -4791,7 +4812,7 @@
struct tm *tp; tp->tm_sec;
; return 0; }
EOF
-if { (eval echo configure:4795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4816: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm=time.h
else
@@ -4812,12 +4833,12 @@
fi
echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:4816: checking for tm_zone in struct tm" >&5
+echo "configure:4837: checking for tm_zone in struct tm" >&5
if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4821 "configure"
+#line 4842 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_cv_struct_tm>
@@ -4825,7 +4846,7 @@
struct tm tm; tm.tm_zone;
; return 0; }
EOF
-if { (eval echo configure:4829: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4850: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm_zone=yes
else
@@ -4845,12 +4866,12 @@
else
echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:4849: checking for tzname" >&5
+echo "configure:4870: checking for tzname" >&5
if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4854 "configure"
+#line 4875 "configure"
#include "confdefs.h"
#include <time.h>
#ifndef tzname /* For SGI. */
@@ -4860,7 +4881,7 @@
atoi(*tzname);
; return 0; }
EOF
-if { (eval echo configure:4864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_var_tzname=yes
else
@@ -4883,19 +4904,19 @@
echo $ac_n "checking for time.h that defines altzone""... $ac_c" 1>&6
-echo "configure:4887: checking for time.h that defines altzone" >&5
+echo "configure:4908: checking for time.h that defines altzone" >&5
if eval "test \"`echo '$''{'ac_cv_header_time_altzone'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4892 "configure"
+#line 4913 "configure"
#include "confdefs.h"
#include <time.h>
int main() {
return altzone;
; return 0; }
EOF
-if { (eval echo configure:4899: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time_altzone=yes
else
@@ -4917,9 +4938,9 @@
was_it_defined=no
echo $ac_n "checking whether sys/select.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:4921: checking whether sys/select.h and sys/time.h may both be included" >&5
+echo "configure:4942: checking whether sys/select.h and sys/time.h may both be included" >&5
cat > conftest.$ac_ext <<EOF
-#line 4923 "configure"
+#line 4944 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -4930,7 +4951,7 @@
;
; return 0; }
EOF
-if { (eval echo configure:4934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4955: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define SYS_SELECT_WITH_SYS_TIME 1
@@ -4946,14 +4967,14 @@
# checks for compiler characteristics
echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6
-echo "configure:4950: checking whether char is unsigned" >&5
+echo "configure:4971: checking whether char is unsigned" >&5
if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$GCC" = yes; then
# GCC predefines this symbol on systems where it applies.
cat > conftest.$ac_ext <<EOF
-#line 4957 "configure"
+#line 4978 "configure"
#include "confdefs.h"
#ifdef __CHAR_UNSIGNED__
yes
@@ -4975,7 +4996,7 @@
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 4979 "configure"
+#line 5000 "configure"
#include "confdefs.h"
/* volatile prevents gcc2 from optimizing the test away on sparcs. */
#if !defined(__STDC__) || __STDC__ != 1
@@ -4985,7 +5006,7 @@
volatile char c = 255; exit(c < 0);
}
EOF
-if { (eval echo configure:4989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_char_unsigned=yes
else
@@ -5009,12 +5030,12 @@
fi
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:5013: checking for working const" >&5
+echo "configure:5034: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5018 "configure"
+#line 5039 "configure"
#include "confdefs.h"
int main() {
@@ -5063,7 +5084,7 @@
; return 0; }
EOF
-if { (eval echo configure:5067: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5088: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -5086,16 +5107,16 @@
works=no
echo $ac_n "checking for working volatile""... $ac_c" 1>&6
-echo "configure:5090: checking for working volatile" >&5
+echo "configure:5111: checking for working volatile" >&5
cat > conftest.$ac_ext <<EOF
-#line 5092 "configure"
+#line 5113 "configure"
#include "confdefs.h"
int main() {
volatile int x; x = 0;
; return 0; }
EOF
-if { (eval echo configure:5099: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5120: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
works=yes
else
@@ -5112,16 +5133,16 @@
works=no
echo $ac_n "checking for working signed char""... $ac_c" 1>&6
-echo "configure:5116: checking for working signed char" >&5
+echo "configure:5137: checking for working signed char" >&5
cat > conftest.$ac_ext <<EOF
-#line 5118 "configure"
+#line 5139 "configure"
#include "confdefs.h"
int main() {
signed char c;
; return 0; }
EOF
-if { (eval echo configure:5125: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5146: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
works=yes
else
@@ -5138,16 +5159,16 @@
have_prototypes=no
echo $ac_n "checking for prototypes""... $ac_c" 1>&6
-echo "configure:5142: checking for prototypes" >&5
+echo "configure:5163: checking for prototypes" >&5
cat > conftest.$ac_ext <<EOF
-#line 5144 "configure"
+#line 5165 "configure"
#include "confdefs.h"
int foo(int x) { return 0; }
int main() {
return foo(10);
; return 0; }
EOF
-if { (eval echo configure:5151: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5172: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE_PROTOTYPES 1
@@ -5162,9 +5183,9 @@
works=no
echo $ac_n "checking for variable length prototypes and stdarg.h""... $ac_c" 1>&6
-echo "configure:5166: checking for variable length prototypes and stdarg.h" >&5
+echo "configure:5187: checking for variable length prototypes and stdarg.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 5168 "configure"
+#line 5189 "configure"
#include "confdefs.h"
#include <stdarg.h>
@@ -5181,7 +5202,7 @@
return foo(10, "", 3.14);
; return 0; }
EOF
-if { (eval echo configure:5185: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5206: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE_STDARG_PROTOTYPES 1
@@ -5197,16 +5218,16 @@
if test "$have_prototypes" = yes; then
bad_prototypes=no
echo $ac_n "checking for bad exec* prototypes""... $ac_c" 1>&6
-echo "configure:5201: checking for bad exec* prototypes" >&5
+echo "configure:5222: checking for bad exec* prototypes" >&5
cat > conftest.$ac_ext <<EOF
-#line 5203 "configure"
+#line 5224 "configure"
#include "confdefs.h"
#include <unistd.h>
int main() {
char **t;execve("@",t,t);
; return 0; }
EOF
-if { (eval echo configure:5210: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5231: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -5223,12 +5244,12 @@
bad_forward=no
echo $ac_n "checking for bad static forward""... $ac_c" 1>&6
-echo "configure:5227: checking for bad static forward" >&5
+echo "configure:5248: checking for bad static forward" >&5
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 <<EOF
-#line 5232 "configure"
+#line 5253 "configure"
#include "confdefs.h"
struct s { int a; int b; };
@@ -5244,7 +5265,7 @@
}
EOF
-if { (eval echo configure:5248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -5263,9 +5284,9 @@
va_list_is_array=no
echo $ac_n "checking whether va_list is an array""... $ac_c" 1>&6
-echo "configure:5267: checking whether va_list is an array" >&5
+echo "configure:5288: checking whether va_list is an array" >&5
cat > conftest.$ac_ext <<EOF
-#line 5269 "configure"
+#line 5290 "configure"
#include "confdefs.h"
#ifdef HAVE_STDARG_PROTOTYPES
@@ -5278,7 +5299,7 @@
va_list list1, list2; list1 = list2;
; return 0; }
EOF
-if { (eval echo configure:5282: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5303: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -5294,12 +5315,12 @@
# sigh -- gethostbyname_r is a mess; it can have 3, 5 or 6 arguments :-(
echo $ac_n "checking for gethostbyname_r""... $ac_c" 1>&6
-echo "configure:5298: checking for gethostbyname_r" >&5
+echo "configure:5319: checking for gethostbyname_r" >&5
if eval "test \"`echo '$''{'ac_cv_func_gethostbyname_r'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5303 "configure"
+#line 5324 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname_r(); below. */
@@ -5322,7 +5343,7 @@
; return 0; }
EOF
-if { (eval echo configure:5326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gethostbyname_r=yes"
else
@@ -5342,11 +5363,11 @@
EOF
echo $ac_n "checking gethostbyname_r with 6 args""... $ac_c" 1>&6
-echo "configure:5346: checking gethostbyname_r with 6 args" >&5
+echo "configure:5367: checking gethostbyname_r with 6 args" >&5
OLD_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $MY_CPPFLAGS $MY_THREAD_CPPFLAGS $MY_CFLAGS"
cat > conftest.$ac_ext <<EOF
-#line 5350 "configure"
+#line 5371 "configure"
#include "confdefs.h"
# include <netdb.h>
@@ -5363,7 +5384,7 @@
; return 0; }
EOF
-if { (eval echo configure:5367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5388: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
@@ -5383,9 +5404,9 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking gethostbyname_r with 5 args""... $ac_c" 1>&6
-echo "configure:5387: checking gethostbyname_r with 5 args" >&5
+echo "configure:5408: checking gethostbyname_r with 5 args" >&5
cat > conftest.$ac_ext <<EOF
-#line 5389 "configure"
+#line 5410 "configure"
#include "confdefs.h"
# include <netdb.h>
@@ -5402,7 +5423,7 @@
; return 0; }
EOF
-if { (eval echo configure:5406: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5427: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
@@ -5422,9 +5443,9 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking gethostbyname_r with 3 args""... $ac_c" 1>&6
-echo "configure:5426: checking gethostbyname_r with 3 args" >&5
+echo "configure:5447: checking gethostbyname_r with 3 args" >&5
cat > conftest.$ac_ext <<EOF
-#line 5428 "configure"
+#line 5449 "configure"
#include "confdefs.h"
# include <netdb.h>
@@ -5439,7 +5460,7 @@
; return 0; }
EOF
-if { (eval echo configure:5443: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
@@ -5475,12 +5496,12 @@
for ac_func in gethostbyname
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5479: checking for $ac_func" >&5
+echo "configure:5500: 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 <<EOF
-#line 5484 "configure"
+#line 5505 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -5503,7 +5524,7 @@
; return 0; }
EOF
-if { (eval echo configure:5507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5528: \"$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
@@ -5541,12 +5562,12 @@
# Linux requires this for correct f.p. operations
echo $ac_n "checking for __fpu_control""... $ac_c" 1>&6
-echo "configure:5545: checking for __fpu_control" >&5
+echo "configure:5566: checking for __fpu_control" >&5
if eval "test \"`echo '$''{'ac_cv_func___fpu_control'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5550 "configure"
+#line 5571 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char __fpu_control(); below. */
@@ -5569,7 +5590,7 @@
; return 0; }
EOF
-if { (eval echo configure:5573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func___fpu_control=yes"
else
@@ -5587,7 +5608,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for __fpu_control in -lieee""... $ac_c" 1>&6
-echo "configure:5591: checking for __fpu_control in -lieee" >&5
+echo "configure:5612: checking for __fpu_control in -lieee" >&5
ac_lib_var=`echo ieee'_'__fpu_control | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5595,7 +5616,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lieee $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5599 "configure"
+#line 5620 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5606,7 +5627,7 @@
__fpu_control()
; return 0; }
EOF
-if { (eval echo configure:5610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5631: \"$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
@@ -5639,7 +5660,7 @@
# Check for --with-fpectl
echo $ac_n "checking for --with-fpectl""... $ac_c" 1>&6
-echo "configure:5643: checking for --with-fpectl" >&5
+echo "configure:5664: checking for --with-fpectl" >&5
# Check whether --with-fpectl or --without-fpectl was given.
if test "${with_fpectl+set}" = set; then
withval="$with_fpectl"
@@ -5665,7 +5686,7 @@
*) LIBM=-lm
esac
echo $ac_n "checking for --with-libm=STRING""... $ac_c" 1>&6
-echo "configure:5669: checking for --with-libm=STRING" >&5
+echo "configure:5690: checking for --with-libm=STRING" >&5
# Check whether --with-libm or --without-libm was given.
if test "${with_libm+set}" = set; then
withval="$with_libm"
@@ -5686,7 +5707,7 @@
# check for --with-libc=...
echo $ac_n "checking for --with-libc=STRING""... $ac_c" 1>&6
-echo "configure:5690: checking for --with-libc=STRING" >&5
+echo "configure:5711: checking for --with-libc=STRING" >&5
# Check whether --with-libc or --without-libc was given.
if test "${with_libc+set}" = set; then
withval="$with_libc"
@@ -5712,7 +5733,7 @@
fi
echo $ac_n "checking for --with-check-import-case""... $ac_c" 1>&6
-echo "configure:5716: checking for --with-check-import-case" >&5
+echo "configure:5737: checking for --with-check-import-case" >&5
if test "$with_check_import_case"
then
cat >> confdefs.h <<\EOF
@@ -5730,12 +5751,12 @@
for ac_func in hypot
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5734: checking for $ac_func" >&5
+echo "configure:5755: 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 <<EOF
-#line 5739 "configure"
+#line 5760 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -5758,7 +5779,7 @@
; return 0; }
EOF
-if { (eval echo configure:5762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5783: \"$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
@@ -5788,7 +5809,7 @@
# check whether malloc(0) returns NULL or not
echo $ac_n "checking what malloc(0) returns""... $ac_c" 1>&6
-echo "configure:5792: checking what malloc(0) returns" >&5
+echo "configure:5813: checking what malloc(0) returns" >&5
if eval "test \"`echo '$''{'ac_cv_malloc_zero'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5796,7 +5817,7 @@
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 5800 "configure"
+#line 5821 "configure"
#include "confdefs.h"
#include <stdio.h>
#ifdef HAVE_STDLIB
@@ -5815,7 +5836,7 @@
exit(0);
}
EOF
-if { (eval echo configure:5819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_malloc_zero=nonnull
else
@@ -5841,17 +5862,17 @@
# check for wchar.h
ac_safe=`echo "wchar.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for wchar.h""... $ac_c" 1>&6
-echo "configure:5845: checking for wchar.h" >&5
+echo "configure:5866: checking for wchar.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
-#line 5850 "configure"
+#line 5871 "configure"
#include "confdefs.h"
#include <wchar.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5855: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5876: \"$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*
@@ -5881,12 +5902,12 @@
# check for usable wchar_t
usable_wchar_t="unkown"
echo $ac_n "checking for usable wchar_t""... $ac_c" 1>&6
-echo "configure:5885: checking for usable wchar_t" >&5
+echo "configure:5906: checking for usable wchar_t" >&5
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 <<EOF
-#line 5890 "configure"
+#line 5911 "configure"
#include "confdefs.h"
#include "wchar.h"
@@ -5900,7 +5921,7 @@
}
EOF
-if { (eval echo configure:5904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cat >> confdefs.h <<\EOF
#define HAVE_USABLE_WCHAR_T 1
@@ -5919,14 +5940,14 @@
# check for endianness
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:5923: checking whether byte ordering is bigendian" >&5
+echo "configure:5944: 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 <<EOF
-#line 5930 "configure"
+#line 5951 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
@@ -5937,11 +5958,11 @@
#endif
; return 0; }
EOF
-if { (eval echo configure:5941: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5962: \"$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 <<EOF
-#line 5945 "configure"
+#line 5966 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
@@ -5952,7 +5973,7 @@
#endif
; return 0; }
EOF
-if { (eval echo configure:5956: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5977: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_bigendian=yes
else
@@ -5972,7 +5993,7 @@
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 5976 "configure"
+#line 5997 "configure"
#include "confdefs.h"
main () {
/* Are we little or big endian? From Harbison&Steele. */
@@ -5985,7 +6006,7 @@
exit (u.c[sizeof (long) - 1] == 1);
}
EOF
-if { (eval echo configure:5989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6010: \"$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
@@ -6012,7 +6033,7 @@
# Check whether right shifting a negative integer extends the sign bit
# or fills with zeros (like the Cray J90, according to Tim Peters).
echo $ac_n "checking whether right shift extends the sign bit""... $ac_c" 1>&6
-echo "configure:6016: checking whether right shift extends the sign bit" >&5
+echo "configure:6037: checking whether right shift extends the sign bit" >&5
if eval "test \"`echo '$''{'ac_cv_rshift_extends_sign'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6021,7 +6042,7 @@
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 6025 "configure"
+#line 6046 "configure"
#include "confdefs.h"
int main()
@@ -6030,7 +6051,7 @@
}
EOF
-if { (eval echo configure:6034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_rshift_extends_sign=yes
else
@@ -6055,13 +6076,13 @@
# check for getc_unlocked and related locking functions
echo $ac_n "checking for getc_unlocked() and friends""... $ac_c" 1>&6
-echo "configure:6059: checking for getc_unlocked() and friends" >&5
+echo "configure:6080: checking for getc_unlocked() and friends" >&5
if eval "test \"`echo '$''{'ac_cv_have_getc_unlocked'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6065 "configure"
+#line 6086 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
@@ -6073,7 +6094,7 @@
; return 0; }
EOF
-if { (eval echo configure:6077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_have_getc_unlocked=yes
else
@@ -6102,12 +6123,12 @@
#endif
EOF
echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
-echo "configure:6106: checking for socklen_t" >&5
+echo "configure:6127: checking for socklen_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6111 "configure"
+#line 6132 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -6149,7 +6170,7 @@
SRCDIRS="Parser Grammar Objects Python Modules"
echo $ac_n "checking for build directories""... $ac_c" 1>&6
-echo "configure:6153: checking for build directories" >&5
+echo "configure:6174: checking for build directories" >&5
for dir in $SRCDIRS; do
if test ! -d $dir; then
mkdir $dir
diff --git a/configure.in b/configure.in
index ce4f1b0..16a578a 100644
--- a/configure.in
+++ b/configure.in
@@ -856,6 +856,16 @@
fi
AC_MSG_RESULT($with_cycle_gc)
+# Check for Python-specific malloc support
+AC_MSG_CHECKING(for --with-pymalloc)
+AC_ARG_WITH(pymalloc,
+[ --with(out)-pymalloc disable/enable specialized mallocs], [
+if test "$withval" != no
+then AC_DEFINE(WITH_PYMALLOC) AC_MSG_RESULT(yes)
+else AC_MSG_RESULT(no)
+fi],
+[AC_MSG_RESULT(no)])
+
# Check for --with-wctype-functions
AC_MSG_CHECKING(for --with-wctype-functions)
AC_ARG_WITH(wctype-functions,