diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 7dad294bc9be02baea7f3dd2c98d0a746a71b11b..41099d9c05d8ae51266f315c4069fea5a6a61c1e 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.101 1999/02/13 23:17:40 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.102 1999/02/19 06:06:00 tgl Exp $ * * NOTES * @@ -162,8 +162,17 @@ static IpcMemoryKey ipc_key; * adding to this. */ +static int MaxBackends = MAXBACKENDS; -static int NextBackendId = MAXINT; /* XXX why? */ + /* + * MaxBackends is the actual soft limit on the number of backends + * we will start. It defaults to the hard limit established at compilation + * time, but can be readjusted with postmaster's xxx switch. + * One reason to reduce MaxBackends is to allow startup under a kernel + * that won't let us get MAXBACKENDS semaphores! + */ + +static int NextBackendTag = MAXINT; /* XXX why count down not up? */ static char *progname = (char *) NULL; static char **real_argv; static int real_argc; @@ -388,7 +397,7 @@ PostmasterMain(int argc, char *argv[]) DataDir = getenv("PGDATA"); /* default value */ opterr = 0; - while ((opt = getopt(nonblank_argc, argv, "A:a:B:b:D:dim:Mno:p:Ss")) != EOF) + while ((opt = getopt(nonblank_argc, argv, "A:a:B:b:D:dim:MN:no:p:Ss")) != EOF) { switch (opt) { @@ -463,6 +472,17 @@ PostmasterMain(int argc, char *argv[]) * 'postmaster' */ break; + case 'N': + /* + * The max number of backends to start. + * Can't set to less than 1 or more than compiled-in limit. + */ + MaxBackends = atoi(optarg); + if (MaxBackends < 1) + MaxBackends = 1; + if (MaxBackends > MAXBACKENDS) + MaxBackends = MAXBACKENDS; + break; case 'n': /* Don't reinit shared mem after abnormal exit */ Reinit = false; @@ -621,6 +641,8 @@ usage(const char *progname) fprintf(stderr, "\t-b backend\tuse a specific backend server executable\n"); fprintf(stderr, "\t-d [1|2|3]\tset debugging level\n"); fprintf(stderr, "\t-i \t\tlisten on TCP/IP sockets as well as Unix domain socket\n"); + fprintf(stderr, "\t-N nprocs\tset max number of backend servers (1..%d)\n", + MAXBACKENDS); fprintf(stderr, "\t-n \t\tdon't reinitialize shared memory after abnormal exit\n"); fprintf(stderr, "\t-o option\tpass 'option' to each backend servers\n"); fprintf(stderr, "\t-p port\tspecify port for postmaster to listen on\n"); @@ -765,7 +787,7 @@ ServerLoop(void) if (status == STATUS_OK && port->pktInfo.state == Idle) { /* Can't start backend if max backend count is exceeded. */ - if (CountChildren() >= MaxBackendId) + if (CountChildren() >= MaxBackends) PacketSendError(&port->pktInfo, "Sorry, too many clients already"); else @@ -1009,7 +1031,7 @@ static void reset_shared(short port) { ipc_key = port * 1000 + shmem_seq * 100; - CreateSharedMemoryAndSemaphores(ipc_key); + CreateSharedMemoryAndSemaphores(ipc_key, MaxBackends); ActiveBackends = FALSE; shmem_seq += 1; if (shmem_seq >= 10) @@ -1272,7 +1294,7 @@ BackendStartup(Port *port) */ sprintf(envEntry[0], "POSTPORT=%d", PostPortName); putenv(envEntry[0]); - sprintf(envEntry[1], "POSTID=%d", NextBackendId); + sprintf(envEntry[1], "POSTID=%d", NextBackendTag); putenv(envEntry[1]); sprintf(envEntry[2], "PG_USER=%s", port->user); putenv(envEntry[2]); @@ -1348,9 +1370,11 @@ BackendStartup(Port *port) progname, pid, port->user, port->database, port->sock); - /* adjust backend counter */ - /* XXX Don't know why this is done, but for now backend needs it */ - NextBackendId -= 1; + /* Generate a new backend tag for every backend we start */ + /* XXX theoretically this could wrap around, if you have the patience + * to start 2^31 backends ... + */ + NextBackendTag -= 1; /* * Everything's been successful, it's safe to add this backend to our @@ -1459,7 +1483,7 @@ DoBackend(Port *port) /* OK, let's unblock our signals, all together now... */ sigprocmask(SIG_SETMASK, &oldsigmask, 0); - /* Close the postmater sockets */ + /* Close the postmaster sockets */ if (NetServer) StreamClose(ServerSock_INET); #ifndef __CYGWIN32__ diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c index 0a75af6c3e0db1630cfdd1ec8b2d2ff9edfabc39..fb27b92d2240a46a40ff6bccc07e85ca1d0f9a22 100644 --- a/src/backend/storage/ipc/ipci.c +++ b/src/backend/storage/ipc/ipci.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.18 1999/02/13 23:18:11 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.19 1999/02/19 06:06:04 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -44,17 +44,19 @@ SystemPortAddressCreateIPCKey(SystemPortAddress address) CreateSharedMemoryAndSemaphores is called exactly *ONCE* by the postmaster. - It is *NEVER* called by the postgres backend + It is *NEVER* called by the postgres backend, + except in the case of a standalone backend. 0) destroy any existing semaphores for both buffer and lock managers. 1) create the appropriate *SHARED* memory segments for the two resource managers. + 2) create shared semaphores as needed. **************************************************/ void -CreateSharedMemoryAndSemaphores(IPCKey key) +CreateSharedMemoryAndSemaphores(IPCKey key, int maxBackends) { int size; @@ -98,7 +100,7 @@ CreateSharedMemoryAndSemaphores(IPCKey key) * do process table stuff * ---------------- */ - InitProcGlobal(key); + InitProcGlobal(key, maxBackends); on_shmem_exit(ProcFreeAllSemaphores, NULL); CreateSharedInvalidationState(key); @@ -120,7 +122,7 @@ AttachSharedMemoryAndSemaphores(IPCKey key) */ if (key == PrivateIPCKey) { - CreateSharedMemoryAndSemaphores(key); + CreateSharedMemoryAndSemaphores(key, 1); return; } diff --git a/src/backend/storage/ipc/sinvaladt.c b/src/backend/storage/ipc/sinvaladt.c index 0eee0c802222809a72e8dd786906952cb6eaf93a..c5dcea61aef2c562336d6d45e4b1b8b31a494171 100644 --- a/src/backend/storage/ipc/sinvaladt.c +++ b/src/backend/storage/ipc/sinvaladt.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.16 1999/02/13 23:18:16 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.17 1999/02/19 06:06:03 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -119,7 +119,7 @@ SIAssignBackendId(SISeg *segInOutP, BackendTag backendTag) stateP = NULL; - for (index = 0; index < MaxBackendId; index += 1) + for (index = 0; index < MAXBACKENDS; index++) { if (segInOutP->procState[index].tag == InvalidBackendTag || segInOutP->procState[index].tag == backendTag) @@ -141,7 +141,7 @@ SIAssignBackendId(SISeg *segInOutP, BackendTag backendTag) /* verify that all "procState" entries checked for matching tags */ - for (index += 1; index < MaxBackendId; index += 1) + for (index++; index < MAXBACKENDS; index++) { if (segInOutP->procState[index].tag == backendTag) { @@ -565,7 +565,7 @@ SIDecProcLimit(SISeg *segP, int num) { int i; - for (i = 0; i < MaxBackendId; i++) + for (i = 0; i < MAXBACKENDS; i++) { /* decrement only, if there is a limit > 0 */ if (segP->procState[i].limit > 0) @@ -622,7 +622,7 @@ SISetProcStateInvalid(SISeg *segP) { int i; - for (i = 0; i < MaxBackendId; i++) + for (i = 0; i < MAXBACKENDS; i++) { if (segP->procState[i].limit == 0) { @@ -696,7 +696,7 @@ SIDelExpiredDataEntries(SISeg *segP) h; min = 9999999; - for (i = 0; i < MaxBackendId; i++) + for (i = 0; i < MAXBACKENDS; i++) { h = SIGetProcStateLimit(segP, i); if (h >= 0) @@ -740,7 +740,7 @@ SISegInit(SISeg *segP) SISetEndEntryChain(segP, InvalidOffset); SISetNumEntries(segP, 0); SISetMaxNumEntries(segP, MAXNUMMESSAGES); - for (i = 0; i < MaxBackendId; i++) + for (i = 0; i < MAXBACKENDS; i++) { segP->procState[i].limit = -1; /* no backend active !! */ segP->procState[i].resetState = false; diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c index 39fac457a1cc03f1e39d1af7dcb03ef791c09008..06f6fe7b4d6c72c29ad6361bafc2fae61840133b 100644 --- a/src/backend/storage/lmgr/lock.c +++ b/src/backend/storage/lmgr/lock.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.41 1999/02/13 23:18:25 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.42 1999/02/19 06:06:06 tgl Exp $ * * NOTES * Outside modules can create a lock table and acquire/release @@ -1492,8 +1492,8 @@ LockShmemSize() nXidBuckets = 1 << (int) my_log2((NLOCKS_PER_XACT - 1) / DEF_FFACTOR + 1); nXidSegs = 1 << (int) my_log2((nLockBuckets - 1) / DEF_SEGSIZE + 1); - size += MAXALIGN(NBACKENDS * sizeof(PROC)); /* each MyProc */ - size += MAXALIGN(NBACKENDS * sizeof(LOCKMETHODCTL)); /* each + size += MAXALIGN(MAXBACKENDS * sizeof(PROC)); /* each MyProc */ + size += MAXALIGN(MAXBACKENDS * sizeof(LOCKMETHODCTL)); /* each * lockMethodTable->ctl */ size += MAXALIGN(sizeof(PROC_HDR)); /* ProcGlobal */ @@ -1504,10 +1504,10 @@ LockShmemSize() (MAXALIGN(sizeof(BUCKET_INDEX)) + MAXALIGN(sizeof(LOCK))); /* contains hash key */ - size += MAXALIGN(my_log2(NBACKENDS) * sizeof(void *)); + size += MAXALIGN(my_log2(MAXBACKENDS) * sizeof(void *)); size += MAXALIGN(sizeof(HHDR)); size += nXidSegs * MAXALIGN(DEF_SEGSIZE * sizeof(SEGMENT)); - size += NBACKENDS * /* XXX not multiple of BUCKET_ALLOC_INCR? */ + size += MAXBACKENDS * /* XXX not multiple of BUCKET_ALLOC_INCR? */ (MAXALIGN(sizeof(BUCKET_INDEX)) + MAXALIGN(sizeof(XIDLookupEnt))); /* contains hash key */ @@ -1552,7 +1552,7 @@ DeadLockCheck(SHM_QUEUE *lockQueue, LOCK *findlock, bool skip_check) HTAB *xidTable; bool found; - static PROC *checked_procs[MaxBackendId]; + static PROC *checked_procs[MAXBACKENDS]; static int nprocs; static bool MyNHolding; @@ -1674,7 +1674,7 @@ DeadLockCheck(SHM_QUEUE *lockQueue, LOCK *findlock, bool skip_check) if (j >= nprocs && lock != findlock) { checked_procs[nprocs++] = proc; - Assert(nprocs <= MaxBackendId); + Assert(nprocs <= MAXBACKENDS); /* * For non-MyProc entries, we are looking only diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index de09b4a5b052bd2affb5be653087c1cfbc12951a..ae8fb17fcabcc3d393e1d58e545bb8b60673de4b 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.48 1999/02/13 23:18:28 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.49 1999/02/19 06:06:08 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -46,7 +46,7 @@ * This is so that we can support more backends. (system-wide semaphore * sets run out pretty fast.) -ay 4/95 * - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.48 1999/02/13 23:18:28 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.49 1999/02/19 06:06:08 tgl Exp $ */ #include <sys/time.h> #include <unistd.h> @@ -108,13 +108,24 @@ static void ProcFreeSem(IpcSemaphoreKey semKey, int semNum); /* * InitProcGlobal - * initializes the global process table. We put it here so that - * the postmaster can do this initialization. (ProcFreeAllSem needs + * the postmaster can do this initialization. (ProcFreeAllSemaphores needs * to read this table on exiting the postmaster. If we have the first * backend do this, starting up and killing the postmaster without * starting any backends will be a problem.) + * + * We also allocate all the per-process semaphores we will need to support + * the requested number of backends. We used to allocate semaphores + * only when backends were actually started up, but that is bad because + * it lets Postgres fail under load --- a lot of Unix systems are + * (mis)configured with small limits on the number of semaphores, and + * running out when trying to start another backend is a common failure. + * So, now we grab enough semaphores to support the desired max number + * of backends immediately at initialization --- if the sysadmin has set + * MaxBackends higher than his kernel will support, he'll find out sooner + * rather than later. */ void -InitProcGlobal(IPCKey key) +InitProcGlobal(IPCKey key, int maxBackends) { bool found = false; @@ -134,6 +145,24 @@ InitProcGlobal(IPCKey key) ProcGlobal->currKey = IPCGetProcessSemaphoreInitKey(key); for (i = 0; i < MAX_PROC_SEMS / PROC_NSEMS_PER_SET; i++) ProcGlobal->freeSemMap[i] = 0; + /* Pre-create the semaphores for the first maxBackends processes */ + for (i = 0; + i < (maxBackends+PROC_NSEMS_PER_SET-1) / PROC_NSEMS_PER_SET; + i++) + { + IPCKey semKey = ProcGlobal->currKey + i; + int semId; + int semstat; + + semId = IpcSemaphoreCreate(semKey, + PROC_NSEMS_PER_SET, + IPCProtection, + IpcSemaphoreDefaultStartValue, + 0, + &semstat); + /* mark this sema set allocated */ + ProcGlobal->freeSemMap[i] = (1 << PROC_NSEMS_PER_SET); + } } } @@ -222,6 +251,11 @@ InitProcess(IPCKey key) ProcGetNewSemKeyAndNum(&semKey, &semNum); + /* Note: because of the pre-allocation done in InitProcGlobal, + * this call should always attach to an existing semaphore. + * It will (try to) create a new group of semaphores only if + * the postmaster tries to start more backends than it said it would. + */ semId = IpcSemaphoreCreate(semKey, PROC_NSEMS_PER_SET, IPCProtection, @@ -823,20 +857,20 @@ ProcGetNewSemKeyAndNum(IPCKey *key, int *semNum) { int i; int32 *freeSemMap = ProcGlobal->freeSemMap; - unsigned int fullmask; + int32 fullmask = (1 << (PROC_NSEMS_PER_SET+1)) - 1; /* * we hold ProcStructLock when entering this routine. We scan through * the bitmap to look for a free semaphore. */ - fullmask = ~0 >> (32 - PROC_NSEMS_PER_SET); + for (i = 0; i < MAX_PROC_SEMS / PROC_NSEMS_PER_SET; i++) { int mask = 1; int j; if (freeSemMap[i] == fullmask) - continue; /* none free for this set */ + continue; /* this set is fully allocated */ for (j = 0; j < PROC_NSEMS_PER_SET; j++) { @@ -845,8 +879,9 @@ ProcGetNewSemKeyAndNum(IPCKey *key, int *semNum) /* * a free semaphore found. Mark it as allocated. + * Also set the bit indicating whole set is allocated. */ - freeSemMap[i] |= mask; + freeSemMap[i] |= mask + (1 << PROC_NSEMS_PER_SET); *key = ProcGlobal->currKey + i; *semNum = j; @@ -862,8 +897,7 @@ ProcGetNewSemKeyAndNum(IPCKey *key, int *semNum) /* * ProcFreeSem - - * free up our semaphore in the semaphore set. If we're the last one - * in the set, also remove the semaphore set. + * free up our semaphore in the semaphore set. */ static void ProcFreeSem(IpcSemaphoreKey semKey, int semNum) @@ -876,14 +910,19 @@ ProcFreeSem(IpcSemaphoreKey semKey, int semNum) mask = ~(1 << semNum); freeSemMap[i] &= mask; - if (freeSemMap[i] == 0) - IpcSemaphoreKill(semKey); + /* Formerly we'd release a semaphore set if it was now completely unused, + * but now we keep the semaphores to ensure we won't run out when + * starting new backends --- cf. InitProcGlobal. Note that the + * PROC_NSEMS_PER_SET+1'st bit of the freeSemMap entry remains set to + * indicate it is still allocated; ProcFreeAllSemaphores() needs that. + */ } /* * ProcFreeAllSemaphores - - * on exiting the postmaster, we free up all the semaphores allocated - * to the lmgrs of the backends. + * called at shmem_exit time, ie when exiting the postmaster or + * destroying shared state for a failed set of backends. + * Free up all the semaphores allocated to the lmgrs of the backends. */ void ProcFreeAllSemaphores() diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index 5f94168334c8dad70a57f0626ecf4b2bf742c2c7..0d60403e322c797336cd599ea5ae3260876d9b63 100644 --- a/src/backend/utils/init/postinit.c +++ b/src/backend/utils/init/postinit.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.37 1999/02/13 23:20:02 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.38 1999/02/19 06:06:10 tgl Exp $ * * NOTES * InitPostgres() is the function called from PostgresMain @@ -571,7 +571,7 @@ InitPostgres(char *name) /* database name */ */ InitProcess(PostgresIpcKey); - if (MyBackendId > MaxBackendId || MyBackendId <= 0) + if (MyBackendId > MAXBACKENDS || MyBackendId <= 0) { elog(FATAL, "cinit2: bad backend id %d (%d)", MyBackendTag, diff --git a/src/configure b/src/configure index c5fbcfd2a28f859cbee8744d75b3c24f67d6a755..2f01fc2dc36a40cc1360405298cf08ca4049ca82 100755 --- a/src/configure +++ b/src/configure @@ -30,6 +30,8 @@ ac_help="$ac_help --with-mb=<encoding> enable multi-byte support " ac_help="$ac_help --with-pgport=<portnum> change default startup port " +ac_help="$ac_help + --with-maxbackends=<n> set maximum number of server processes " ac_help="$ac_help --with-tcl build Tcl interfaces and pgtclsh " ac_help="$ac_help @@ -586,7 +588,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:590: checking host system type" >&5 +echo "configure:592: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -682,7 +684,7 @@ fi echo $ac_n "checking setting template to""... $ac_c" 1>&6 -echo "configure:686: checking setting template to" >&5 +echo "configure:688: checking setting template to" >&5 # Check whether --with-template or --without-template was given. if test "${with_template+set}" = set; then withval="$with_template" @@ -808,7 +810,7 @@ if test "$LIBRARY_DIRS"; then fi echo $ac_n "checking setting USE_LOCALE""... $ac_c" 1>&6 -echo "configure:812: checking setting USE_LOCALE" >&5 +echo "configure:814: checking setting USE_LOCALE" >&5 # Check whether --enable-locale or --disable-locale was given. if test "${enable_locale+set}" = set; then enableval="$enable_locale" @@ -823,7 +825,7 @@ fi echo $ac_n "checking setting CYR_RECODE""... $ac_c" 1>&6 -echo "configure:827: checking setting CYR_RECODE" >&5 +echo "configure:829: checking setting CYR_RECODE" >&5 # Check whether --enable-recode or --disable-recode was given. if test "${enable_recode+set}" = set; then enableval="$enable_recode" @@ -838,7 +840,7 @@ fi echo $ac_n "checking setting MULTIBYTE""... $ac_c" 1>&6 -echo "configure:842: checking setting MULTIBYTE" >&5 +echo "configure:844: checking setting MULTIBYTE" >&5 # Check whether --with-mb or --without-mb was given. if test "${with_mb+set}" = set; then withval="$with_mb" @@ -860,7 +862,7 @@ fi echo $ac_n "checking setting DEF_PGPORT""... $ac_c" 1>&6 -echo "configure:864: checking setting DEF_PGPORT" >&5 +echo "configure:866: checking setting DEF_PGPORT" >&5 # Check whether --with-pgport or --without-pgport was given. if test "${with_pgport+set}" = set; then withval="$with_pgport" @@ -877,8 +879,26 @@ EOF fi +echo $ac_n "checking setting MAXBACKENDS""... $ac_c" 1>&6 +echo "configure:884: checking setting MAXBACKENDS" >&5 +# Check whether --with-maxbackends or --without-maxbackends was given. +if test "${with_maxbackends+set}" = set; then + withval="$with_maxbackends" + cat >> confdefs.h <<EOF +#define MAXBACKENDS ${withval} +EOF + echo "$ac_t""$with_maxbackends" 1>&6 +else + cat >> confdefs.h <<EOF +#define MAXBACKENDS 64 +EOF + echo "$ac_t""64" 1>&6 + +fi + + echo $ac_n "checking setting USE_TCL""... $ac_c" 1>&6 -echo "configure:882: checking setting USE_TCL" >&5 +echo "configure:902: checking setting USE_TCL" >&5 # Check whether --with-tcl or --without-tcl was given. if test "${with_tcl+set}" = set; then withval="$with_tcl" @@ -914,7 +934,7 @@ fi echo $ac_n "checking setting USE_PERL""... $ac_c" 1>&6 -echo "configure:918: checking setting USE_PERL" >&5 +echo "configure:938: checking setting USE_PERL" >&5 # Check whether --with-perl or --without-perl was given. if test "${with_perl+set}" = set; then withval="$with_perl" @@ -931,7 +951,7 @@ fi echo $ac_n "checking setting USE_ODBC""... $ac_c" 1>&6 -echo "configure:935: checking setting USE_ODBC" >&5 +echo "configure:955: checking setting USE_ODBC" >&5 # Check whether --with-odbc or --without-odbc was given. if test "${with_odbc+set}" = set; then withval="$with_odbc" @@ -956,7 +976,7 @@ then echo $ac_n "checking setting ODBCINST""... $ac_c" 1>&6 -echo "configure:960: checking setting ODBCINST" >&5 +echo "configure:980: checking setting ODBCINST" >&5 # Check whether --with-odbcinst or --without-odbcinst was given. if test "${with_odbcinst+set}" = set; then withval="$with_odbcinst" @@ -980,7 +1000,7 @@ fi echo $ac_n "checking setting ASSERT CHECKING""... $ac_c" 1>&6 -echo "configure:984: checking setting ASSERT CHECKING" >&5 +echo "configure:1004: checking setting ASSERT CHECKING" >&5 # Check whether --enable-cassert or --disable-cassert was given. if test "${enable_cassert+set}" = set; then enableval="$enable_cassert" @@ -1011,7 +1031,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1015: checking for $ac_word" >&5 +echo "configure:1035: 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 @@ -1040,7 +1060,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1044: checking for $ac_word" >&5 +echo "configure:1064: 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 @@ -1088,7 +1108,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1092: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1112: 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. @@ -1098,11 +1118,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 1102 "configure" +#line 1122 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1122,12 +1142,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1126: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1146: 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:1131: checking whether we are using GNU C" >&5 +echo "configure:1151: 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 @@ -1136,7 +1156,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1140: \"$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:1160: \"$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 @@ -1151,7 +1171,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1155: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1175: 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 @@ -1179,7 +1199,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1183: checking how to run the C preprocessor" >&5 +echo "configure:1203: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1194,13 +1214,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1198 "configure" +#line 1218 "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:1204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1224: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1211,13 +1231,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1215 "configure" +#line 1235 "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:1221: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1241: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1241,13 +1261,13 @@ echo "$ac_t""$CPP" 1>&6 if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:1245: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:1265: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext <<EOF -#line 1251 "configure" +#line 1271 "configure" #include "confdefs.h" #include <sgtty.h> Autoconf TIOCGETP @@ -1265,7 +1285,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext <<EOF -#line 1269 "configure" +#line 1289 "configure" #include "confdefs.h" #include <termio.h> Autoconf TCGETA @@ -1338,7 +1358,7 @@ do # 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:1342: checking for $ac_word" >&5 +echo "configure:1362: 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 @@ -1369,7 +1389,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1373: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1393: 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. @@ -1379,11 +1399,11 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 1383 "configure" +#line 1403 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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 @@ -1409,12 +1429,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1413: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1433: 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 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1418: checking whether we are using GNU C++" >&5 +echo "configure:1438: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1423,7 +1443,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1427: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1447: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1438,7 +1458,7 @@ if test $ac_cv_prog_gxx = yes; then ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1442: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1462: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1481,7 +1501,7 @@ fi # 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:1485: checking for a BSD compatible install" >&5 +echo "configure:1505: 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 @@ -1566,7 +1586,7 @@ fi # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1570: checking for $ac_word" >&5 +echo "configure:1590: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1599,7 +1619,7 @@ then *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:1603: checking for yywrap in -l$ac_lib" >&5 +echo "configure:1623: checking for yywrap in -l$ac_lib" >&5 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1607,7 +1627,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext <<EOF -#line 1611 "configure" +#line 1631 "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 @@ -1618,7 +1638,7 @@ int main() { yywrap() ; return 0; } EOF -if { (eval echo configure:1622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1641,7 +1661,7 @@ fi fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1645: checking whether ln -s works" >&5 +echo "configure:1665: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1662,7 +1682,7 @@ else fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1666: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1686: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1691,7 +1711,7 @@ fi # 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:1695: checking for $ac_word" >&5 +echo "configure:1715: 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 @@ -1720,7 +1740,7 @@ fi # Extract the first word of "find", so it can be a program name with args. set dummy find; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1724: checking for $ac_word" >&5 +echo "configure:1744: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_find'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1751,7 +1771,7 @@ fi # Extract the first word of "tar", so it can be a program name with args. set dummy tar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1755: checking for $ac_word" >&5 +echo "configure:1775: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_tar'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1782,7 +1802,7 @@ fi # Extract the first word of "split", so it can be a program name with args. set dummy split; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1786: checking for $ac_word" >&5 +echo "configure:1806: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_split'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1813,7 +1833,7 @@ fi # Extract the first word of "etags", so it can be a program name with args. set dummy etags; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1817: checking for $ac_word" >&5 +echo "configure:1837: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_etags'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1844,7 +1864,7 @@ fi # Extract the first word of "xargs", so it can be a program name with args. set dummy xargs; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1848: checking for $ac_word" >&5 +echo "configure:1868: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_xargs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1875,7 +1895,7 @@ fi # Extract the first word of "ipcs", so it can be a program name with args. set dummy ipcs; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1879: checking for $ac_word" >&5 +echo "configure:1899: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ipcs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1906,7 +1926,7 @@ fi # Extract the first word of "ipcrm", so it can be a program name with args. set dummy ipcrm; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1910: checking for $ac_word" >&5 +echo "configure:1930: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ipcrm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1939,7 +1959,7 @@ do # 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:1943: checking for $ac_word" >&5 +echo "configure:1963: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1976,7 +1996,7 @@ do # 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:1980: checking for $ac_word" >&5 +echo "configure:2000: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GZCAT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2029,7 +2049,7 @@ else # Extract the first word of "bison", so it can be a program name with args. set dummy bison; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2033: checking for $ac_word" >&5 +echo "configure:2053: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_bison'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2066,7 +2086,7 @@ fi # Extract the first word of "yacc", so it can be a program name with args. set dummy yacc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2070: checking for $ac_word" >&5 +echo "configure:2090: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_yacc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2102,7 +2122,7 @@ fi echo $ac_n "checking for main in -lsfio""... $ac_c" 1>&6 -echo "configure:2106: checking for main in -lsfio" >&5 +echo "configure:2126: checking for main in -lsfio" >&5 ac_lib_var=`echo sfio'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2110,14 +2130,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lsfio $LIBS" cat > conftest.$ac_ext <<EOF -#line 2114 "configure" +#line 2134 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2146,7 +2166,7 @@ fi for curses in ncurses curses ; do echo $ac_n "checking for main in -l${curses}""... $ac_c" 1>&6 -echo "configure:2150: checking for main in -l${curses}" >&5 +echo "configure:2170: checking for main in -l${curses}" >&5 ac_lib_var=`echo ${curses}'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2154,14 +2174,14 @@ else ac_save_LIBS="$LIBS" LIBS="-l${curses} $LIBS" cat > conftest.$ac_ext <<EOF -#line 2158 "configure" +#line 2178 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2183,7 +2203,7 @@ fi done echo $ac_n "checking for main in -ltermcap""... $ac_c" 1>&6 -echo "configure:2187: checking for main in -ltermcap" >&5 +echo "configure:2207: checking for main in -ltermcap" >&5 ac_lib_var=`echo termcap'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2191,14 +2211,14 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <<EOF -#line 2195 "configure" +#line 2215 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2226,7 +2246,7 @@ else fi echo $ac_n "checking for main in -lhistory""... $ac_c" 1>&6 -echo "configure:2230: checking for main in -lhistory" >&5 +echo "configure:2250: checking for main in -lhistory" >&5 ac_lib_var=`echo history'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2234,14 +2254,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lhistory $LIBS" cat > conftest.$ac_ext <<EOF -#line 2238 "configure" +#line 2258 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2269,7 +2289,7 @@ else fi echo $ac_n "checking for main in -lreadline""... $ac_c" 1>&6 -echo "configure:2273: checking for main in -lreadline" >&5 +echo "configure:2293: checking for main in -lreadline" >&5 ac_lib_var=`echo readline'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2277,14 +2297,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lreadline $LIBS" cat > conftest.$ac_ext <<EOF -#line 2281 "configure" +#line 2301 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2312,7 +2332,7 @@ else fi echo $ac_n "checking for write_history in -lreadline""... $ac_c" 1>&6 -echo "configure:2316: checking for write_history in -lreadline" >&5 +echo "configure:2336: checking for write_history in -lreadline" >&5 ac_lib_var=`echo readline'_'write_history | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2320,7 +2340,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lreadline $LIBS" cat > conftest.$ac_ext <<EOF -#line 2324 "configure" +#line 2344 "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 @@ -2331,7 +2351,7 @@ int main() { write_history() ; return 0; } EOF -if { (eval echo configure:2335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2357,7 +2377,7 @@ fi if test "$PORTNAME" != "aix" -a "$PORTNAME" != "alpha" then echo $ac_n "checking for main in -lbsd""... $ac_c" 1>&6 -echo "configure:2361: checking for main in -lbsd" >&5 +echo "configure:2381: checking for main in -lbsd" >&5 ac_lib_var=`echo bsd'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2365,14 +2385,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lbsd $LIBS" cat > conftest.$ac_ext <<EOF -#line 2369 "configure" +#line 2389 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2401,7 +2421,7 @@ fi fi echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:2405: checking for main in -lm" >&5 +echo "configure:2425: checking for main in -lm" >&5 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2409,14 +2429,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 2413 "configure" +#line 2433 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2444,7 +2464,7 @@ else fi echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6 -echo "configure:2448: checking for main in -ldl" >&5 +echo "configure:2468: checking for main in -ldl" >&5 ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2452,14 +2472,14 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 2456 "configure" +#line 2476 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2487,7 +2507,7 @@ else fi echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:2491: checking for main in -lsocket" >&5 +echo "configure:2511: checking for main in -lsocket" >&5 ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2495,14 +2515,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 2499 "configure" +#line 2519 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2530,7 +2550,7 @@ else fi echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 -echo "configure:2534: checking for main in -lnsl" >&5 +echo "configure:2554: checking for main in -lnsl" >&5 ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2538,14 +2558,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 2542 "configure" +#line 2562 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2573,7 +2593,7 @@ else fi echo $ac_n "checking for main in -lipc""... $ac_c" 1>&6 -echo "configure:2577: checking for main in -lipc" >&5 +echo "configure:2597: checking for main in -lipc" >&5 ac_lib_var=`echo ipc'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2581,14 +2601,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <<EOF -#line 2585 "configure" +#line 2605 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2616,7 +2636,7 @@ else fi echo $ac_n "checking for main in -lIPC""... $ac_c" 1>&6 -echo "configure:2620: checking for main in -lIPC" >&5 +echo "configure:2640: checking for main in -lIPC" >&5 ac_lib_var=`echo IPC'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2624,14 +2644,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lIPC $LIBS" cat > conftest.$ac_ext <<EOF -#line 2628 "configure" +#line 2648 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2659,7 +2679,7 @@ else fi echo $ac_n "checking for main in -llc""... $ac_c" 1>&6 -echo "configure:2663: checking for main in -llc" >&5 +echo "configure:2683: checking for main in -llc" >&5 ac_lib_var=`echo lc'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2667,14 +2687,14 @@ else ac_save_LIBS="$LIBS" LIBS="-llc $LIBS" cat > conftest.$ac_ext <<EOF -#line 2671 "configure" +#line 2691 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2702,7 +2722,7 @@ else fi echo $ac_n "checking for main in -ldld""... $ac_c" 1>&6 -echo "configure:2706: checking for main in -ldld" >&5 +echo "configure:2726: checking for main in -ldld" >&5 ac_lib_var=`echo dld'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2710,14 +2730,14 @@ else ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <<EOF -#line 2714 "configure" +#line 2734 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2745,7 +2765,7 @@ else fi echo $ac_n "checking for main in -lln""... $ac_c" 1>&6 -echo "configure:2749: checking for main in -lln" >&5 +echo "configure:2769: checking for main in -lln" >&5 ac_lib_var=`echo ln'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2753,14 +2773,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lln $LIBS" cat > conftest.$ac_ext <<EOF -#line 2757 "configure" +#line 2777 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2788,7 +2808,7 @@ else fi echo $ac_n "checking for main in -lld""... $ac_c" 1>&6 -echo "configure:2792: checking for main in -lld" >&5 +echo "configure:2812: checking for main in -lld" >&5 ac_lib_var=`echo ld'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2796,14 +2816,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lld $LIBS" cat > conftest.$ac_ext <<EOF -#line 2800 "configure" +#line 2820 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2831,7 +2851,7 @@ else fi echo $ac_n "checking for main in -lcompat""... $ac_c" 1>&6 -echo "configure:2835: checking for main in -lcompat" >&5 +echo "configure:2855: checking for main in -lcompat" >&5 ac_lib_var=`echo compat'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2839,14 +2859,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lcompat $LIBS" cat > conftest.$ac_ext <<EOF -#line 2843 "configure" +#line 2863 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2874,7 +2894,7 @@ else fi echo $ac_n "checking for main in -lBSD""... $ac_c" 1>&6 -echo "configure:2878: checking for main in -lBSD" >&5 +echo "configure:2898: checking for main in -lBSD" >&5 ac_lib_var=`echo BSD'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2882,14 +2902,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lBSD $LIBS" cat > conftest.$ac_ext <<EOF -#line 2886 "configure" +#line 2906 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2917,7 +2937,7 @@ else fi echo $ac_n "checking for main in -lcrypt""... $ac_c" 1>&6 -echo "configure:2921: checking for main in -lcrypt" >&5 +echo "configure:2941: checking for main in -lcrypt" >&5 ac_lib_var=`echo crypt'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2925,14 +2945,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypt $LIBS" cat > conftest.$ac_ext <<EOF -#line 2929 "configure" +#line 2949 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2960,7 +2980,7 @@ else fi echo $ac_n "checking for main in -lgen""... $ac_c" 1>&6 -echo "configure:2964: checking for main in -lgen" >&5 +echo "configure:2984: checking for main in -lgen" >&5 ac_lib_var=`echo gen'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2968,14 +2988,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lgen $LIBS" cat > conftest.$ac_ext <<EOF -#line 2972 "configure" +#line 2992 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3003,7 +3023,7 @@ else fi echo $ac_n "checking for main in -lPW""... $ac_c" 1>&6 -echo "configure:3007: checking for main in -lPW" >&5 +echo "configure:3027: checking for main in -lPW" >&5 ac_lib_var=`echo PW'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3011,14 +3031,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lPW $LIBS" cat > conftest.$ac_ext <<EOF -#line 3015 "configure" +#line 3035 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3047,12 +3067,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3051: checking for ANSI C header files" >&5 +echo "configure:3071: 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 3056 "configure" +#line 3076 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -3060,7 +3080,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3064: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3084: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3077,7 +3097,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 3081 "configure" +#line 3101 "configure" #include "confdefs.h" #include <string.h> EOF @@ -3095,7 +3115,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 3099 "configure" +#line 3119 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -3116,7 +3136,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 3120 "configure" +#line 3140 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -3127,7 +3147,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:3131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -3151,12 +3171,12 @@ EOF fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:3155: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:3175: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3160 "configure" +#line 3180 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/wait.h> @@ -3172,7 +3192,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:3176: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3196: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -3196,17 +3216,17 @@ for ac_hdr in limits.h unistd.h termios.h values.h sys/select.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3200: checking for $ac_hdr" >&5 +echo "configure:3220: 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 3205 "configure" +#line 3225 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3210: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3230: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3236,17 +3256,17 @@ for ac_hdr in sys/resource.h netdb.h arpa/inet.h getopt.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3240: checking for $ac_hdr" >&5 +echo "configure:3260: 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 3245 "configure" +#line 3265 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3250: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3270: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3276,17 +3296,17 @@ for ac_hdr in readline.h history.h dld.h crypt.h endian.h float.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3280: checking for $ac_hdr" >&5 +echo "configure:3300: 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 3285 "configure" +#line 3305 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3290: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3310: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3316,17 +3336,17 @@ for ac_hdr in readline/readline.h readline/history.h ieeefp.h fp_class.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3320: checking for $ac_hdr" >&5 +echo "configure:3340: 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 3325 "configure" +#line 3345 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3330: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3350: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3356,17 +3376,17 @@ for ac_hdr in netinet/in.h string.h strings.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3360: checking for $ac_hdr" >&5 +echo "configure:3380: 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 3365 "configure" +#line 3385 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3370: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3390: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3396,17 +3416,17 @@ for ac_hdr in sys/param.h pwd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3400: checking for $ac_hdr" >&5 +echo "configure:3420: 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 3405 "configure" +#line 3425 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3410: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3430: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3434,12 +3454,12 @@ done echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:3438: checking for working const" >&5 +echo "configure:3458: 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 3443 "configure" +#line 3463 "configure" #include "confdefs.h" int main() { @@ -3488,7 +3508,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:3492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3512: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -3509,12 +3529,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:3513: checking for uid_t in sys/types.h" >&5 +echo "configure:3533: 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 3518 "configure" +#line 3538 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -3543,21 +3563,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:3547: checking for inline" >&5 +echo "configure:3567: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 3554 "configure" +#line 3574 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:3561: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3581: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -3583,12 +3603,12 @@ EOF esac echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:3587: checking for mode_t" >&5 +echo "configure:3607: 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 3592 "configure" +#line 3612 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -3616,12 +3636,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:3620: checking for off_t" >&5 +echo "configure:3640: 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 3625 "configure" +#line 3645 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -3649,12 +3669,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:3653: checking for size_t" >&5 +echo "configure:3673: 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 3658 "configure" +#line 3678 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -3682,12 +3702,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:3686: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:3706: 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 3691 "configure" +#line 3711 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -3696,7 +3716,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:3700: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3720: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -3717,12 +3737,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:3721: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:3741: 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 3726 "configure" +#line 3746 "configure" #include "confdefs.h" #include <sys/types.h> #include <time.h> @@ -3730,7 +3750,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:3734: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3754: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -3751,12 +3771,12 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:3755: checking for tm_zone in struct tm" >&5 +echo "configure:3775: 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 3760 "configure" +#line 3780 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_cv_struct_tm> @@ -3764,7 +3784,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:3768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -3784,12 +3804,12 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:3788: checking for tzname" >&5 +echo "configure:3808: 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 3793 "configure" +#line 3813 "configure" #include "confdefs.h" #include <time.h> #ifndef tzname /* For SGI. */ @@ -3799,7 +3819,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:3803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -3822,9 +3842,9 @@ fi echo $ac_n "checking for type of last arg to accept""... $ac_c" 1>&6 -echo "configure:3826: checking for type of last arg to accept" >&5 +echo "configure:3846: checking for type of last arg to accept" >&5 cat > conftest.$ac_ext <<EOF -#line 3828 "configure" +#line 3848 "configure" #include "confdefs.h" #include <stdlib.h> #include <sys/types.h> @@ -3834,7 +3854,7 @@ int main() { int a = accept(1, (struct sockaddr *) 0, (size_t *) 0); ; return 0; } EOF -if { (eval echo configure:3838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3858: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define SOCKET_SIZE_TYPE size_t @@ -3852,16 +3872,16 @@ fi rm -f conftest* echo $ac_n "checking for int timezone""... $ac_c" 1>&6 -echo "configure:3856: checking for int timezone" >&5 +echo "configure:3876: checking for int timezone" >&5 cat > conftest.$ac_ext <<EOF -#line 3858 "configure" +#line 3878 "configure" #include "confdefs.h" #include <time.h> int main() { int res = timezone / 60; ; return 0; } EOF -if { (eval echo configure:3865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_INT_TIMEZONE 1 @@ -3876,16 +3896,16 @@ fi rm -f conftest* echo $ac_n "checking for gettimeofday args""... $ac_c" 1>&6 -echo "configure:3880: checking for gettimeofday args" >&5 +echo "configure:3900: checking for gettimeofday args" >&5 cat > conftest.$ac_ext <<EOF -#line 3882 "configure" +#line 3902 "configure" #include "confdefs.h" #include <sys/time.h> int main() { struct timeval *tp; struct timezone *tzp; gettimeofday(tp,tzp); ; return 0; } EOF -if { (eval echo configure:3889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_GETTIMEOFDAY_2_ARGS 1 @@ -3900,9 +3920,9 @@ fi rm -f conftest* echo $ac_n "checking for union semun""... $ac_c" 1>&6 -echo "configure:3904: checking for union semun" >&5 +echo "configure:3924: checking for union semun" >&5 cat > conftest.$ac_ext <<EOF -#line 3906 "configure" +#line 3926 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/ipc.h> @@ -3911,7 +3931,7 @@ int main() { union semun semun; ; return 0; } EOF -if { (eval echo configure:3915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_UNION_SEMUN 1 @@ -3926,9 +3946,9 @@ fi rm -f conftest* echo $ac_n "checking for fcntl(F_SETLK)""... $ac_c" 1>&6 -echo "configure:3930: checking for fcntl(F_SETLK)" >&5 +echo "configure:3950: checking for fcntl(F_SETLK)" >&5 cat > conftest.$ac_ext <<EOF -#line 3932 "configure" +#line 3952 "configure" #include "confdefs.h" #include <fcntl.h> int main() { @@ -3938,7 +3958,7 @@ struct flock lck; fcntl(0, F_SETLK, &lck); ; return 0; } EOF -if { (eval echo configure:3942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_FCNTL_SETLK 1 @@ -3953,12 +3973,12 @@ fi rm -f conftest* echo $ac_n "checking for good DBL_MIN""... $ac_c" 1>&6 -echo "configure:3957: checking for good DBL_MIN" >&5 +echo "configure:3977: checking for good DBL_MIN" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""assuming ok on target machine" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3962 "configure" +#line 3982 "configure" #include "confdefs.h" #include <stdlib.h> #include <math.h> @@ -3967,7 +3987,7 @@ else #endif main() { double d = DBL_MIN; if (d != DBL_MIN) exit(-1); else exit(0); } EOF -if { (eval echo configure:3971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6 else @@ -3984,7 +4004,7 @@ fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:3988: checking for 8-bit clean memcmp" >&5 +echo "configure:4008: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3992,7 +4012,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <<EOF -#line 3996 "configure" +#line 4016 "configure" #include "confdefs.h" main() @@ -4002,7 +4022,7 @@ main() } EOF -if { (eval echo configure:4006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -4020,12 +4040,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.o" echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:4024: checking return type of signal handlers" >&5 +echo "configure:4044: 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 4029 "configure" +#line 4049 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -4042,7 +4062,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:4046: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4066: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -4061,12 +4081,12 @@ EOF echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:4065: checking for vprintf" >&5 +echo "configure:4085: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4070 "configure" +#line 4090 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char vprintf(); below. */ @@ -4089,7 +4109,7 @@ vprintf(); ; return 0; } EOF -if { (eval echo configure:4093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -4113,12 +4133,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:4117: checking for _doprnt" >&5 +echo "configure:4137: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4122 "configure" +#line 4142 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char _doprnt(); below. */ @@ -4141,7 +4161,7 @@ _doprnt(); ; return 0; } EOF -if { (eval echo configure:4145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -4168,12 +4188,12 @@ fi for ac_func in tzset memmove sigsetjmp kill sysconf fpclass do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4172: checking for $ac_func" >&5 +echo "configure:4192: 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 4177 "configure" +#line 4197 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4196,7 +4216,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4223,12 +4243,12 @@ done for ac_func in fp_class fp_class_d class do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4227: checking for $ac_func" >&5 +echo "configure:4247: 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 4232 "configure" +#line 4252 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4251,7 +4271,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4278,12 +4298,12 @@ done for ac_func in sigprocmask waitpid setsid fcvt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4282: checking for $ac_func" >&5 +echo "configure:4302: 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 4287 "configure" +#line 4307 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4306,7 +4326,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4331,12 +4351,12 @@ fi done echo $ac_n "checking for snprintf""... $ac_c" 1>&6 -echo "configure:4335: checking for snprintf" >&5 +echo "configure:4355: checking for snprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_snprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4340 "configure" +#line 4360 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char snprintf(); below. */ @@ -4359,7 +4379,7 @@ snprintf(); ; return 0; } EOF -if { (eval echo configure:4363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_snprintf=yes" else @@ -4383,12 +4403,12 @@ SNPRINTF='snprintf.o' fi echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6 -echo "configure:4387: checking for vsnprintf" >&5 +echo "configure:4407: checking for vsnprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vsnprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4392 "configure" +#line 4412 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char vsnprintf(); below. */ @@ -4411,7 +4431,7 @@ vsnprintf(); ; return 0; } EOF -if { (eval echo configure:4415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_vsnprintf=yes" else @@ -4436,12 +4456,12 @@ fi echo $ac_n "checking for isinf""... $ac_c" 1>&6 -echo "configure:4440: checking for isinf" >&5 +echo "configure:4460: checking for isinf" >&5 if eval "test \"`echo '$''{'ac_cv_func_isinf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4445 "configure" +#line 4465 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char isinf(); below. */ @@ -4464,7 +4484,7 @@ isinf(); ; return 0; } EOF -if { (eval echo configure:4468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_isinf=yes" else @@ -4489,12 +4509,12 @@ fi echo $ac_n "checking for getrusage""... $ac_c" 1>&6 -echo "configure:4493: checking for getrusage" >&5 +echo "configure:4513: checking for getrusage" >&5 if eval "test \"`echo '$''{'ac_cv_func_getrusage'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4498 "configure" +#line 4518 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char getrusage(); below. */ @@ -4517,7 +4537,7 @@ getrusage(); ; return 0; } EOF -if { (eval echo configure:4521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_getrusage=yes" else @@ -4542,12 +4562,12 @@ fi echo $ac_n "checking for srandom""... $ac_c" 1>&6 -echo "configure:4546: checking for srandom" >&5 +echo "configure:4566: checking for srandom" >&5 if eval "test \"`echo '$''{'ac_cv_func_srandom'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4551 "configure" +#line 4571 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char srandom(); below. */ @@ -4570,7 +4590,7 @@ srandom(); ; return 0; } EOF -if { (eval echo configure:4574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_srandom=yes" else @@ -4595,12 +4615,12 @@ fi echo $ac_n "checking for gethostname""... $ac_c" 1>&6 -echo "configure:4599: checking for gethostname" >&5 +echo "configure:4619: checking for gethostname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4604 "configure" +#line 4624 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostname(); below. */ @@ -4623,7 +4643,7 @@ gethostname(); ; return 0; } EOF -if { (eval echo configure:4627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_gethostname=yes" else @@ -4648,12 +4668,12 @@ fi echo $ac_n "checking for random""... $ac_c" 1>&6 -echo "configure:4652: checking for random" >&5 +echo "configure:4672: checking for random" >&5 if eval "test \"`echo '$''{'ac_cv_func_random'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4657 "configure" +#line 4677 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char random(); below. */ @@ -4676,7 +4696,7 @@ random(); ; return 0; } EOF -if { (eval echo configure:4680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_random=yes" else @@ -4701,12 +4721,12 @@ fi echo $ac_n "checking for inet_aton""... $ac_c" 1>&6 -echo "configure:4705: checking for inet_aton" >&5 +echo "configure:4725: checking for inet_aton" >&5 if eval "test \"`echo '$''{'ac_cv_func_inet_aton'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4710 "configure" +#line 4730 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char inet_aton(); below. */ @@ -4729,7 +4749,7 @@ inet_aton(); ; return 0; } EOF -if { (eval echo configure:4733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_inet_aton=yes" else @@ -4754,12 +4774,12 @@ fi echo $ac_n "checking for strerror""... $ac_c" 1>&6 -echo "configure:4758: checking for strerror" >&5 +echo "configure:4778: checking for strerror" >&5 if eval "test \"`echo '$''{'ac_cv_func_strerror'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4763 "configure" +#line 4783 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strerror(); below. */ @@ -4782,7 +4802,7 @@ strerror(); ; return 0; } EOF -if { (eval echo configure:4786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_strerror=yes" else @@ -4808,12 +4828,12 @@ fi echo $ac_n "checking for strdup""... $ac_c" 1>&6 -echo "configure:4812: checking for strdup" >&5 +echo "configure:4832: checking for strdup" >&5 if eval "test \"`echo '$''{'ac_cv_func_strdup'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4817 "configure" +#line 4837 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strdup(); below. */ @@ -4836,7 +4856,7 @@ strdup(); ; return 0; } EOF -if { (eval echo configure:4840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_strdup=yes" else @@ -4861,12 +4881,12 @@ fi echo $ac_n "checking for strtol""... $ac_c" 1>&6 -echo "configure:4865: checking for strtol" >&5 +echo "configure:4885: checking for strtol" >&5 if eval "test \"`echo '$''{'ac_cv_func_strtol'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4870 "configure" +#line 4890 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strtol(); below. */ @@ -4889,7 +4909,7 @@ strtol(); ; return 0; } EOF -if { (eval echo configure:4893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_strtol=yes" else @@ -4914,12 +4934,12 @@ fi echo $ac_n "checking for strtoul""... $ac_c" 1>&6 -echo "configure:4918: checking for strtoul" >&5 +echo "configure:4938: checking for strtoul" >&5 if eval "test \"`echo '$''{'ac_cv_func_strtoul'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4923 "configure" +#line 4943 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strtoul(); below. */ @@ -4942,7 +4962,7 @@ strtoul(); ; return 0; } EOF -if { (eval echo configure:4946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_strtoul=yes" else @@ -4967,12 +4987,12 @@ fi echo $ac_n "checking for strcasecmp""... $ac_c" 1>&6 -echo "configure:4971: checking for strcasecmp" >&5 +echo "configure:4991: checking for strcasecmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_strcasecmp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4976 "configure" +#line 4996 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strcasecmp(); below. */ @@ -4995,7 +5015,7 @@ strcasecmp(); ; return 0; } EOF -if { (eval echo configure:4999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_strcasecmp=yes" else @@ -5020,12 +5040,12 @@ fi echo $ac_n "checking for cbrt""... $ac_c" 1>&6 -echo "configure:5024: checking for cbrt" >&5 +echo "configure:5044: checking for cbrt" >&5 if eval "test \"`echo '$''{'ac_cv_func_cbrt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5029 "configure" +#line 5049 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char cbrt(); below. */ @@ -5048,7 +5068,7 @@ cbrt(); ; return 0; } EOF -if { (eval echo configure:5052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_cbrt=yes" else @@ -5069,7 +5089,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for cbrt in -lm""... $ac_c" 1>&6 -echo "configure:5073: checking for cbrt in -lm" >&5 +echo "configure:5093: checking for cbrt in -lm" >&5 ac_lib_var=`echo m'_'cbrt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5077,7 +5097,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 5081 "configure" +#line 5101 "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 @@ -5088,7 +5108,7 @@ int main() { cbrt() ; return 0; } EOF -if { (eval echo configure:5092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5118,12 +5138,12 @@ fi # this hackery with HPUXMATHLIB allows us to cope. HPUXMATHLIB="" echo $ac_n "checking for rint""... $ac_c" 1>&6 -echo "configure:5122: checking for rint" >&5 +echo "configure:5142: checking for rint" >&5 if eval "test \"`echo '$''{'ac_cv_func_rint'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5127 "configure" +#line 5147 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char rint(); below. */ @@ -5146,7 +5166,7 @@ rint(); ; return 0; } EOF -if { (eval echo configure:5150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_rint=yes" else @@ -5171,7 +5191,7 @@ if [ -r /lib/pa1.1/libm.a ] ; then HPUXMATHLIB="-L /lib/pa1.1 -lm" fi echo $ac_n "checking for rint in -lm""... $ac_c" 1>&6 -echo "configure:5175: checking for rint in -lm" >&5 +echo "configure:5195: checking for rint in -lm" >&5 ac_lib_var=`echo m'_'rint | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5179,7 +5199,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $HPUXMATHLIB $LIBS" cat > conftest.$ac_ext <<EOF -#line 5183 "configure" +#line 5203 "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 @@ -5190,7 +5210,7 @@ int main() { rint() ; return 0; } EOF -if { (eval echo configure:5194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5220,12 +5240,12 @@ fi echo $ac_n "checking whether 'long int' is 64 bits""... $ac_c" 1>&6 -echo "configure:5224: checking whether 'long int' is 64 bits" >&5 +echo "configure:5244: checking whether 'long int' is 64 bits" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""assuming not on target machine" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5229 "configure" +#line 5249 "configure" #include "confdefs.h" #include <stdio.h> typedef long int int64; @@ -5260,7 +5280,7 @@ main() { exit(! does_int64_work()); } EOF -if { (eval echo configure:5264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF #define HAVE_LONG_INT_64 1 @@ -5277,12 +5297,12 @@ fi echo $ac_n "checking whether 'long long int' is 64 bits""... $ac_c" 1>&6 -echo "configure:5281: checking whether 'long long int' is 64 bits" >&5 +echo "configure:5301: checking whether 'long long int' is 64 bits" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""assuming not on target machine" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5286 "configure" +#line 5306 "configure" #include "confdefs.h" #include <stdio.h> typedef long long int int64; @@ -5317,7 +5337,7 @@ main() { exit(! does_int64_work()); } EOF -if { (eval echo configure:5321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF #define HAVE_LONG_LONG_INT_64 1 @@ -5335,9 +5355,9 @@ fi echo $ac_n "checking for POSIX signal interface""... $ac_c" 1>&6 -echo "configure:5339: checking for POSIX signal interface" >&5 +echo "configure:5359: checking for POSIX signal interface" >&5 cat > conftest.$ac_ext <<EOF -#line 5341 "configure" +#line 5361 "configure" #include "confdefs.h" #include <signal.h> int main() { @@ -5347,7 +5367,7 @@ act.sa_flags = SA_RESTART; sigaction(0, &act, &oact); ; return 0; } EOF -if { (eval echo configure:5351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cat >> confdefs.h <<\EOF #define USE_POSIX_SIGNALS 1 @@ -5371,7 +5391,7 @@ then # Extract the first word of "tclsh", so it can be a program name with args. set dummy tclsh; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5375: checking for $ac_word" >&5 +echo "configure:5395: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TCLSH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5404,7 +5424,7 @@ fi # Extract the first word of "tcl", so it can be a program name with args. set dummy tcl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5408: checking for $ac_word" >&5 +echo "configure:5428: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TCLSH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5443,7 +5463,7 @@ fi if test "$USE_TCL" = true then echo $ac_n "checking for tclConfig.sh""... $ac_c" 1>&6 -echo "configure:5447: checking for tclConfig.sh" >&5 +echo "configure:5467: checking for tclConfig.sh" >&5 TCL_CONFIG_SH= library_dirs= if test -z "$TCL_DIRS" @@ -5472,7 +5492,7 @@ USE_TK=$USE_TCL # If TCL is disabled, disable TK if test "$USE_TK" = true then echo $ac_n "checking for tkConfig.sh""... $ac_c" 1>&6 -echo "configure:5476: checking for tkConfig.sh" >&5 +echo "configure:5496: checking for tkConfig.sh" >&5 TK_CONFIG_SH= # library_dirs are set in the check for TCL for dir in $library_dirs @@ -5509,7 +5529,7 @@ if test "$USE_X" = true; then # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:5513: checking for X" >&5 +echo "configure:5533: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -5571,12 +5591,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext <<EOF -#line 5575 "configure" +#line 5595 "configure" #include "confdefs.h" #include <$x_direct_test_include> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5580: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5600: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5645,14 +5665,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <<EOF -#line 5649 "configure" +#line 5669 "configure" #include "confdefs.h" int main() { ${x_direct_test_function}() ; return 0; } EOF -if { (eval echo configure:5656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -5758,17 +5778,17 @@ else case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:5762: checking whether -R must be followed by a space" >&5 +echo "configure:5782: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <<EOF -#line 5765 "configure" +#line 5785 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:5772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_nospace=yes else @@ -5784,14 +5804,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <<EOF -#line 5788 "configure" +#line 5808 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:5795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_space=yes else @@ -5823,7 +5843,7 @@ rm -f conftest* # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:5827: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:5847: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5831,7 +5851,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <<EOF -#line 5835 "configure" +#line 5855 "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 @@ -5842,7 +5862,7 @@ int main() { dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:5846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5864,7 +5884,7 @@ fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:5868: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:5888: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5872,7 +5892,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <<EOF -#line 5876 "configure" +#line 5896 "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 @@ -5883,7 +5903,7 @@ int main() { dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:5887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5912,12 +5932,12 @@ fi # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:5916: checking for gethostbyname" >&5 +echo "configure:5936: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5921 "configure" +#line 5941 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname(); below. */ @@ -5940,7 +5960,7 @@ gethostbyname(); ; return 0; } EOF -if { (eval echo configure:5944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -5961,7 +5981,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:5965: checking for gethostbyname in -lnsl" >&5 +echo "configure:5985: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5969,7 +5989,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 5973 "configure" +#line 5993 "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 @@ -5980,7 +6000,7 @@ int main() { gethostbyname() ; return 0; } EOF -if { (eval echo configure:5984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6010,12 +6030,12 @@ fi # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:6014: checking for connect" >&5 +echo "configure:6034: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6019 "configure" +#line 6039 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect(); below. */ @@ -6038,7 +6058,7 @@ connect(); ; return 0; } EOF -if { (eval echo configure:6042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -6059,7 +6079,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:6063: checking for connect in -lsocket" >&5 +echo "configure:6083: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6067,7 +6087,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 6071 "configure" +#line 6091 "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 @@ -6078,7 +6098,7 @@ int main() { connect() ; return 0; } EOF -if { (eval echo configure:6082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6102,12 +6122,12 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:6106: checking for remove" >&5 +echo "configure:6126: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6111 "configure" +#line 6131 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove(); below. */ @@ -6130,7 +6150,7 @@ remove(); ; return 0; } EOF -if { (eval echo configure:6134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -6151,7 +6171,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:6155: checking for remove in -lposix" >&5 +echo "configure:6175: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6159,7 +6179,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <<EOF -#line 6163 "configure" +#line 6183 "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 @@ -6170,7 +6190,7 @@ int main() { remove() ; return 0; } EOF -if { (eval echo configure:6174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6194,12 +6214,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:6198: checking for shmat" >&5 +echo "configure:6218: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6203 "configure" +#line 6223 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat(); below. */ @@ -6222,7 +6242,7 @@ shmat(); ; return 0; } EOF -if { (eval echo configure:6226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -6243,7 +6263,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:6247: checking for shmat in -lipc" >&5 +echo "configure:6267: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6251,7 +6271,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <<EOF -#line 6255 "configure" +#line 6275 "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 @@ -6262,7 +6282,7 @@ int main() { shmat() ; return 0; } EOF -if { (eval echo configure:6266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6295,7 +6315,7 @@ fi # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:6299: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:6319: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6303,7 +6323,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $LIBS" cat > conftest.$ac_ext <<EOF -#line 6307 "configure" +#line 6327 "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 @@ -6314,7 +6334,7 @@ int main() { IceConnectionNumber() ; return 0; } EOF -if { (eval echo configure:6318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6347,7 +6367,7 @@ fi X11_LIBS="" echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:6351: checking for XOpenDisplay in -lX11" >&5 +echo "configure:6371: checking for XOpenDisplay in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6355,7 +6375,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11 ${X_PRE_LIBS} $LIBS" cat > conftest.$ac_ext <<EOF -#line 6359 "configure" +#line 6379 "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 @@ -6366,7 +6386,7 @@ int main() { XOpenDisplay() ; return 0; } EOF -if { (eval echo configure:6370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6413,17 +6433,17 @@ then PWD_INCDIR=no ac_safe=`echo "pwd.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for pwd.h""... $ac_c" 1>&6 -echo "configure:6417: checking for pwd.h" >&5 +echo "configure:6437: checking for pwd.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 6422 "configure" +#line 6442 "configure" #include "confdefs.h" #include <pwd.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6427: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6447: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* diff --git a/src/configure.in b/src/configure.in index 41500ba15021c02423f88a3e849903e1b6eb4eb2..40ccf127f7bfd74fd83d9cf8d1a7136754695c18 100644 --- a/src/configure.in +++ b/src/configure.in @@ -255,7 +255,16 @@ AC_ARG_WITH( AC_DEFINE_UNQUOTED(DEF_PGPORT, "5432") AC_MSG_RESULT(5432) ) -dnl We exclude tcl support unless we override it with --with-tcl +dnl MAXBACKENDS can be set by --with-maxbackends. Default value is 64. +AC_MSG_CHECKING(setting MAXBACKENDS) +AC_ARG_WITH( + maxbackends, + [ --with-maxbackends=<n> set maximum number of server processes ], + AC_DEFINE_UNQUOTED(MAXBACKENDS, ${withval}) AC_MSG_RESULT($with_maxbackends), + AC_DEFINE_UNQUOTED(MAXBACKENDS, 64) AC_MSG_RESULT(64) +) + +dnl We exclude tcl support unless user says --with-tcl AC_MSG_CHECKING(setting USE_TCL) AC_ARG_WITH( tcl, diff --git a/src/include/config.h.in b/src/include/config.h.in index 41468c1d352c4cdfde8e411c1e0e1b9466894dde..ad277bd001bfd8b4bfb1c782e35378159a9e0589 100644 --- a/src/include/config.h.in +++ b/src/include/config.h.in @@ -8,6 +8,16 @@ #ifndef CONFIG_H #define CONFIG_H +/* + * Maximum number of backend server processes per postmaster. + * (Actual value is set by configure script.) + */ +#undef MAXBACKENDS + +/* + * Size of a disk block --- currently, this limits the size of a tuple. + * You can set it bigger if you need bigger tuples. + */ #define BLCKSZ 8192 /* @@ -298,7 +308,7 @@ extern void srandom(unsigned int seed); /* * DEF_PGPORT is the TCP port number on which the Postmaster listens by * default. This can be overriden by command options, environment variables, - * and the postconfig hook. (set by build script) + * and the postconfig hook. (set by configure script) */ #undef DEF_PGPORT diff --git a/src/include/storage/ipc.h b/src/include/storage/ipc.h index 09f276d256026c5c57a38dac6f69f5c3e7e65e59..76a11e5b13757302011176ee0072cb8547f01742 100644 --- a/src/include/storage/ipc.h +++ b/src/include/storage/ipc.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: ipc.h,v 1.32 1999/02/13 23:22:05 momjian Exp $ + * $Id: ipc.h,v 1.33 1999/02/19 06:06:33 tgl Exp $ * * NOTES * This file is very architecture-specific. This stuff should actually @@ -201,7 +201,7 @@ typedef enum _LockId_ /* ipci.c */ extern IPCKey SystemPortAddressCreateIPCKey(SystemPortAddress address); -extern void CreateSharedMemoryAndSemaphores(IPCKey key); +extern void CreateSharedMemoryAndSemaphores(IPCKey key, int maxBackends); extern void AttachSharedMemoryAndSemaphores(IPCKey key); #endif /* IPC_H */ diff --git a/src/include/storage/lmgr.h b/src/include/storage/lmgr.h index e2c25f2f251b2682d396dc85d9b75ee02ab96872..0e78c33de9b51f0bae8fdea790075ccfc046de63 100644 --- a/src/include/storage/lmgr.h +++ b/src/include/storage/lmgr.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: lmgr.h,v 1.17 1999/02/13 23:22:07 momjian Exp $ + * $Id: lmgr.h,v 1.18 1999/02/19 06:06:34 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -61,6 +61,6 @@ extern void XactLockTableDelete(TransactionId xid); extern void XactLockTableWait(TransactionId xid); /* proc.c */ -extern void InitProcGlobal(IPCKey key); +extern void InitProcGlobal(IPCKey key, int maxBackends); #endif /* LMGR_H */ diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h index e3a61bc9f40e31b096423002406f6e2fabd75f31..85af296a5bd668006a8ebc5966d0d0bacf7be1ea 100644 --- a/src/include/storage/lock.h +++ b/src/include/storage/lock.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: lock.h,v 1.21 1999/02/13 23:22:07 momjian Exp $ + * $Id: lock.h,v 1.22 1999/02/19 06:06:35 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -29,14 +29,13 @@ typedef int MASK; * The following defines are used to estimate how much shared * memory the lock manager is going to require. * - * NBACKENDS - The number of concurrently running backends + * MAXBACKENDS - The max number of concurrently running backends (config.h) * NLOCKS_PER_XACT - The number of unique locks acquired in a transaction * NLOCKENTS - The maximum number of lock entries in the lock table. * ---------------------- */ -#define NBACKENDS MaxBackendId -#define NLOCKS_PER_XACT 40 -#define NLOCKENTS NLOCKS_PER_XACT*NBACKENDS +#define NLOCKS_PER_XACT 40 +#define NLOCKENTS (NLOCKS_PER_XACT*MAXBACKENDS) typedef int LOCKMODE; typedef int LOCKMETHOD; diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index e58572b0c77ddf147123442fcc6cb989a1810f68..47ae31d2d0103318c8ede7697f8ef1cda669645e 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: proc.h,v 1.18 1999/02/15 03:22:37 momjian Exp $ + * $Id: proc.h,v 1.19 1999/02/19 06:06:37 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -58,19 +58,27 @@ typedef struct proc /* + * PROC_NSEMS_PER_SET is the number of semaphores in each sys-V semaphore set + * we allocate. It must be *less than* 32 (or however many bits in an int + * on your machine), or our free-semaphores bitmap won't work. You also must + * not set it higher than your kernel's SEMMSL (max semaphores per set) + * parameter, which is often around 25. * MAX_PROC_SEMS is the maximum number of per-process semaphores (those used - * by the lock mgr) we can keep track of. PROC_NSEMS_PER_SET is the number - * of semaphores in each (sys-V) semaphore set allocated. (Be careful not - * to set it to greater 32. Otherwise, the bitmap will overflow.) + * by the lock mgr) we can keep track of. It must be a multiple of + * PROC_NSEMS_PER_SET. */ -#define MAX_PROC_SEMS 128 #define PROC_NSEMS_PER_SET 16 +#define MAX_PROC_SEMS (((MAXBACKENDS-1)/PROC_NSEMS_PER_SET+1)*PROC_NSEMS_PER_SET) typedef struct procglobal { SHMEM_OFFSET freeProcs; IPCKey currKey; int32 freeSemMap[MAX_PROC_SEMS / PROC_NSEMS_PER_SET]; + /* In each freeSemMap entry, the PROC_NSEMS_PER_SET lsbs flag whether + * individual semaphores are in use, and the next higher bit is set to + * show that the entire set is allocated. + */ } PROC_HDR; extern PROC *MyProc; diff --git a/src/include/storage/sinvaladt.h b/src/include/storage/sinvaladt.h index 161e28869611f638e61878b260b96380f103442d..522eb5e220b5e6d9f0a6277ab32464e869c76d66 100644 --- a/src/include/storage/sinvaladt.h +++ b/src/include/storage/sinvaladt.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: sinvaladt.h,v 1.11 1999/02/13 23:22:10 momjian Exp $ + * $Id: sinvaladt.h,v 1.12 1999/02/19 06:06:39 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -31,7 +31,7 @@ A------------- Header info -------------- endEntryChain (offset relative to B) numEntries maxNumEntries - procState[MaxBackendId] --> limit + procState[MAXBACKENDS] --> limit resetState (bool) a tag (POSTID) B------------- Start entry section ------- @@ -44,7 +44,6 @@ C----------------End shared segment ------- */ /* Parameters (configurable) *******************************************/ -#define MaxBackendId 64 /* maximum number of backends */ #define MAXNUMMESSAGES 4000 /* maximum number of messages in seg */ @@ -71,7 +70,7 @@ typedef struct SISeg Offset endEntryChain; /* (offset relative to B) */ int numEntries; int maxNumEntries; - ProcState procState[MaxBackendId]; /* reflects the + ProcState procState[MAXBACKENDS]; /* reflects the * invalidation state */ /* here starts the entry section, controlled by offsets */ } SISeg;