From 2242f2fbd0d50546ad79e800efbc6f0a2334bd0b Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Wed, 11 Apr 2001 20:58:20 +0000 Subject: [PATCH] Unixware 7 support by Billy G. Allie (SF patch 413011) --- Lib/plat-unixware7/FCNTL.py | 77 +++ Lib/plat-unixware7/IN.py | 836 ++++++++++++++++++++++++++++++++ Lib/plat-unixware7/SOCKET.py | 267 +++++++++++ Lib/plat-unixware7/STROPTS.py | 328 +++++++++++++ Lib/plat-unixware7/TERMIOS.py | 270 +++++++++++ Lib/plat-unixware7/regen | 12 + Lib/test/test_fcntl.py | 2 +- Lib/test/test_fork1.py | 5 +- Lib/test/test_math.py | 6 +- Makefile.pre.in | 5 +- Modules/posixmodule.c | 30 ++ Modules/termios.c | 4 + config.h.in | 14 +- configure | 873 ++++++++++++++++++---------------- configure.in | 185 ++++--- 15 files changed, 2406 insertions(+), 508 deletions(-) create mode 100644 Lib/plat-unixware7/FCNTL.py create mode 100644 Lib/plat-unixware7/IN.py create mode 100644 Lib/plat-unixware7/SOCKET.py create mode 100644 Lib/plat-unixware7/STROPTS.py create mode 100644 Lib/plat-unixware7/TERMIOS.py create mode 100755 Lib/plat-unixware7/regen diff --git a/Lib/plat-unixware7/FCNTL.py b/Lib/plat-unixware7/FCNTL.py new file mode 100644 index 00000000000..ddbc9aa8754 --- /dev/null +++ b/Lib/plat-unixware7/FCNTL.py @@ -0,0 +1,77 @@ +# Generated by h2py from /usr/include/sys/fcntl.h + +# Included from sys/types.h +def quad_low(x): return x.val[0] + +ADT_EMASKSIZE = 8 +SHRT_MIN = -32768 +SHRT_MAX = 32767 +INT_MIN = (-2147483647-1) +INT_MAX = 2147483647 +LONG_MIN = (-2147483647-1) +LONG_MAX = 2147483647 +OFF32_MAX = LONG_MAX +ISTAT_ASSERTED = 0 +ISTAT_ASSUMED = 1 +ISTAT_NONE = 2 +OFF_MAX = OFF32_MAX +CLOCK_MAX = LONG_MAX +P_MYID = (-1) +P_MYHOSTID = (-1) + +# Included from sys/select.h +FD_SETSIZE = 4096 +NBBY = 8 +NULL = 0 +O_RDONLY = 0 +O_WRONLY = 1 +O_RDWR = 2 +O_NDELAY = 0x04 +O_APPEND = 0x08 +O_SYNC = 0x10 +O_NONBLOCK = 0x80 +O_LARGEFILE = 0x80000 +O_CREAT = 0x100 +O_TRUNC = 0x200 +O_EXCL = 0x400 +O_NOCTTY = 0x800 +F_DUPFD = 0 +F_GETFD = 1 +F_SETFD = 2 +F_GETFL = 3 +F_SETFL = 4 +F_GETLK = 14 +F_O_GETLK = 5 +F_GETLK = 5 +F_GETLK = 14 +F_SETLK = 6 +F_SETLKW = 7 +F_CHKFL = 8 +F_ALLOCSP = 10 +F_FREESP = 11 +F_RSETLK = 20 +F_RGETLK = 21 +F_RSETLKW = 22 +F_GETOWN = 23 +F_SETOWN = 24 +F_DUP2 = 25 +F_GETLK64 = 100 +F_SETLKW64 = 101 +F_SETLK64 = 102 +F_RSETLK64 = 103 +F_RGETLK64 = 104 +F_RSETLKW64 = 105 +F_FREESP64 = 106 +F_RDCHK = 0x6001 +F_GETLK = F_GETLK64 +F_SETLKW = F_SETLKW64 +F_SETLK = F_SETLK64 +F_RSETLK = F_RSETLK64 +F_RGETLK = F_RGETLK64 +F_RSETLKW = F_RSETLKW64 +F_FREESP = F_FREESP64 +F_RDLCK = 01 +F_WRLCK = 02 +F_UNLCK = 03 +O_ACCMODE = 3 +FD_CLOEXEC = 1 diff --git a/Lib/plat-unixware7/IN.py b/Lib/plat-unixware7/IN.py new file mode 100644 index 00000000000..3f97606751a --- /dev/null +++ b/Lib/plat-unixware7/IN.py @@ -0,0 +1,836 @@ +# Generated by h2py from /usr/include/netinet/in.h + +# Included from netinet/in_f.h +def IN_CLASSA(i): return (((long)(i) & 0x80000000) == 0) + +IN_CLASSA_NET = 0xff000000 +IN_CLASSA_NSHIFT = 24 +IN_CLASSA_HOST = 0x00ffffff +IN_CLASSA_MAX = 128 +def IN_CLASSB(i): return (((long)(i) & 0xc0000000) == 0x80000000) + +IN_CLASSB_NET = 0xffff0000 +IN_CLASSB_NSHIFT = 16 +IN_CLASSB_HOST = 0x0000ffff +IN_CLASSB_MAX = 65536 +def IN_CLASSC(i): return (((long)(i) & 0xe0000000) == 0xc0000000) + +IN_CLASSC_NET = 0xffffff00 +IN_CLASSC_NSHIFT = 8 +IN_CLASSC_HOST = 0x000000ff +def IN_CLASSD(i): return (((long)(i) & 0xf0000000) == 0xe0000000) + +IN_CLASSD_NET = 0xf0000000 +IN_CLASSD_NSHIFT = 28 +IN_CLASSD_HOST = 0x0fffffff +def IN_MULTICAST(i): return IN_CLASSD(i) + +def IN_EXPERIMENTAL(i): return (((long)(i) & 0xe0000000) == 0xe0000000) + +def IN_BADCLASS(i): return (((long)(i) & 0xf0000000) == 0xf0000000) + +INADDR_ANY = 0x00000000 +INADDR_LOOPBACK = 0x7f000001 +INADDR_BROADCAST = 0xffffffff +INADDR_NONE = 0xffffffff +IN_LOOPBACKNET = 127 +INADDR_UNSPEC_GROUP = 0xe0000000 +INADDR_ALLHOSTS_GROUP = 0xe0000001 +INADDR_ALLRTRS_GROUP = 0xe0000002 +INADDR_MAX_LOCAL_GROUP = 0xe00000ff + +# Included from netinet/in6.h + +# Included from sys/types.h +def quad_low(x): return x.val[0] + +ADT_EMASKSIZE = 8 +SHRT_MIN = -32768 +SHRT_MAX = 32767 +INT_MIN = (-2147483647-1) +INT_MAX = 2147483647 +LONG_MIN = (-2147483647-1) +LONG_MAX = 2147483647 +OFF32_MAX = LONG_MAX +ISTAT_ASSERTED = 0 +ISTAT_ASSUMED = 1 +ISTAT_NONE = 2 +OFF_MAX = OFF32_MAX +CLOCK_MAX = LONG_MAX +P_MYID = (-1) +P_MYHOSTID = (-1) + +# Included from sys/select.h +FD_SETSIZE = 4096 +NBBY = 8 +NULL = 0 + +# Included from sys/bitypes.h + +# Included from netinet/in6_f.h +def IN6_IS_ADDR_UNSPECIFIED(a): return IN6_ADDR_EQUAL_L(a, 0, 0, 0, 0) + +def IN6_SET_ADDR_UNSPECIFIED(a): return IN6_ADDR_COPY_L(a, 0, 0, 0, 0) + +def IN6_IS_ADDR_ANY(a): return IN6_ADDR_EQUAL_L(a, 0, 0, 0, 0) + +def IN6_SET_ADDR_ANY(a): return IN6_ADDR_COPY_L(a, 0, 0, 0, 0) + +def IN6_IS_ADDR_LOOPBACK(a): return IN6_ADDR_EQUAL_L(a, 0, 0, 0, 0x01000000) + +def IN6_SET_ADDR_LOOPBACK(a): return IN6_ADDR_COPY_L(a, 0, 0, 0, 0x01000000) + +IN6_MC_FLAG_PERMANENT = 0x0 +IN6_MC_FLAG_TRANSIENT = 0x1 +IN6_MC_SCOPE_NODELOCAL = 0x1 +IN6_MC_SCOPE_LINKLOCAL = 0x2 +IN6_MC_SCOPE_SITELOCAL = 0x5 +IN6_MC_SCOPE_ORGLOCAL = 0x8 +IN6_MC_SCOPE_GLOBAL = 0xE +def IN6_IS_ADDR_MC_NODELOCAL(a): return \ + +def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ + +def IN6_IS_ADDR_MC_SITELOCAL(a): return \ + +def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ + +def IN6_IS_ADDR_MC_GLOBAL(a): return \ + + +# Included from sys/convsa.h +__NETLIB_UW211_SVR4 = 1 +__NETLIB_UW211_XPG4 = 2 +__NETLIB_GEMINI_SVR4 = 3 +__NETLIB_GEMINI_XPG4 = 4 +__NETLIB_FP1_SVR4 = 5 +__NETLIB_FP1_XPG4 = 6 +__NETLIB_BASE_VERSION__ = __NETLIB_UW211_SVR4 +__NETLIB_VERSION__ = __NETLIB_FP1_SVR4 +__NETLIB_VERSION__ = __NETLIB_FP1_XPG4 +__NETLIB_VERSION__ = __NETLIB_GEMINI_SVR4 +__NETLIB_VERSION__ = __NETLIB_GEMINI_XPG4 +__NETLIB_VERSION__ = __NETLIB_UW211_SVR4 +__NETLIB_VERSION__ = __NETLIB_UW211_XPG4 +__NETLIB_VERSION__ = __NETLIB_FP1_XPG4 + +# Included from sys/byteorder.h +LITTLE_ENDIAN = 1234 +BIG_ENDIAN = 4321 +PDP_ENDIAN = 3412 + +# Included from sys/byteorder_f.h +BYTE_ORDER = LITTLE_ENDIAN +def htonl(hl): return __htonl(hl) + +def ntohl(nl): return __ntohl(nl) + +def htons(hs): return __htons(hs) + +def ntohs(ns): return __ntohs(ns) + +def ntohl(x): return (x) + +def ntohs(x): return (x) + +def htonl(x): return (x) + +def htons(x): return (x) + +def __NETLIB_VERSION_IS_XPG4(version): return (((version) % 2) == 0) + +def __NETLIB_VERSION_HAS_SALEN(version): return ((version) >= __NETLIB_GEMINI_SVR4) + +def __NETLIB_VERSION_IS_IKS(version): return ((version) >= __NETLIB_FP1_SVR4) + +def SA_FAMILY_GET(sa): return \ + +INET6_ADDRSTRLEN = 46 +IPV6_UNICAST_HOPS = 3 +IPV6_ADDRFORM = 24 +IPV6_MULTICAST_HOPS = 25 +IPV6_MULTICAST_IF = 26 +IPV6_MULTICAST_LOOP = 27 +IPV6_ADD_MEMBERSHIP = 28 +IPV6_DROP_MEMBERSHIP = 29 + +# Included from sys/insrem.h +def LIST_INIT(head): return \ + +def LIST_INIT(head): return \ + +def remque(a): return REMQUE(a) + + +# Included from sys/socket.h + +# Included from sys/uio.h +SHUT_RD = 0 +SHUT_WR = 1 +SHUT_RDWR = 2 + +# Included from sys/netconfig.h + +# Included from sys/cdefs.h +def __P(protos): return protos + +def __STRING(x): return #x + +def __P(protos): return () + +def __STRING(x): return "x" + +NETCONFIG = "/etc/netconfig" +NETPATH = "NETPATH" +NC_TPI_CLTS = 1 +NC_TPI_COTS = 2 +NC_TPI_COTS_ORD = 3 +NC_TPI_RAW = 4 +NC_NOFLAG = 00 +NC_VISIBLE = 01 +NC_BROADCAST = 02 +NC_NOPROTOFMLY = "-" +NC_LOOPBACK = "loopback" +NC_INET = "inet" +NC_INET6 = "inet6" +NC_IMPLINK = "implink" +NC_PUP = "pup" +NC_CHAOS = "chaos" +NC_NS = "ns" +NC_NBS = "nbs" +NC_ECMA = "ecma" +NC_DATAKIT = "datakit" +NC_CCITT = "ccitt" +NC_SNA = "sna" +NC_DECNET = "decnet" +NC_DLI = "dli" +NC_LAT = "lat" +NC_HYLINK = "hylink" +NC_APPLETALK = "appletalk" +NC_NIT = "nit" +NC_IEEE802 = "ieee802" +NC_OSI = "osi" +NC_X25 = "x25" +NC_OSINET = "osinet" +NC_GOSIP = "gosip" +NC_NETWARE = "netware" +NC_NOPROTO = "-" +NC_TCP = "tcp" +NC_UDP = "udp" +NC_ICMP = "icmp" +NC_IPX = "ipx" +NC_SPX = "spx" +NC_TPI_CLTS = 1 +NC_TPI_COTS = 2 +NC_TPI_COTS_ORD = 3 +NC_TPI_RAW = 4 +SOCK_STREAM = 2 +SOCK_DGRAM = 1 +SOCK_RAW = 4 +SOCK_RDM = 5 +SOCK_SEQPACKET = 6 +SO_DEBUG = 0x0001 +SO_ACCEPTCONN = 0x0002 +SO_REUSEADDR = 0x0004 +SO_KEEPALIVE = 0x0008 +SO_DONTROUTE = 0x0010 +SO_BROADCAST = 0x0020 +SO_USELOOPBACK = 0x0040 +SO_LINGER = 0x0080 +SO_OOBINLINE = 0x0100 +SO_ORDREL = 0x0200 +SO_IMASOCKET = 0x0400 +SO_MGMT = 0x0800 +SO_REUSEPORT = 0x1000 +SO_LISTENING = 0x2000 +SO_RDWR = 0x4000 +SO_SEMA = 0x8000 +SO_DONTLINGER = (~SO_LINGER) +SO_SNDBUF = 0x1001 +SO_RCVBUF = 0x1002 +SO_SNDLOWAT = 0x1003 +SO_RCVLOWAT = 0x1004 +SO_SNDTIMEO = 0x1005 +SO_RCVTIMEO = 0x1006 +SO_ERROR = 0x1007 +SO_TYPE = 0x1008 +SO_PROTOTYPE = 0x1009 +SO_ALLRAW = 0x100a +SOL_SOCKET = 0xffff +AF_UNSPEC = 0 +AF_UNIX = 1 +AF_LOCAL = AF_UNIX +AF_INET = 2 +AF_IMPLINK = 3 +AF_PUP = 4 +AF_CHAOS = 5 +AF_NS = 6 +AF_NBS = 7 +AF_ECMA = 8 +AF_DATAKIT = 9 +AF_CCITT = 10 +AF_SNA = 11 +AF_DECnet = 12 +AF_DLI = 13 +AF_LAT = 14 +AF_HYLINK = 15 +AF_APPLETALK = 16 +AF_NIT = 17 +AF_802 = 18 +AF_OSI = 19 +AF_ISO = AF_OSI +AF_X25 = 20 +AF_OSINET = 21 +AF_GOSIP = 22 +AF_YNET = 23 +AF_ROUTE = 24 +AF_LINK = 25 +pseudo_AF_XTP = 26 +AF_INET6 = 27 +AF_MAX = 27 +AF_INET_BSWAP = 0x0200 +PF_UNSPEC = AF_UNSPEC +PF_UNIX = AF_UNIX +PF_LOCAL = AF_LOCAL +PF_INET = AF_INET +PF_IMPLINK = AF_IMPLINK +PF_PUP = AF_PUP +PF_CHAOS = AF_CHAOS +PF_NS = AF_NS +PF_NBS = AF_NBS +PF_ECMA = AF_ECMA +PF_DATAKIT = AF_DATAKIT +PF_CCITT = AF_CCITT +PF_SNA = AF_SNA +PF_DECnet = AF_DECnet +PF_DLI = AF_DLI +PF_LAT = AF_LAT +PF_HYLINK = AF_HYLINK +PF_APPLETALK = AF_APPLETALK +PF_NIT = AF_NIT +PF_802 = AF_802 +PF_OSI = AF_OSI +PF_ISO = PF_OSI +PF_X25 = AF_X25 +PF_OSINET = AF_OSINET +PF_GOSIP = AF_GOSIP +PF_YNET = AF_YNET +PF_ROUTE = AF_ROUTE +PF_LINK = AF_LINK +pseudo_PF_XTP = pseudo_AF_XTP +PF_INET6 = AF_INET6 +PF_MAX = AF_MAX +SOMAXCONN = 5 +SCM_RIGHTS = 1 +MSG_OOB = 0x1 +MSG_PEEK = 0x2 +MSG_DONTROUTE = 0x4 +MSG_CTRUNC = 0x8 +MSG_TRUNC = 0x10 +MSG_EOR = 0x30 +MSG_WAITALL = 0x20 +MSG_MAXIOVLEN = 16 +def OPTLEN(x): return ((((x) + sizeof(long) - 1) / sizeof(long)) * sizeof(long)) + +GIARG = 0x1 +CONTI = 0x2 +GITAB = 0x4 +SOCKETSYS = 88 +SOCKETSYS = 83 +SO_ACCEPT = 1 +SO_BIND = 2 +SO_CONNECT = 3 +SO_GETPEERNAME = 4 +SO_GETSOCKNAME = 5 +SO_GETSOCKOPT = 6 +SO_LISTEN = 7 +SO_RECV = 8 +SO_RECVFROM = 9 +SO_SEND = 10 +SO_SENDTO = 11 +SO_SETSOCKOPT = 12 +SO_SHUTDOWN = 13 +SO_SOCKET = 14 +SO_SOCKPOLL = 15 +SO_GETIPDOMAIN = 16 +SO_SETIPDOMAIN = 17 +SO_ADJTIME = 18 + +# Included from sys/stream.h + +# Included from sys/cred.h + +# Included from sys/ksynch.h + +# Included from sys/dl.h +SIGNBIT = 0x80000000 + +# Included from sys/ipl.h + +# Included from sys/disp_p.h + +# Included from sys/trap.h +DIVERR = 0 +SGLSTP = 1 +NMIFLT = 2 +BPTFLT = 3 +INTOFLT = 4 +BOUNDFLT = 5 +INVOPFLT = 6 +NOEXTFLT = 7 +DBLFLT = 8 +EXTOVRFLT = 9 +INVTSSFLT = 10 +SEGNPFLT = 11 +STKFLT = 12 +GPFLT = 13 +PGFLT = 14 +EXTERRFLT = 16 +ALIGNFLT = 17 +MCEFLT = 18 +USERFLT = 0x100 +TRP_PREEMPT = 0x200 +TRP_UNUSED = 0x201 +PF_ERR_MASK = 0x01 +PF_ERR_PAGE = 0 +PF_ERR_PROT = 1 +PF_ERR_WRITE = 2 +PF_ERR_USER = 4 +EVT_STRSCHED = 0x04 +EVT_GLOBCALLOUT = 0x08 +EVT_LCLCALLOUT = 0x10 +EVT_SOFTINTMASK = (EVT_STRSCHED|EVT_GLOBCALLOUT|EVT_LCLCALLOUT) +PL0 = 0 +PL1 = 1 +PL2 = 2 +PL3 = 3 +PL4 = 4 +PL5 = 5 +PL6 = 6 +PLHI = 8 +PL7 = PLHI +PLBASE = PL0 +PLTIMEOUT = PL1 +PLDISK = PL5 +PLSTR = PL6 +PLTTY = PLSTR +PLMIN = PL0 +PLMIN = PL1 +MAX_INTR_LEVELS = 10 +MAX_INTR_NESTING = 50 +STRSCHED = EVT_STRSCHED +GLOBALSOFTINT = EVT_GLOBCALLOUT +LOCALSOFTINT = EVT_LCLCALLOUT + +# Included from sys/ksynch_p.h +def GET_TIME(timep): return \ + +LK_THRESHOLD = 500000 + +# Included from sys/list.h + +# Included from sys/listasm.h +def remque_null(e): return \ + +def LS_ISEMPTY(listp): return \ + +LK_BASIC = 0x1 +LK_SLEEP = 0x2 +LK_NOSTATS = 0x4 +def CYCLES_SINCE(c): return CYCLES_BETWEEN((c), CYCLES()) + +LSB_NLKDS = 92 +EVT_RUNRUN = 0x01 +EVT_KPRUNRUN = 0x02 +SP_UNLOCKED = 0 +SP_LOCKED = 1 +KS_LOCKTEST = 0x01 +KS_MPSTATS = 0x02 +KS_DEINITED = 0x04 +KS_NVLTTRACE = 0x08 +RWS_READ = (ord('r')) +RWS_WRITE = (ord('w')) +RWS_UNLOCKED = (ord('u')) +RWS_BUSY = (ord('b')) +def SLEEP_LOCKOWNED(lkp): return \ + +def SLEEP_DISOWN(lkp): return \ + +KS_NOPRMPT = 0x00000001 +__KS_LOCKTEST = KS_LOCKTEST +__KS_LOCKTEST = 0 +__KS_MPSTATS = KS_MPSTATS +__KS_MPSTATS = 0 +__KS_NVLTTRACE = KS_NVLTTRACE +__KS_NVLTTRACE = 0 +KSFLAGS = (__KS_LOCKTEST|__KS_MPSTATS|__KS_NVLTTRACE) +KSVUNIPROC = 1 +KSVMPDEBUG = 2 +KSVMPNODEBUG = 3 +KSVFLAG = KSVUNIPROC +KSVFLAG = KSVMPDEBUG +KSVFLAG = KSVMPNODEBUG + +# Included from sys/ksinline.h +_A_SP_LOCKED = 1 +_A_SP_UNLOCKED = 0 +_A_INVPL = -1 +def _ATOMIC_INT_INCR(atomic_intp): return \ + +def _ATOMIC_INT_DECR(atomic_intp): return \ + +def ATOMIC_INT_READ(atomic_intp): return _ATOMIC_INT_READ(atomic_intp) + +def ATOMIC_INT_INCR(atomic_intp): return _ATOMIC_INT_INCR(atomic_intp) + +def ATOMIC_INT_DECR(atomic_intp): return _ATOMIC_INT_DECR(atomic_intp) + +def FSPIN_INIT(lp): return + +def FSPIN_LOCK(l): return DISABLE() + +def FSPIN_TRYLOCK(l): return (DISABLE(), B_TRUE) + +def FSPIN_UNLOCK(l): return ENABLE() + +def LOCK_DEINIT(lp): return + +def LOCK_DEALLOC(lp): return + +def LOCK_OWNED(lp): return (B_TRUE) + +def RW_DEINIT(lp): return + +def RW_DEALLOC(lp): return + +def RW_OWNED(lp): return (B_TRUE) + +def IS_LOCKED(lockp): return B_FALSE + +def LOCK_PLMIN(lockp): return \ + +def TRYLOCK_PLMIN(lockp): return LOCK_PLMIN(lockp) + +def LOCK_SH_PLMIN(lockp): return LOCK_PLMIN(lockp) + +def RW_RDLOCK_PLMIN(lockp): return LOCK_PLMIN(lockp) + +def RW_WRLOCK_PLMIN(lockp): return LOCK_PLMIN(lockp) + +def LOCK_DEINIT(l): return + +def LOCK_PLMIN(lockp): return LOCK((lockp), PLMIN) + +def TRYLOCK_PLMIN(lockp): return TRYLOCK((lockp), PLMIN) + +def LOCK_SH_PLMIN(lockp): return LOCK_SH((lockp), PLMIN) + +def RW_RDLOCK_PLMIN(lockp): return RW_RDLOCK((lockp), PLMIN) + +def RW_WRLOCK_PLMIN(lockp): return RW_WRLOCK((lockp), PLMIN) + +def FSPIN_IS_LOCKED(fsp): return B_FALSE + +def SPIN_IS_LOCKED(lockp): return B_FALSE + +def FSPIN_OWNED(l): return (B_TRUE) + +CR_MLDREAL = 0x00000001 +CR_RDUMP = 0x00000002 +def crhold(credp): return crholdn((credp), 1) + +def crfree(credp): return crfreen((credp), 1) + + +# Included from sys/strmdep.h +def str_aligned(X): return (((uint)(X) & (sizeof(int) - 1)) == 0) + + +# Included from sys/engine.h + +# Included from sys/clock.h + +# Included from sys/time.h +DST_NONE = 0 +DST_USA = 1 +DST_AUST = 2 +DST_WET = 3 +DST_MET = 4 +DST_EET = 5 +DST_CAN = 6 +DST_GB = 7 +DST_RUM = 8 +DST_TUR = 9 +DST_AUSTALT = 10 +ITIMER_REAL = 0 +ITIMER_VIRTUAL = 1 +ITIMER_PROF = 2 +FD_SETSIZE = 4096 +FD_NBBY = 8 + +# Included from time.h +NULL = 0 +CLOCKS_PER_SEC = 1000000 + +# Included from sys/clock_p.h +CGBITS = 4 +IDBITS = 28 +def toid_unpackcg(idval): return (((idval) >> IDBITS) & 0xf) + +def toid_unpackid(idval): return ((idval) & 0xfffffff) + +def toid_unpackcg(idval): return 0 + +def toid_unpackid(idval): return (idval) + +NCALLOUT_HASH = 1024 +CALLOUT_MAXVAL = 0x7fffffff +TO_PERIODIC = 0x80000000 +TO_IMMEDIATE = 0x80000000 +SEC = 1 +MILLISEC = 1000 +MICROSEC = 1000000 +NANOSEC = 1000000000 +SECHR = (60*60) +SECDAY = (24*SECHR) +SECYR = (365*SECDAY) +def TIME_OWNED_R(cgnum): return (B_TRUE) + +LOOPSECONDS = 1800 +LOOPMICROSECONDS = (LOOPSECONDS * MICROSEC) +def TICKS_SINCE(t): return TICKS_BETWEEN(t, TICKS()) + +MAXRQS = 2 +E_OFFLINE = 0x01 +E_BAD = 0x02 +E_SHUTDOWN = 0x04 +E_DRIVER = 0x08 +E_DEFAULTKEEP = 0x100 +E_DRIVERBOUND = 0x200 +E_EXCLUSIVE = 0x400 +E_CGLEADER = 0x800 +E_NOWAY = (E_OFFLINE|E_BAD|E_SHUTDOWN) +E_BOUND = 0x01 +E_GLOBAL = 0x00 +E_UNAVAIL = -1 +ENGINE_ONLINE = 1 +def PROCESSOR_UNMAP(e): return ((e) - engine) + +BOOTENG = 0 +QMOVED = 0x0001 +QWANTR = 0x0002 +QWANTW = 0x0004 +QFULL = 0x0008 +QREADR = 0x0010 +QUSE = 0x0020 +QNOENB = 0x0040 +QUP = 0x0080 +QBACK = 0x0100 +QINTER = 0x0200 +QPROCSON = 0x0400 +QTOENAB = 0x0800 +QFREEZE = 0x1000 +QBOUND = 0x2000 +QDEFCNT = 0x4000 +QENAB = 0x0001 +QSVCBUSY = 0x0002 +STRM_PUTCNT_TABLES = 31 +def STRM_MYENG_PUTCNT(sdp): return STRM_PUTCNT(l.eng_num, sdp) + +QB_FULL = 0x01 +QB_WANTW = 0x02 +QB_BACK = 0x04 +NBAND = 256 +DB_WASDUPED = 0x1 +DB_2PIECE = 0x2 +STRLEAKHASHSZ = 1021 +MSGMARK = 0x01 +MSGNOLOOP = 0x02 +MSGDELIM = 0x04 +MSGNOGET = 0x08 +MSGLOG = 0x10 +M_DATA = 0x00 +M_PROTO = 0x01 +M_BREAK = 0x08 +M_PASSFP = 0x09 +M_SIG = 0x0b +M_DELAY = 0x0c +M_CTL = 0x0d +M_IOCTL = 0x0e +M_SETOPTS = 0x10 +M_RSE = 0x11 +M_TRAIL = 0x12 +M_IOCACK = 0x81 +M_IOCNAK = 0x82 +M_PCPROTO = 0x83 +M_PCSIG = 0x84 +M_READ = 0x85 +M_FLUSH = 0x86 +M_STOP = 0x87 +M_START = 0x88 +M_HANGUP = 0x89 +M_ERROR = 0x8a +M_COPYIN = 0x8b +M_COPYOUT = 0x8c +M_IOCDATA = 0x8d +M_PCRSE = 0x8e +M_STOPI = 0x8f +M_STARTI = 0x90 +M_PCCTL = 0x91 +M_PCSETOPTS = 0x92 +QNORM = 0x00 +QPCTL = 0x80 +STRCANON = 0x01 +RECOPY = 0x02 +SO_ALL = 0x003f +SO_READOPT = 0x0001 +SO_WROFF = 0x0002 +SO_MINPSZ = 0x0004 +SO_MAXPSZ = 0x0008 +SO_HIWAT = 0x0010 +SO_LOWAT = 0x0020 +SO_MREADON = 0x0040 +SO_MREADOFF = 0x0080 +SO_NDELON = 0x0100 +SO_NDELOFF = 0x0200 +SO_ISTTY = 0x0400 +SO_ISNTTY = 0x0800 +SO_TOSTOP = 0x1000 +SO_TONSTOP = 0x2000 +SO_BAND = 0x4000 +SO_DELIM = 0x8000 +SO_NODELIM = 0x010000 +SO_STRHOLD = 0x020000 +SO_LOOP = 0x040000 +DRVOPEN = 0x0 +MODOPEN = 0x1 +CLONEOPEN = 0x2 +OPENFAIL = -1 +BPRI_LO = 1 +BPRI_MED = 2 +BPRI_HI = 3 +INFPSZ = -1 +FLUSHALL = 1 +FLUSHDATA = 0 +STRHIGH = 5120 +STRLOW = 1024 +MAXIOCBSZ = 1024 +def straln(a): return (caddr_t)((long)(a) & ~(sizeof(int)-1)) + +IPM_ID = 200 +ICMPM_ID = 201 +TCPM_ID = 202 +UDPM_ID = 203 +ARPM_ID = 204 +APPM_ID = 205 +RIPM_ID = 206 +PPPM_ID = 207 +AHDLCM_ID = 208 +MHDLCRIPM_ID = 209 +HDLCM_ID = 210 +PPCID_ID = 211 +IGMPM_ID = 212 +IPIPM_ID = 213 +IPPROTO_IP = 0 +IPPROTO_HOPOPTS = 0 +IPPROTO_ICMP = 1 +IPPROTO_IGMP = 2 +IPPROTO_GGP = 3 +IPPROTO_IPIP = 4 +IPPROTO_TCP = 6 +IPPROTO_EGP = 8 +IPPROTO_PUP = 12 +IPPROTO_UDP = 17 +IPPROTO_IDP = 22 +IPPROTO_TP = 29 +IPPROTO_IPV6 = 41 +IPPROTO_ROUTING = 43 +IPPROTO_FRAGMENT = 44 +IPPROTO_ESP = 50 +IPPROTO_AH = 51 +IPPROTO_ICMPV6 = 58 +IPPROTO_NONE = 59 +IPPROTO_DSTOPTS = 60 +IPPROTO_HELLO = 63 +IPPROTO_ND = 77 +IPPROTO_EON = 80 +IPPROTO_RAW = 255 +IPPROTO_MAX = 256 +IPPORT_ECHO = 7 +IPPORT_DISCARD = 9 +IPPORT_SYSTAT = 11 +IPPORT_DAYTIME = 13 +IPPORT_NETSTAT = 15 +IPPORT_FTP = 21 +IPPORT_TELNET = 23 +IPPORT_SMTP = 25 +IPPORT_TIMESERVER = 37 +IPPORT_NAMESERVER = 42 +IPPORT_WHOIS = 43 +IPPORT_MTP = 57 +IPPORT_TFTP = 69 +IPPORT_RJE = 77 +IPPORT_FINGER = 79 +IPPORT_TTYLINK = 87 +IPPORT_SUPDUP = 95 +IPPORT_EXECSERVER = 512 +IPPORT_LOGINSERVER = 513 +IPPORT_CMDSERVER = 514 +IPPORT_EFSSERVER = 520 +IPPORT_BIFFUDP = 512 +IPPORT_WHOSERVER = 513 +IPPORT_ROUTESERVER = 520 +IPPORT_RESERVED = 1024 +IPPORT_USERRESERVED = 65535 +IPPORT_RESERVED_LOW = 512 +IPPORT_RESERVED_HIGH = 1023 +IPPORT_USERRESERVED_LOW = 32768 +IPPORT_USERRESERVED_HIGH = 65535 +INET_ADDRSTRLEN = 16 +IP_OPTIONS = 1 +IP_TOS = 2 +IP_TTL = 3 +IP_HDRINCL = 4 +IP_RECVOPTS = 5 +IP_RECVRETOPTS = 6 +IP_RECVDSTADDR = 7 +IP_RETOPTS = 8 +IP_MULTICAST_IF = 9 +IP_MULTICAST_LOOP = 10 +IP_ADD_MEMBERSHIP = 11 +IP_DROP_MEMBERSHIP = 12 +IP_BROADCAST_IF = 14 +IP_RECVIFINDEX = 15 +IP_MULTICAST_TTL = 16 +MRT_INIT = 17 +MRT_DONE = 18 +MRT_ADD_VIF = 19 +MRT_DEL_VIF = 20 +MRT_ADD_MFC = 21 +MRT_DEL_MFC = 22 +MRT_VERSION = 23 +IP_DEFAULT_MULTICAST_TTL = 1 +IP_DEFAULT_MULTICAST_LOOP = 1 +IP_MAX_MEMBERSHIPS = 20 +INADDR_UNSPEC_GROUP = 0xe0000000 +INADDR_ALLHOSTS_GROUP = 0xe0000001 +INADDR_ALLRTRS_GROUP = 0xe0000002 +INADDR_MAX_LOCAL_GROUP = 0xe00000ff + +# Included from netinet/in_mp.h + +# Included from netinet/in_mp_ddi.h + +# Included from sys/inline.h +IP_HIER_BASE = (20) +def ASSERT_LOCK(x): return + +def ASSERT_WRLOCK(x): return + +def ASSERT_UNLOCK(x): return + +def CANPUT(q): return canput((q)) + +def CANPUTNEXT(q): return canputnext((q)) + +INET_DEBUG = 1 diff --git a/Lib/plat-unixware7/SOCKET.py b/Lib/plat-unixware7/SOCKET.py new file mode 100644 index 00000000000..fe093a132f5 --- /dev/null +++ b/Lib/plat-unixware7/SOCKET.py @@ -0,0 +1,267 @@ +# Generated by h2py from /usr/include/sys/socket.h + +# Included from sys/byteorder.h +LITTLE_ENDIAN = 1234 +BIG_ENDIAN = 4321 +PDP_ENDIAN = 3412 + +# Included from sys/byteorder_f.h +BYTE_ORDER = LITTLE_ENDIAN +def htonl(hl): return __htonl(hl) + +def ntohl(nl): return __ntohl(nl) + +def htons(hs): return __htons(hs) + +def ntohs(ns): return __ntohs(ns) + +def ntohl(x): return (x) + +def ntohs(x): return (x) + +def htonl(x): return (x) + +def htons(x): return (x) + + +# Included from sys/types.h +def quad_low(x): return x.val[0] + +ADT_EMASKSIZE = 8 +SHRT_MIN = -32768 +SHRT_MAX = 32767 +INT_MIN = (-2147483647-1) +INT_MAX = 2147483647 +LONG_MIN = (-2147483647-1) +LONG_MAX = 2147483647 +OFF32_MAX = LONG_MAX +ISTAT_ASSERTED = 0 +ISTAT_ASSUMED = 1 +ISTAT_NONE = 2 +OFF_MAX = OFF32_MAX +CLOCK_MAX = LONG_MAX +P_MYID = (-1) +P_MYHOSTID = (-1) + +# Included from sys/select.h +FD_SETSIZE = 4096 +NBBY = 8 +NULL = 0 + +# Included from sys/bitypes.h + +# Included from sys/convsa.h +__NETLIB_UW211_SVR4 = 1 +__NETLIB_UW211_XPG4 = 2 +__NETLIB_GEMINI_SVR4 = 3 +__NETLIB_GEMINI_XPG4 = 4 +__NETLIB_FP1_SVR4 = 5 +__NETLIB_FP1_XPG4 = 6 +__NETLIB_BASE_VERSION__ = __NETLIB_UW211_SVR4 +__NETLIB_VERSION__ = __NETLIB_FP1_SVR4 +__NETLIB_VERSION__ = __NETLIB_FP1_XPG4 +__NETLIB_VERSION__ = __NETLIB_GEMINI_SVR4 +__NETLIB_VERSION__ = __NETLIB_GEMINI_XPG4 +__NETLIB_VERSION__ = __NETLIB_UW211_SVR4 +__NETLIB_VERSION__ = __NETLIB_UW211_XPG4 +__NETLIB_VERSION__ = __NETLIB_FP1_XPG4 +def __NETLIB_VERSION_IS_XPG4(version): return (((version) % 2) == 0) + +def __NETLIB_VERSION_HAS_SALEN(version): return ((version) >= __NETLIB_GEMINI_SVR4) + +def __NETLIB_VERSION_IS_IKS(version): return ((version) >= __NETLIB_FP1_SVR4) + +def SA_FAMILY_GET(sa): return \ + + +# Included from sys/uio.h +SHUT_RD = 0 +SHUT_WR = 1 +SHUT_RDWR = 2 + +# Included from sys/netconfig.h + +# Included from sys/cdefs.h +def __P(protos): return protos + +def __STRING(x): return #x + +def __P(protos): return () + +def __STRING(x): return "x" + +NETCONFIG = "/etc/netconfig" +NETPATH = "NETPATH" +NC_TPI_CLTS = 1 +NC_TPI_COTS = 2 +NC_TPI_COTS_ORD = 3 +NC_TPI_RAW = 4 +NC_NOFLAG = 00 +NC_VISIBLE = 01 +NC_BROADCAST = 02 +NC_NOPROTOFMLY = "-" +NC_LOOPBACK = "loopback" +NC_INET = "inet" +NC_INET6 = "inet6" +NC_IMPLINK = "implink" +NC_PUP = "pup" +NC_CHAOS = "chaos" +NC_NS = "ns" +NC_NBS = "nbs" +NC_ECMA = "ecma" +NC_DATAKIT = "datakit" +NC_CCITT = "ccitt" +NC_SNA = "sna" +NC_DECNET = "decnet" +NC_DLI = "dli" +NC_LAT = "lat" +NC_HYLINK = "hylink" +NC_APPLETALK = "appletalk" +NC_NIT = "nit" +NC_IEEE802 = "ieee802" +NC_OSI = "osi" +NC_X25 = "x25" +NC_OSINET = "osinet" +NC_GOSIP = "gosip" +NC_NETWARE = "netware" +NC_NOPROTO = "-" +NC_TCP = "tcp" +NC_UDP = "udp" +NC_ICMP = "icmp" +NC_IPX = "ipx" +NC_SPX = "spx" +NC_TPI_CLTS = 1 +NC_TPI_COTS = 2 +NC_TPI_COTS_ORD = 3 +NC_TPI_RAW = 4 +SOCK_STREAM = 2 +SOCK_DGRAM = 1 +SOCK_RAW = 4 +SOCK_RDM = 5 +SOCK_SEQPACKET = 6 +SO_DEBUG = 0x0001 +SO_ACCEPTCONN = 0x0002 +SO_REUSEADDR = 0x0004 +SO_KEEPALIVE = 0x0008 +SO_DONTROUTE = 0x0010 +SO_BROADCAST = 0x0020 +SO_USELOOPBACK = 0x0040 +SO_LINGER = 0x0080 +SO_OOBINLINE = 0x0100 +SO_ORDREL = 0x0200 +SO_IMASOCKET = 0x0400 +SO_MGMT = 0x0800 +SO_REUSEPORT = 0x1000 +SO_LISTENING = 0x2000 +SO_RDWR = 0x4000 +SO_SEMA = 0x8000 +SO_DONTLINGER = (~SO_LINGER) +SO_SNDBUF = 0x1001 +SO_RCVBUF = 0x1002 +SO_SNDLOWAT = 0x1003 +SO_RCVLOWAT = 0x1004 +SO_SNDTIMEO = 0x1005 +SO_RCVTIMEO = 0x1006 +SO_ERROR = 0x1007 +SO_TYPE = 0x1008 +SO_PROTOTYPE = 0x1009 +SO_ALLRAW = 0x100a +SOL_SOCKET = 0xffff +AF_UNSPEC = 0 +AF_UNIX = 1 +AF_LOCAL = AF_UNIX +AF_INET = 2 +AF_IMPLINK = 3 +AF_PUP = 4 +AF_CHAOS = 5 +AF_NS = 6 +AF_NBS = 7 +AF_ECMA = 8 +AF_DATAKIT = 9 +AF_CCITT = 10 +AF_SNA = 11 +AF_DECnet = 12 +AF_DLI = 13 +AF_LAT = 14 +AF_HYLINK = 15 +AF_APPLETALK = 16 +AF_NIT = 17 +AF_802 = 18 +AF_OSI = 19 +AF_ISO = AF_OSI +AF_X25 = 20 +AF_OSINET = 21 +AF_GOSIP = 22 +AF_YNET = 23 +AF_ROUTE = 24 +AF_LINK = 25 +pseudo_AF_XTP = 26 +AF_INET6 = 27 +AF_MAX = 27 +AF_INET_BSWAP = 0x0200 +PF_UNSPEC = AF_UNSPEC +PF_UNIX = AF_UNIX +PF_LOCAL = AF_LOCAL +PF_INET = AF_INET +PF_IMPLINK = AF_IMPLINK +PF_PUP = AF_PUP +PF_CHAOS = AF_CHAOS +PF_NS = AF_NS +PF_NBS = AF_NBS +PF_ECMA = AF_ECMA +PF_DATAKIT = AF_DATAKIT +PF_CCITT = AF_CCITT +PF_SNA = AF_SNA +PF_DECnet = AF_DECnet +PF_DLI = AF_DLI +PF_LAT = AF_LAT +PF_HYLINK = AF_HYLINK +PF_APPLETALK = AF_APPLETALK +PF_NIT = AF_NIT +PF_802 = AF_802 +PF_OSI = AF_OSI +PF_ISO = PF_OSI +PF_X25 = AF_X25 +PF_OSINET = AF_OSINET +PF_GOSIP = AF_GOSIP +PF_YNET = AF_YNET +PF_ROUTE = AF_ROUTE +PF_LINK = AF_LINK +pseudo_PF_XTP = pseudo_AF_XTP +PF_INET6 = AF_INET6 +PF_MAX = AF_MAX +SOMAXCONN = 5 +SCM_RIGHTS = 1 +MSG_OOB = 0x1 +MSG_PEEK = 0x2 +MSG_DONTROUTE = 0x4 +MSG_CTRUNC = 0x8 +MSG_TRUNC = 0x10 +MSG_EOR = 0x30 +MSG_WAITALL = 0x20 +MSG_MAXIOVLEN = 16 +def OPTLEN(x): return ((((x) + sizeof(long) - 1) / sizeof(long)) * sizeof(long)) + +GIARG = 0x1 +CONTI = 0x2 +GITAB = 0x4 +SOCKETSYS = 88 +SOCKETSYS = 83 +SO_ACCEPT = 1 +SO_BIND = 2 +SO_CONNECT = 3 +SO_GETPEERNAME = 4 +SO_GETSOCKNAME = 5 +SO_GETSOCKOPT = 6 +SO_LISTEN = 7 +SO_RECV = 8 +SO_RECVFROM = 9 +SO_SEND = 10 +SO_SENDTO = 11 +SO_SETSOCKOPT = 12 +SO_SHUTDOWN = 13 +SO_SOCKET = 14 +SO_SOCKPOLL = 15 +SO_GETIPDOMAIN = 16 +SO_SETIPDOMAIN = 17 +SO_ADJTIME = 18 diff --git a/Lib/plat-unixware7/STROPTS.py b/Lib/plat-unixware7/STROPTS.py new file mode 100644 index 00000000000..0f0cb251690 --- /dev/null +++ b/Lib/plat-unixware7/STROPTS.py @@ -0,0 +1,328 @@ +# Generated by h2py from /usr/include/sys/stropts.h + +# Included from sys/types.h +def quad_low(x): return x.val[0] + +ADT_EMASKSIZE = 8 +SHRT_MIN = -32768 +SHRT_MAX = 32767 +INT_MIN = (-2147483647-1) +INT_MAX = 2147483647 +LONG_MIN = (-2147483647-1) +LONG_MAX = 2147483647 +OFF32_MAX = LONG_MAX +ISTAT_ASSERTED = 0 +ISTAT_ASSUMED = 1 +ISTAT_NONE = 2 +OFF_MAX = OFF32_MAX +CLOCK_MAX = LONG_MAX +P_MYID = (-1) +P_MYHOSTID = (-1) + +# Included from sys/select.h +FD_SETSIZE = 4096 +NBBY = 8 +NULL = 0 + +# Included from sys/conf.h +D_NEW = 0x00 +D_OLD = 0x01 +D_DMA = 0x02 +D_BLKOFF = 0x400 +D_LFS = 0x8000 +D_STR = 0x0800 +D_MOD = 0x1000 +D_PSEUDO = 0x2000 +D_RANDOM = 0x4000 +D_HOT = 0x10000 +D_SEEKNEG = 0x04 +D_TAPE = 0x08 +D_NOBRKUP = 0x10 +D_INITPUB = 0x20 +D_NOSPECMACDATA = 0x40 +D_RDWEQ = 0x80 +SECMASK = (D_INITPUB|D_NOSPECMACDATA|D_RDWEQ) +DAF_REQDMA = 0x1 +DAF_PHYSREQ = 0x2 +DAF_PRE8 = 0x4 +DAF_STATIC = 0x8 +DAF_STR = 0x10 +D_MP = 0x100 +D_UPF = 0x200 +ROOTFS_NAMESZ = 7 +FMNAMESZ = 8 +MCD_VERSION = 1 +DI_BCBP = 0 +DI_MEDIA = 1 + +# Included from sys/secsys.h +ES_MACOPENLID = 1 +ES_MACSYSLID = 2 +ES_MACROOTLID = 3 +ES_PRVINFO = 4 +ES_PRVSETCNT = 5 +ES_PRVSETS = 6 +ES_MACADTLID = 7 +ES_PRVID = 8 +ES_TPGETMAJOR = 9 +SA_EXEC = 001 +SA_WRITE = 002 +SA_READ = 004 +SA_SUBSIZE = 010 + +# Included from sys/stropts_f.h +X_STR = (ord('S')<<8) +X_I_BASE = (X_STR|0200) +X_I_NREAD = (X_STR|0201) +X_I_PUSH = (X_STR|0202) +X_I_POP = (X_STR|0203) +X_I_LOOK = (X_STR|0204) +X_I_FLUSH = (X_STR|0205) +X_I_SRDOPT = (X_STR|0206) +X_I_GRDOPT = (X_STR|0207) +X_I_STR = (X_STR|0210) +X_I_SETSIG = (X_STR|0211) +X_I_GETSIG = (X_STR|0212) +X_I_FIND = (X_STR|0213) +X_I_LINK = (X_STR|0214) +X_I_UNLINK = (X_STR|0215) +X_I_PEEK = (X_STR|0217) +X_I_FDINSERT = (X_STR|0220) +X_I_SENDFD = (X_STR|0221) +X_I_RECVFD = (X_STR|0222) + +# Included from unistd.h + +# Included from sys/unistd.h +R_OK = 004 +W_OK = 002 +X_OK = 001 +F_OK = 000 +EFF_ONLY_OK = 010 +EX_OK = 020 +SEEK_SET = 0 +SEEK_CUR = 1 +SEEK_END = 2 +_SC_ARG_MAX = 1 +_SC_CHILD_MAX = 2 +_SC_CLK_TCK = 3 +_SC_NGROUPS_MAX = 4 +_SC_OPEN_MAX = 5 +_SC_JOB_CONTROL = 6 +_SC_SAVED_IDS = 7 +_SC_VERSION = 8 +_SC_PASS_MAX = 9 +_SC_LOGNAME_MAX = 10 +_SC_PAGESIZE = 11 +_SC_PAGE_SIZE = _SC_PAGESIZE +_SC_XOPEN_VERSION = 12 +_SC_NACLS_MAX = 13 +_SC_NPROCESSORS_CONF = 14 +_SC_NPROCESSORS_ONLN = 15 +_SC_NPROCESSES = 39 +_SC_TOTAL_MEMORY = 40 +_SC_USEABLE_MEMORY = 41 +_SC_GENERAL_MEMORY = 42 +_SC_DEDICATED_MEMORY = 43 +_SC_NCGS_CONF = 44 +_SC_NCGS_ONLN = 45 +_SC_MAX_CPUS_PER_CG = 46 +_SC_CG_SIMPLE_IMPL = 47 +_SC_CACHE_LINE = 48 +_SC_SYSTEM_ID = 49 +_SC_THREADS = 51 +_SC_THREAD_ATTR_STACKADDR = 52 +_SC_THREAD_ATTR_STACKSIZE = 53 +_SC_THREAD_DESTRUCTOR_ITERATIONS = 54 +_SC_THREAD_KEYS_MAX = 55 +_SC_THREAD_PRIORITY_SCHEDULING = 56 +_SC_THREAD_PRIO_INHERIT = 57 +_SC_THREAD_PRIO_PROTECT = 58 +_SC_THREAD_STACK_MIN = 59 +_SC_THREAD_PROCESS_SHARED = 60 +_SC_THREAD_SAFE_FUNCTIONS = 61 +_SC_THREAD_THREADS_MAX = 62 +_SC_KERNEL_VM = 63 +_SC_TZNAME_MAX = 320 +_SC_STREAM_MAX = 321 +_SC_XOPEN_CRYPT = 323 +_SC_XOPEN_ENH_I18N = 324 +_SC_XOPEN_SHM = 325 +_SC_XOPEN_XCU_VERSION = 327 +_SC_AES_OS_VERSION = 330 +_SC_ATEXIT_MAX = 331 +_SC_2_C_BIND = 350 +_SC_2_C_DEV = 351 +_SC_2_C_VERSION = 352 +_SC_2_CHAR_TERM = 353 +_SC_2_FORT_DEV = 354 +_SC_2_FORT_RUN = 355 +_SC_2_LOCALEDEF = 356 +_SC_2_SW_DEV = 357 +_SC_2_UPE = 358 +_SC_2_VERSION = 359 +_SC_BC_BASE_MAX = 370 +_SC_BC_DIM_MAX = 371 +_SC_BC_SCALE_MAX = 372 +_SC_BC_STRING_MAX = 373 +_SC_COLL_WEIGHTS_MAX = 380 +_SC_EXPR_NEST_MAX = 381 +_SC_LINE_MAX = 382 +_SC_RE_DUP_MAX = 383 +_SC_IOV_MAX = 390 +_SC_NPROC_CONF = 391 +_SC_NPROC_ONLN = 392 +_SC_XOPEN_UNIX = 400 +_SC_SEMAPHORES = 440 +_CS_PATH = 1 +__O_CS_HOSTNAME = 2 +_CS_RELEASE = 3 +_CS_VERSION = 4 +__O_CS_MACHINE = 5 +__O_CS_ARCHITECTURE = 6 +_CS_HW_SERIAL = 7 +__O_CS_HW_PROVIDER = 8 +_CS_SRPC_DOMAIN = 9 +_CS_INITTAB_NAME = 10 +__O_CS_SYSNAME = 11 +_CS_LFS_CFLAGS = 20 +_CS_LFS_LDFLAGS = 21 +_CS_LFS_LIBS = 22 +_CS_LFS_LINTFLAGS = 23 +_CS_LFS64_CFLAGS = 24 +_CS_LFS64_LDFLAGS = 25 +_CS_LFS64_LIBS = 26 +_CS_LFS64_LINTFLAGS = 27 +_CS_ARCHITECTURE = 100 +_CS_BUSTYPES = 101 +_CS_HOSTNAME = 102 +_CS_HW_PROVIDER = 103 +_CS_KERNEL_STAMP = 104 +_CS_MACHINE = 105 +_CS_OS_BASE = 106 +_CS_OS_PROVIDER = 107 +_CS_SYSNAME = 108 +_CS_USER_LIMIT = 109 +_PC_LINK_MAX = 1 +_PC_MAX_CANON = 2 +_PC_MAX_INPUT = 3 +_PC_NAME_MAX = 4 +_PC_PATH_MAX = 5 +_PC_PIPE_BUF = 6 +_PC_NO_TRUNC = 7 +_PC_VDISABLE = 8 +_PC_CHOWN_RESTRICTED = 9 +_PC_FILESIZEBITS = 10 +_POSIX_VERSION = 199009L +_XOPEN_VERSION = 4 +GF_PATH = "/etc/group" +PF_PATH = "/etc/passwd" +F_ULOCK = 0 +F_LOCK = 1 +F_TLOCK = 2 +F_TEST = 3 +_POSIX_JOB_CONTROL = 1 +_POSIX_SAVED_IDS = 1 +_POSIX_VDISABLE = 0 +NULL = 0 +STDIN_FILENO = 0 +STDOUT_FILENO = 1 +STDERR_FILENO = 2 +_XOPEN_UNIX = 1 +_XOPEN_ENH_I18N = 1 +_XOPEN_XPG4 = 1 +_POSIX2_C_VERSION = 199209L +_POSIX2_VERSION = 199209L +_XOPEN_XCU_VERSION = 4 +_POSIX_SEMAPHORES = 1 +_POSIX_THREADS = 1 +_POSIX_THREAD_ATTR_STACKADDR = 1 +_POSIX_THREAD_ATTR_STACKSIZE = 1 +_POSIX_THREAD_PRIORITY_SCHEDULING = 1 +_POSIX_THREAD_PROCESS_SHARED = 1 +_POSIX_THREAD_SAFE_FUNCTIONS = 1 +_POSIX2_C_BIND = 1 +_POSIX2_CHAR_TERM = 1 +_POSIX2_FORT_RUN = 1 +_POSIX2_LOCALEDEF = 1 +_POSIX2_UPE = 1 +_LFS_ASYNCHRONOUS_IO = 1 +_LFS_LARGEFILE = 1 +_LFS64_ASYNCHRONOUS_IO = 1 +_LFS64_LARGEFILE = 1 +_LFS64_STDIO = 1 +FMNAMESZ = 8 +SNDZERO = 0x001 +SNDPIPE = 0x002 +RNORM = 0x000 +RMSGD = 0x001 +RMSGN = 0x002 +RMODEMASK = 0x003 +RPROTDAT = 0x004 +RPROTDIS = 0x008 +RPROTNORM = 0x010 +RPROTMASK = 0x01c +FLUSHR = 0x01 +FLUSHW = 0x02 +FLUSHRW = 0x03 +FLUSHBAND = 0x04 +S_INPUT = 0x0001 +S_HIPRI = 0x0002 +S_OUTPUT = 0x0004 +S_MSG = 0x0008 +S_ERROR = 0x0010 +S_HANGUP = 0x0020 +S_RDNORM = 0x0040 +S_WRNORM = S_OUTPUT +S_RDBAND = 0x0080 +S_WRBAND = 0x0100 +S_BANDURG = 0x0200 +RS_HIPRI = 0x01 +MSG_HIPRI = 0x01 +MSG_ANY = 0x02 +MSG_BAND = 0x04 +MSG_DISCARD = 0x08 +MSG_PEEKIOCTL = 0x10 +MORECTL = 1 +MOREDATA = 2 +MUXID_ALL = (-1) +ANYMARK = 0x01 +LASTMARK = 0x02 +STR = (ord('S')<<8) +I_NREAD = (STR|01) +I_PUSH = (STR|02) +I_POP = (STR|03) +I_LOOK = (STR|04) +I_FLUSH = (STR|05) +I_SRDOPT = (STR|06) +I_GRDOPT = (STR|07) +I_STR = (STR|010) +I_SETSIG = (STR|011) +I_GETSIG = (STR|012) +I_FIND = (STR|013) +I_LINK = (STR|014) +I_UNLINK = (STR|015) +I_PEEK = (STR|017) +I_FDINSERT = (STR|020) +I_SENDFD = (STR|021) +I_RECVFD = (STR|022) +I_E_RECVFD = (STR|016) +I_RECVFD = (STR|016) +I_RECVFD = (STR|022) +I_SWROPT = (STR|023) +I_GWROPT = (STR|024) +I_LIST = (STR|025) +I_PLINK = (STR|026) +I_PUNLINK = (STR|027) +I_FLUSHBAND = (STR|034) +I_CKBAND = (STR|035) +I_GETBAND = (STR|036) +I_ATMARK = (STR|037) +I_SETCLTIME = (STR|040) +I_GETCLTIME = (STR|041) +I_CANPUT = (STR|042) +I_S_RECVFD = (STR|043) +I_STATS = (STR|044) +I_BIGPIPE = (STR|045) +I_GETTP = (STR|046) +INFTIM = -1 diff --git a/Lib/plat-unixware7/TERMIOS.py b/Lib/plat-unixware7/TERMIOS.py new file mode 100644 index 00000000000..38a962b4d12 --- /dev/null +++ b/Lib/plat-unixware7/TERMIOS.py @@ -0,0 +1,270 @@ +# Generated by h2py from /usr/include/termios.h + +# Included from sys/termios.h + +# Included from sys/types.h +def quad_low(x): return x.val[0] + +ADT_EMASKSIZE = 8 +SHRT_MIN = -32768 +SHRT_MAX = 32767 +INT_MIN = (-2147483647-1) +INT_MAX = 2147483647 +LONG_MIN = (-2147483647-1) +LONG_MAX = 2147483647 +OFF32_MAX = LONG_MAX +ISTAT_ASSERTED = 0 +ISTAT_ASSUMED = 1 +ISTAT_NONE = 2 +OFF_MAX = OFF32_MAX +CLOCK_MAX = LONG_MAX +P_MYID = (-1) +P_MYHOSTID = (-1) + +# Included from sys/select.h +FD_SETSIZE = 4096 +NBBY = 8 +NULL = 0 +NCC = 8 +NCCS = 19 +VINTR = 0 +VQUIT = 1 +VERASE = 2 +VKILL = 3 +VEOF = 4 +VEOL = 5 +VEOL2 = 6 +VMIN = 4 +VTIME = 5 +VSWTCH = 7 +VSTART = 8 +VSTOP = 9 +VSUSP = 10 +VDSUSP = 11 +VREPRINT = 12 +VDISCARD = 13 +VWERASE = 14 +VLNEXT = 15 +VCEOF = NCC +VCEOL = (NCC + 1) +_POSIX_VDISABLE = 0 +def CTRL(c): return ((c)&037) + +CINTR = ord('\177') +CQUIT = CTRL(ord('\\')) +CERASE = CTRL(ord('H')) +CKILL = CTRL(ord('U')) +CEOF = CTRL(ord('D')) +CEOL = _POSIX_VDISABLE +CEOL2 = _POSIX_VDISABLE +CNSWTCH = _POSIX_VDISABLE +CSTART = CTRL(ord('Q')) +CSTOP = CTRL(ord('S')) +CSUSP = CTRL(ord('Z')) +CDSUSP = CTRL(ord('Y')) +CREPRINT = CTRL(ord('R')) +CDISCARD = CTRL(ord('O')) +CWERASE = CTRL(ord('W')) +CLNEXT = CTRL(ord('V')) +CNUL = _POSIX_VDISABLE +CBRK = ord('\377') +CDEL = ord('\377') +CESC = ord('\\') +CEOT = CTRL(ord('D')) +CSWTCH = CTRL(ord('Z')) +CRPRNT = CREPRINT +CFLUSH = CDISCARD +IGNBRK = 0x00000001 +BRKINT = 0x00000002 +IGNPAR = 0x00000004 +PARMRK = 0x00000008 +INPCK = 0x00000010 +ISTRIP = 0x00000020 +INLCR = 0x00000040 +IGNCR = 0x00000080 +ICRNL = 0x00000100 +IUCLC = 0x00000200 +IXON = 0x00000400 +IXANY = 0x00000800 +IXOFF = 0x00001000 +IMAXBEL = 0x00002000 +DOSMODE = 0x00008000 +OPOST = 0x00000001 +OLCUC = 0x00000002 +ONLCR = 0x00000004 +OCRNL = 0x00000008 +ONOCR = 0x00000010 +ONLRET = 0x00000020 +OFILL = 0x00000040 +OFDEL = 0x00000080 +NLDLY = 0x00000100 +NL0 = 0 +NL1 = 0x00000100 +CRDLY = 0x00000600 +CR0 = 0 +CR1 = 0x00000200 +CR2 = 0x00000400 +CR3 = 0x00000600 +TABDLY = 0x00001800 +TAB0 = 0 +TAB1 = 0x00000800 +TAB2 = 0x00001000 +TAB3 = 0x00001800 +BSDLY = 0x00002000 +BS0 = 0 +BS1 = 0x00002000 +VTDLY = 0x00004000 +VT0 = 0 +VT1 = 0x00004000 +FFDLY = 0x00008000 +FF0 = 0 +FF1 = 0x00008000 +XTABS = TAB3 +PAGEOUT = 0x00010000 +WRAP = 0x00020000 +CBAUD = 0x0000000F +CSIZE = 0x00000030 +CS5 = 0 +CS6 = 0x00000010 +CS7 = 0x00000020 +CS8 = 0x00000030 +CSTOPB = 0x00000040 +CREAD = 0x00000080 +PARENB = 0x00000100 +PARODD = 0x00000200 +HUPCL = 0x00000400 +CLOCAL = 0x00000800 +RCV1EN = 0x00001000 +XMT1EN = 0x00002000 +LOBLK = 0x00004000 +XCLUDE = 0x00008000 +CIBAUD = 0x000F0000 +IBSHIFT = 16 +PAREXT = 0x00100000 +B0 = 0 +B50 = 1 +B75 = 2 +B110 = 3 +B134 = 4 +B150 = 5 +B200 = 6 +B300 = 7 +B600 = 8 +B1200 = 9 +B1800 = 10 +B2400 = 11 +B4800 = 12 +B9600 = 13 +B19200 = 14 +B38400 = 15 +EXTA = B19200 +EXTB = B38400 +ISIG = 0x00000001 +ICANON = 0x00000002 +XCASE = 0x00000004 +ECHO = 0x00000008 +ECHOE = 0x00000010 +ECHOK = 0x00000020 +ECHONL = 0x00000040 +NOFLSH = 0x00000080 +TOSTOP = 0x00000100 +ECHOCTL = 0x00000200 +ECHOPRT = 0x00000400 +ECHOKE = 0x00000800 +DEFECHO = 0x00001000 +FLUSHO = 0x00002000 +PENDIN = 0x00004000 +IEXTEN = 0x00008000 +IOCTYPE = 0xff00 +TIOC = (ord('T')<<8) +TCGETA = (TIOC|1) +TCSETA = (TIOC|2) +TCSETAW = (TIOC|3) +TCSETAF = (TIOC|4) +TCSBRK = (TIOC|5) +TCXONC = (TIOC|6) +TCFLSH = (TIOC|7) +TIOCKBON = (TIOC|8) +TIOCKBOF = (TIOC|9) +KBENABLED = (TIOC|10) +KB_XSCANCODE = 4 +KB_ISSCANCODE = 8 +TCDSET = (TIOC|32) +RTS_TOG = (TIOC|33) +TIOCGWINSZ = (TIOC|104) +TIOCSWINSZ = (TIOC|103) +TCGETS = (TIOC|13) +TCSETS = (TIOC|14) +TCSANOW = ((ord('T')<<8)|14) +TCSETSW = (TIOC|15) +TCSADRAIN = ((ord('T')<<8)|15) +TCSETSF = (TIOC|16) +TCSAFLUSH = ((ord('T')<<8)|16) +TCIFLUSH = 0 +TCOFLUSH = 1 +TCIOFLUSH = 2 +TCOOFF = 0 +TCOON = 1 +TCIOFF = 2 +TCION = 3 +tIOC = (ord('t')<<8) +TIOCGETD = (tIOC|0) +TIOCSETD = (tIOC|1) +TIOCHPCL = (tIOC|2) +TIOCGETP = (tIOC|8) +TIOCSETP = (tIOC|9) +TIOCSETN = (tIOC|10) +TIOCEXCL = (tIOC|13) +TIOCNXCL = (tIOC|14) +TIOCFLUSH = (tIOC|16) +TIOCSETC = (tIOC|17) +TIOCGETC = (tIOC|18) +TIOCLBIS = (tIOC|127) +TIOCLBIC = (tIOC|126) +TIOCLSET = (tIOC|125) +TIOCLGET = (tIOC|124) +TIOCSBRK = (tIOC|123) +TIOCCBRK = (tIOC|122) +TIOCSDTR = (tIOC|121) +TIOCCDTR = (tIOC|120) +TIOCSLTC = (tIOC|117) +TIOCGLTC = (tIOC|116) +TIOCOUTQ = (tIOC|115) +TIOCNOTTY = (tIOC|113) +TIOCSTOP = (tIOC|111) +TIOCSTART = (tIOC|110) +TIOCGPGRP = (tIOC|20) +TIOCSPGRP = (tIOC|21) +TIOCGSID = (tIOC|22) +TIOCSSID = (tIOC|24) +TIOCSTI = (tIOC|23) +TIOCMSET = (tIOC|26) +TIOCMBIS = (tIOC|27) +TIOCMBIC = (tIOC|28) +TIOCMGET = (tIOC|29) +TIOCM_LE = 0x0001 +TIOCM_DTR = 0x0002 +TIOCM_RTS = 0x0004 +TIOCM_ST = 0x0008 +TIOCM_SR = 0x0010 +TIOCM_CTS = 0x0020 +TIOCM_CAR = 0x0040 +TIOCM_CD = TIOCM_CAR +TIOCM_RNG = 0x0080 +TIOCM_RI = TIOCM_RNG +TIOCM_DSR = 0x0100 +TIOCREMOTE = (tIOC|30) +TIOCSIGNAL = (tIOC|31) +LDIOC = (ord('D')<<8) +LDOPEN = (LDIOC|0) +LDCLOSE = (LDIOC|1) +LDCHG = (LDIOC|2) +LDGETT = (LDIOC|8) +LDSETT = (LDIOC|9) +LDSMAP = (LDIOC|10) +LDGMAP = (LDIOC|11) +LDNMAP = (LDIOC|12) +DIOC = (ord('d')<<8) +DIOCGETP = (DIOC|8) +DIOCSETP = (DIOC|9) +FIORDCHK = ((ord('f')<<8)|3) diff --git a/Lib/plat-unixware7/regen b/Lib/plat-unixware7/regen new file mode 100755 index 00000000000..725b230f41b --- /dev/null +++ b/Lib/plat-unixware7/regen @@ -0,0 +1,12 @@ +#! /bin/sh +case `uname -sr` in +UnixWare*) ;; +*) echo Probably not on a UnixWare system 1>&2 + exit 1;; +esac +set -v +h2py /usr/include/sys/fcntl.h +h2py /usr/include/sys/socket.h +h2py -i '(u_long)' /usr/include/netinet/in.h +h2py /usr/include/termios.h +h2py /usr/include/sys/stropts.h diff --git a/Lib/test/test_fcntl.py b/Lib/test/test_fcntl.py index 3da079df0a0..1fa0aa2f83b 100755 --- a/Lib/test/test_fcntl.py +++ b/Lib/test/test_fcntl.py @@ -21,7 +21,7 @@ if sys.platform in ('netbsd1', 'Darwin1.2', 'darwin1', 'bsdos2', 'bsdos3', 'bsdos4', 'openbsd', 'openbsd2'): lockdata = struct.pack('lxxxxlxxxxlhh', 0, 0, 0, FCNTL.F_WRLCK, 0) -elif sys.platform in ['aix3', 'aix4', 'hp-uxB']: +elif sys.platform in ['aix3', 'aix4', 'hp-uxB', 'unixware7']: lockdata = struct.pack('hhlllii', FCNTL.F_WRLCK, 0, 0, 0, 0, 0, 0) else: lockdata = struct.pack('hhllhh', FCNTL.F_WRLCK, 0, 0, 0, 0, 0) diff --git a/Lib/test/test_fork1.py b/Lib/test/test_fork1.py index de9f7a947ac..51e6c58e1e6 100644 --- a/Lib/test/test_fork1.py +++ b/Lib/test/test_fork1.py @@ -48,7 +48,10 @@ def main(): prefork_lives = alive.copy() - cpid = os.fork() + if sys.platform in ['unixware7']: + cpid = os.fork1() + else: + cpid = os.fork() if cpid == 0: # Child diff --git a/Lib/test/test_math.py b/Lib/test/test_math.py index 8419a1f93b8..6f742bf6d50 100644 --- a/Lib/test/test_math.py +++ b/Lib/test/test_math.py @@ -1,6 +1,7 @@ # Python test set -- math module # XXXX Should not do tests around zero only +import sys from test_support import * seps='1e-05' @@ -35,7 +36,10 @@ testit('atan(1)', math.atan(1), math.pi/4) print 'atan2' testit('atan2(-1, 0)', math.atan2(-1, 0), -math.pi/2) testit('atan2(-1, 1)', math.atan2(-1, 1), -math.pi/4) -testit('atan2(0, 1)', math.atan2(0, 1), 0) +if sys.platform in ['unixware7']: + testit('atan2(0, 1)', math.atan2(0, 1), math.pi) +else: + testit('atan2(0, 1)', math.atan2(0, 1), 0) testit('atan2(1, 1)', math.atan2(1, 1), math.pi/4) testit('atan2(1, 0)', math.atan2(1, 0), math.pi/2) diff --git a/Makefile.pre.in b/Makefile.pre.in index ee4cad12e0e..2686ad5e068 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -309,7 +309,7 @@ $(LIBRARY): $(LIBRARY_OBJS) $(AR) cr $@ $(MODOBJS) $(RANLIB) $@ -# This rule is only here for DG/UX and BeOS!!! +# This rule is only here for DG/UX, UnixWare, and BeOS!!! libpython$(VERSION).so: $(LIBRARY) case `uname -s | tr -d '/ ' | tr '[A-Z]' '[a-z]'` in \ *dgux*) \ @@ -317,6 +317,9 @@ libpython$(VERSION).so: $(LIBRARY) (cd dgux;ar x ../$^;ld -G -o ../$@ * ); \ /bin/rm -rf ./dgux \ ;; \ + unixware*) \ + $(LDSHARED) -o $@ $(LIBRARY_OBJS) \ + ;; \ beos) \ $(AR) so $(LIBRARY) $@ \ ;; \ diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index ce77673a143..5575b9feb96 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -89,6 +89,9 @@ corresponding Unix manual entries for more information on calls."; /* Unix functions that the configure script doesn't check for */ #define HAVE_EXECV 1 #define HAVE_FORK 1 +#if defined(__USLC__) && defined(__SCO_VERSION__) /* SCO UDK Compiler */ +#define HAVE_FORK1 1 +#endif #define HAVE_GETCWD 1 #define HAVE_GETEGID 1 #define HAVE_GETEUID 1 @@ -1654,6 +1657,30 @@ posix_spawnve(PyObject *self, PyObject *args) #endif /* HAVE_SPAWNV */ +#ifdef HAVE_FORK1 +static char posix_fork1__doc__[] = +"fork1() -> pid\n\ +Fork a child process with a single multiplexed (i.e., not bound) thread.\n\ +\n\ +Return 0 to child process and PID of child to parent process."; + +static PyObject * +posix_fork1(self, args) + PyObject *self; + PyObject *args; +{ + int pid; + if (!PyArg_ParseTuple(args, ":fork1")) + return NULL; + pid = fork1(); + if (pid == -1) + return posix_error(); + PyOS_AfterFork(); + return PyInt_FromLong((long)pid); +} +#endif + + #ifdef HAVE_FORK static char posix_fork__doc__[] = "fork() -> pid\n\ @@ -5261,6 +5288,9 @@ static PyMethodDef posix_methods[] = { {"spawnv", posix_spawnv, METH_VARARGS, posix_spawnv__doc__}, {"spawnve", posix_spawnve, METH_VARARGS, posix_spawnve__doc__}, #endif /* HAVE_SPAWNV */ +#ifdef HAVE_FORK1 + {"fork1", posix_fork1, METH_VARARGS, posix_fork1__doc__}, +#endif /* HAVE_FORK1 */ #ifdef HAVE_FORK {"fork", posix_fork, METH_VARARGS, posix_fork__doc__}, #endif /* HAVE_FORK */ diff --git a/Modules/termios.c b/Modules/termios.c index 3aa8423977c..1d5e20b3bd9 100644 --- a/Modules/termios.c +++ b/Modules/termios.c @@ -324,8 +324,12 @@ static struct constant { {"B9600", B9600}, {"B19200", B19200}, {"B38400", B38400}, +#ifdef B57600 {"B57600", B57600}, +#endif +#ifdef B115200 {"B115200", B115200}, +#endif #ifdef B230400 {"B230400", B230400}, #endif diff --git a/config.h.in b/config.h.in index 1e97f97e74c..75d4c2ea804 100644 --- a/config.h.in +++ b/config.h.in @@ -269,9 +269,6 @@ /* The number of bytes in a void *. */ #undef SIZEOF_VOID_P -/* Define if you have the _getpty function. */ -#undef HAVE__GETPTY - /* Define if you have the alarm function. */ #undef HAVE_ALARM @@ -359,6 +356,9 @@ /* Define if you have the getpid function. */ #undef HAVE_GETPID +/* Define if you have the _getpty function. */ +#undef HAVE__GETPTY + /* Define if you have the getpwent function. */ #undef HAVE_GETPWENT @@ -518,14 +518,14 @@ /* Define if you have the waitpid function. */ #undef HAVE_WAITPID -/* Define if you have the header file. */ -#undef HAVE_DB_H +/* Define if you have the header file. */ +#undef HAVE_DB_185_H /* Define if you have the header file. */ #undef HAVE_DB1_NDBM_H -/* Define if you have the header file. */ -#undef HAVE_DB_185_H +/* Define if you have the header file. */ +#undef HAVE_DB_H /* Define if you have the header file. */ #undef HAVE_DIRENT_H diff --git a/configure b/configure index c5aba0b0019..8fd3a747b99 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh -# From configure.in Revision: 1.213 +# From configure.in Revision: 1.215 # Guess values for system-dependent variables and create Makefiles. # Generated automatically using autoconf version 2.13 @@ -631,7 +631,9 @@ echo "configure:631: checking MACHDEP" >&5 if test -z "$MACHDEP" then ac_sys_system=`uname -s` - if test "$ac_sys_system" = "AIX" -o "$ac_sys_system" = "Monterey64"; then + if test "$ac_sys_system" = "AIX" -o \ + "$ac_sys_system" = "Monterey64" -o \ + "$ac_sys_system" = "UnixWare"; then ac_sys_release=`uname -v` else ac_sys_release=`uname -r` @@ -667,7 +669,7 @@ echo "$ac_t""$MACHDEP" 1>&6 # checks for alternative programs echo $ac_n "checking for --without-gcc""... $ac_c" 1>&6 -echo "configure:671: checking for --without-gcc" >&5 +echo "configure:673: checking for --without-gcc" >&5 # Check whether --with-gcc or --without-gcc was given. if test "${with_gcc+set}" = set; then withval="$with_gcc" @@ -710,8 +712,15 @@ else ;; Monterey*) RANLIB=: - without_gcc=;; - *) without_gcc=no;; + without_gcc= + ;; + UnixWare*) + RANLIB=: + without_gcc= + ;; + *) + without_gcc=no + ;; esac fi @@ -721,7 +730,7 @@ echo "$ac_t""$without_gcc" 1>&6 MAINOBJ=python.o echo $ac_n "checking for --with-cxx=""... $ac_c" 1>&6 -echo "configure:725: checking for --with-cxx=" >&5 +echo "configure:734: checking for --with-cxx=" >&5 # Check whether --with-cxx or --without-cxx was given. if test "${with_cxx+set}" = set; then withval="$with_cxx" @@ -751,7 +760,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:755: checking for $ac_word" >&5 +echo "configure:764: 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 @@ -786,7 +795,7 @@ test -n "$CXX" || CXX="notfound" CXX= else echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:790: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:799: 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. @@ -797,12 +806,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 801 "configure" +#line 810 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -828,7 +837,7 @@ 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:832: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:841: 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 @@ -845,7 +854,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:849: checking for $ac_word" >&5 +echo "configure:858: 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 @@ -875,7 +884,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:879: checking for $ac_word" >&5 +echo "configure:888: 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 @@ -926,7 +935,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:930: checking for $ac_word" >&5 +echo "configure:939: 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 @@ -958,7 +967,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:962: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:971: 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. @@ -969,12 +978,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 973 "configure" +#line 982 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1000,12 +1009,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:1004: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1013: 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:1009: checking whether we are using GNU C" >&5 +echo "configure:1018: 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 @@ -1014,7 +1023,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1018: \"$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:1027: \"$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 @@ -1033,7 +1042,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1037: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1046: 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 @@ -1065,12 +1074,12 @@ else fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:1069: checking for Cygwin environment" >&5 +echo "configure:1078: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1094: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -1098,19 +1107,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:1102: checking for mingw32 environment" >&5 +echo "configure:1111: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -1129,7 +1138,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1133: checking for executable suffix" >&5 +echo "configure:1142: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1139,7 +1148,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1160,7 +1169,7 @@ echo "$ac_t""${ac_cv_exeext}" 1>&6 ac_exeext=$EXEEXT echo $ac_n "checking for --with-suffix""... $ac_c" 1>&6 -echo "configure:1164: checking for --with-suffix" >&5 +echo "configure:1173: checking for --with-suffix" >&5 # Check whether --with-suffix or --without-suffix was given. if test "${with_suffix+set}" = set; then withval="$with_suffix" @@ -1202,7 +1211,7 @@ esac echo $ac_n "checking LIBRARY""... $ac_c" 1>&6 -echo "configure:1206: checking LIBRARY" >&5 +echo "configure:1215: checking LIBRARY" >&5 if test -z "$LIBRARY" then LIBRARY='libpython$(VERSION).a' @@ -1224,7 +1233,7 @@ DLLLIBRARY='' # linking. echo $ac_n "checking LINKCC""... $ac_c" 1>&6 -echo "configure:1228: checking LINKCC" >&5 +echo "configure:1237: checking LINKCC" >&5 if test -z "$LINKCC" then case $ac_sys_system in @@ -1240,7 +1249,7 @@ fi echo "$ac_t""$LINKCC" 1>&6 echo $ac_n "checking LDLIBRARY""... $ac_c" 1>&6 -echo "configure:1244: checking LDLIBRARY" >&5 +echo "configure:1253: checking LDLIBRARY" >&5 # NeXT framework builds require that the 'ar' library be converted into # a bundle using libtool. @@ -1262,13 +1271,16 @@ cygwin*) LDLIBRARY='libpython$(VERSION).dll.a' DLLLIBRARY='libpython$(VERSION).dll' ;; +unixware*) + LDLIBRARY='libpython$(VERSION).so' + ;; esac echo "$ac_t""$LDLIBRARY" 1>&6 # 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:1272: checking for $ac_word" >&5 +echo "configure:1284: 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 @@ -1301,7 +1313,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:1305: checking for $ac_word" >&5 +echo "configure:1317: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1371,7 +1383,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1375: checking for a BSD compatible install" >&5 +echo "configure:1387: 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 @@ -1441,12 +1453,20 @@ then case $GCC in yes) case $ac_cv_prog_cc_g in - yes) OPT="-g -O2 -Wall -Wstrict-prototypes";; - *) OPT="-O2 -Wall -Wstrict-prototypes";; + yes) + OPT="-g -O2 -Wall -Wstrict-prototypes";; + *) + OPT="-O2 -Wall -Wstrict-prototypes";; esac ;; - *) OPT="-O";; + *) + case $ac_sys_system in + UnixWare*) + OPT="-O -K pentium,host,inline,loop_unroll,alloca ";; + *) + OPT="-O";; esac + esac fi # The current (beta) Monterey compiler dies with optimizations @@ -1460,7 +1480,7 @@ then fi # checks for UNIX variants that set C preprocessor variables echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1464: checking how to run the C preprocessor" >&5 +echo "configure:1484: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1475,13 +1495,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1485: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1505: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1492,13 +1512,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1502: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1522: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1509,13 +1529,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1519: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1539: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1540,9 +1560,9 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:1544: checking for AIX" >&5 +echo "configure:1564: checking for AIX" >&5 cat > conftest.$ac_ext <&6 -echo "configure:1569: checking for minix/config.h" >&5 +echo "configure:1589: checking for minix/config.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1579: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1599: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1614,7 +1634,7 @@ fi echo $ac_n "checking whether $CC accepts -OPT:Olimit=0""... $ac_c" 1>&6 -echo "configure:1618: checking whether $CC accepts -OPT:Olimit=0" >&5 +echo "configure:1638: checking whether $CC accepts -OPT:Olimit=0" >&5 if eval "test \"`echo '$''{'ac_cv_opt_olimit_ok'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1624,11 +1644,11 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_opt_olimit_ok=yes else @@ -1651,7 +1671,7 @@ if test $ac_cv_opt_olimit_ok = yes; then esac else echo $ac_n "checking whether $CC accepts -Olimit 1500""... $ac_c" 1>&6 -echo "configure:1655: checking whether $CC accepts -Olimit 1500" >&5 +echo "configure:1675: checking whether $CC accepts -Olimit 1500" >&5 if eval "test \"`echo '$''{'ac_cv_olimit_ok'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1661,11 +1681,11 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_olimit_ok=yes else @@ -1689,12 +1709,12 @@ fi # checks for header files echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1693: checking for ANSI C header files" >&5 +echo "configure:1713: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1702,7 +1722,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1706: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1726: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1719,7 +1739,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 @@ -1737,7 +1757,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 @@ -1758,7 +1778,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1769,7 +1789,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1801,17 +1821,17 @@ ndbm.h db1/ndbm.h gdbm/ndbm.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1805: checking for $ac_hdr" >&5 +echo "configure:1825: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1815: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1835: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1842,12 +1862,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:1846: checking for $ac_hdr that defines DIR" >&5 +echo "configure:1866: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -1855,7 +1875,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:1859: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1879: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -1880,7 +1900,7 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:1884: checking for opendir in -ldir" >&5 +echo "configure:1904: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1888,7 +1908,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1921,7 +1941,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:1925: checking for opendir in -lx" >&5 +echo "configure:1945: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1929,7 +1949,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1966,9 +1986,9 @@ fi # checks for typedefs was_it_defined=no echo $ac_n "checking for clock_t in time.h""... $ac_c" 1>&6 -echo "configure:1970: checking for clock_t in time.h" >&5 +echo "configure:1990: checking for clock_t in time.h" >&5 cat > conftest.$ac_ext < EOF @@ -1996,12 +2016,12 @@ EOF # Type availability checks echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:2000: checking for mode_t" >&5 +echo "configure:2020: 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 < #if STDC_HEADERS @@ -2029,12 +2049,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:2033: checking for off_t" >&5 +echo "configure:2053: 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 < #if STDC_HEADERS @@ -2062,12 +2082,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:2066: checking for pid_t" >&5 +echo "configure:2086: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2095,12 +2115,12 @@ EOF fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2099: checking return type of signal handlers" >&5 +echo "configure:2119: 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 < #include @@ -2117,7 +2137,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:2121: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2136,12 +2156,12 @@ EOF echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2140: checking for size_t" >&5 +echo "configure:2160: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2169,12 +2189,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:2173: checking for uid_t in sys/types.h" >&5 +echo "configure:2193: 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 @@ -2205,7 +2225,7 @@ fi # Sizes of various common basic types echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:2209: checking size of int" >&5 +echo "configure:2229: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2213,7 +2233,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -2224,7 +2244,7 @@ main() exit(0); } EOF -if { (eval echo configure:2228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -2244,7 +2264,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:2248: checking size of long" >&5 +echo "configure:2268: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2252,7 +2272,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -2263,7 +2283,7 @@ main() exit(0); } EOF -if { (eval echo configure:2267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -2283,7 +2303,7 @@ EOF echo $ac_n "checking size of void *""... $ac_c" 1>&6 -echo "configure:2287: checking size of void *" >&5 +echo "configure:2307: checking size of void *" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_void_p'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2291,7 +2311,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -2302,7 +2322,7 @@ main() exit(0); } EOF -if { (eval echo configure:2306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_void_p=`cat conftestval` else @@ -2322,7 +2342,7 @@ EOF echo $ac_n "checking size of char""... $ac_c" 1>&6 -echo "configure:2326: checking size of char" >&5 +echo "configure:2346: checking size of char" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2330,7 +2350,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -2341,7 +2361,7 @@ main() exit(0); } EOF -if { (eval echo configure:2345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_char=`cat conftestval` else @@ -2361,7 +2381,7 @@ EOF echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:2365: checking size of short" >&5 +echo "configure:2385: checking size of short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2369,7 +2389,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -2380,7 +2400,7 @@ main() exit(0); } EOF -if { (eval echo configure:2384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_short=`cat conftestval` else @@ -2400,7 +2420,7 @@ EOF echo $ac_n "checking size of float""... $ac_c" 1>&6 -echo "configure:2404: checking size of float" >&5 +echo "configure:2424: checking size of float" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_float'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2408,7 +2428,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -2419,7 +2439,7 @@ main() exit(0); } EOF -if { (eval echo configure:2423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_float=`cat conftestval` else @@ -2439,7 +2459,7 @@ EOF echo $ac_n "checking size of double""... $ac_c" 1>&6 -echo "configure:2443: checking size of double" >&5 +echo "configure:2463: checking size of double" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2447,7 +2467,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -2458,7 +2478,7 @@ main() exit(0); } EOF -if { (eval echo configure:2462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_double=`cat conftestval` else @@ -2478,7 +2498,7 @@ EOF echo $ac_n "checking size of fpos_t""... $ac_c" 1>&6 -echo "configure:2482: checking size of fpos_t" >&5 +echo "configure:2502: checking size of fpos_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_fpos_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2486,7 +2506,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -2497,7 +2517,7 @@ main() exit(0); } EOF -if { (eval echo configure:2501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_fpos_t=`cat conftestval` else @@ -2518,17 +2538,17 @@ EOF echo $ac_n "checking for long long support""... $ac_c" 1>&6 -echo "configure:2522: checking for long long support" >&5 +echo "configure:2542: checking for long long support" >&5 have_long_long=no cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2552: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_LONG_LONG 1 @@ -2542,7 +2562,7 @@ rm -f conftest* echo "$ac_t""$have_long_long" 1>&6 if test "$have_long_long" = yes ; then echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:2546: checking size of long long" >&5 +echo "configure:2566: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2550,7 +2570,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -2561,7 +2581,7 @@ main() exit(0); } EOF -if { (eval echo configure:2565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long=`cat conftestval` else @@ -2583,17 +2603,17 @@ EOF fi echo $ac_n "checking for uintptr_t support""... $ac_c" 1>&6 -echo "configure:2587: checking for uintptr_t support" >&5 +echo "configure:2607: checking for uintptr_t support" >&5 have_uintptr_t=no cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2617: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_UINTPTR_T 1 @@ -2607,7 +2627,7 @@ rm -f conftest* echo "$ac_t""$have_uintptr_t" 1>&6 if test "$have_uintptr_t" = yes ; then echo $ac_n "checking size of uintptr_t""... $ac_c" 1>&6 -echo "configure:2611: checking size of uintptr_t" >&5 +echo "configure:2631: checking size of uintptr_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uintptr_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2615,7 +2635,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -2626,7 +2646,7 @@ main() exit(0); } EOF -if { (eval echo configure:2630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uintptr_t=`cat conftestval` else @@ -2649,7 +2669,7 @@ fi # Hmph. AC_CHECK_SIZEOF() doesn't include . echo $ac_n "checking size of off_t""... $ac_c" 1>&6 -echo "configure:2653: checking size of off_t" >&5 +echo "configure:2673: checking size of off_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2657,7 +2677,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < #include @@ -2669,7 +2689,7 @@ main() exit(0); } EOF -if { (eval echo configure:2673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_off_t=`cat conftestval` else @@ -2691,7 +2711,7 @@ EOF echo $ac_n "checking whether to enable large file support""... $ac_c" 1>&6 -echo "configure:2695: checking whether to enable large file support" >&5 +echo "configure:2715: checking whether to enable large file support" >&5 if test "$have_long_long" = yes -a \ "$ac_cv_sizeof_off_t" -gt "$ac_cv_sizeof_long" -a \ "$ac_cv_sizeof_long_long" -ge "$ac_cv_sizeof_off_t"; then @@ -2706,7 +2726,7 @@ fi # AC_CHECK_SIZEOF() doesn't include . echo $ac_n "checking size of time_t""... $ac_c" 1>&6 -echo "configure:2710: checking size of time_t" >&5 +echo "configure:2730: checking size of time_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_time_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2714,7 +2734,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < #include @@ -2726,7 +2746,7 @@ main() exit(0); } EOF -if { (eval echo configure:2730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_time_t=`cat conftestval` else @@ -2750,17 +2770,17 @@ EOF # if have pthread_t then define SIZEOF_PTHREAD_T echo $ac_n "checking for pthread_t""... $ac_c" 1>&6 -echo "configure:2754: checking for pthread_t" >&5 +echo "configure:2774: checking for pthread_t" >&5 have_pthread_t=no cat > conftest.$ac_ext < int main() { pthread_t x; x = *(pthread_t*)0; ; return 0; } EOF -if { (eval echo configure:2764: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2784: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_pthread_t=yes else @@ -2772,7 +2792,7 @@ echo "$ac_t""$have_pthread_t" 1>&6 if test "$have_pthread_t" = yes ; then # AC_CHECK_SIZEOF() doesn't include . echo $ac_n "checking size of pthread_t""... $ac_c" 1>&6 -echo "configure:2776: checking size of pthread_t" >&5 +echo "configure:2796: checking size of pthread_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_pthread_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2780,7 +2800,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < #include @@ -2792,7 +2812,7 @@ else exit(0); } EOF -if { (eval echo configure:2796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_pthread_t=`cat conftestval` else @@ -2830,7 +2850,7 @@ case $ac_sys_system/$ac_sys_release in esac echo $ac_n "checking for --with-next-framework""... $ac_c" 1>&6 -echo "configure:2834: checking for --with-next-framework" >&5 +echo "configure:2854: checking for --with-next-framework" >&5 if test "$with_next_framework" then OPT="$OPT -fno-common" @@ -2847,7 +2867,7 @@ else fi echo $ac_n "checking for --with-dyld""... $ac_c" 1>&6 -echo "configure:2851: checking for --with-dyld" >&5 +echo "configure:2871: checking for --with-dyld" >&5 if test "$with_next_framework" -o "$with_dyld" then if test "$with_dyld" @@ -2874,7 +2894,7 @@ fi # SO is the extension of shared libraries `(including the dot!) # -- usually .so, .sl on HP-UX, .dll on Cygwin echo $ac_n "checking SO""... $ac_c" 1>&6 -echo "configure:2878: checking SO" >&5 +echo "configure:2898: checking SO" >&5 if test -z "$SO" then case $ac_sys_system in @@ -2889,7 +2909,7 @@ echo "$ac_t""$SO" 1>&6 # (Shared libraries in this instance are shared modules to be loaded into # Python, as opposed to building Python itself as a shared library.) echo $ac_n "checking LDSHARED""... $ac_c" 1>&6 -echo "configure:2893: checking LDSHARED" >&5 +echo "configure:2913: checking LDSHARED" >&5 if test -z "$LDSHARED" then case $ac_sys_system/$ac_sys_release in @@ -2941,7 +2961,7 @@ then UnixWare*) if test "$GCC" = "yes" then LDSHARED="$(CC) -shared" - else LDSHARED="$(CC) -G" + else LDSHARED="ld -G -dy -Bdynamic" fi;; SCO_SV*) LDSHARED="cc -G -KPIC -Ki486 -belf -Wl,-Bexport";; Monterey*) LDSHARED="cc -G -dy -Bdynamic -Bexport -L/usr/lib/ia64l64";; @@ -2954,7 +2974,7 @@ BLDSHARED=${BLDSHARED-$LDSHARED} # CCSHARED are the C *flags* used to create objects to go into a shared # library (module) -- this is only needed for a few systems echo $ac_n "checking CCSHARED""... $ac_c" 1>&6 -echo "configure:2958: checking CCSHARED" >&5 +echo "configure:2978: checking CCSHARED" >&5 if test -z "$CCSHARED" then case $ac_sys_system/$ac_sys_release in @@ -2972,7 +2992,7 @@ then UnixWare*) if test "$GCC" = "yes" then CCSHARED="-fPIC" - else CCSHARED="-KPIC" + else CCSHARED="-KPIC -G -dy -Bdynamic" fi;; SCO_SV*) CCSHARED="-KPIC -dy -Bdynamic";; Monterey*) CCSHARED="-G";; @@ -2987,7 +3007,7 @@ echo "$ac_t""$CCSHARED" 1>&6 # LINKFORSHARED are the flags passed to the $(CC) command that links # the python executable -- this is only needed for a few systems echo $ac_n "checking LINKFORSHARED""... $ac_c" 1>&6 -echo "configure:2991: checking LINKFORSHARED" >&5 +echo "configure:3011: checking LINKFORSHARED" >&5 if test -z "$LINKFORSHARED" then case $ac_sys_system/$ac_sys_release in @@ -3004,7 +3024,7 @@ then # loading of any modules which reference it in System.framework next/4*|next/5*) LINKFORSHARED="-u __dummy -framework System" ;; Darwin/*) LINKFORSHARED="-u __dummy -framework System -framework Foundation" ;; - UnixWare*) LINKFORSHARED="-Wl,-Bexport";; + UnixWare*) LINKFORSHARED="-dy -Bdynamic -Wl,-Bexport";; SCO_SV*) LINKFORSHARED="-Bdynamic -dy -Wl,-Bexport";; ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";; FreeBSD*|NetBSD*) @@ -3025,7 +3045,7 @@ echo "$ac_t""$LINKFORSHARED" 1>&6 echo $ac_n "checking CFLAGSFORSHARED""... $ac_c" 1>&6 -echo "configure:3029: checking CFLAGSFORSHARED" >&5 +echo "configure:3049: checking CFLAGSFORSHARED" >&5 if test ! "$LIBRARY" = "$LDLIBRARY" then case $ac_sys_system in @@ -3041,7 +3061,7 @@ echo "$ac_t""$CFLAGSFORSHARED" 1>&6 # checks for libraries echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:3045: checking for dlopen in -ldl" >&5 +echo "configure:3065: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3049,7 +3069,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3088,7 +3108,7 @@ else fi # Dynamic linking for SunOS/Solaris and SYSV echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:3092: checking for shl_load in -ldld" >&5 +echo "configure:3112: checking for shl_load in -ldld" >&5 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3096,7 +3116,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3137,7 +3157,7 @@ fi # Check for --with-pydebug echo $ac_n "checking for --with-pydebug""... $ac_c" 1>&6 -echo "configure:3141: checking for --with-pydebug" >&5 +echo "configure:3161: checking for --with-pydebug" >&5 # Check whether --with-pydebug or --without-pydebug was given. if test "${with_pydebug+set}" = set; then withval="$with_pydebug" @@ -3157,16 +3177,16 @@ fi # checks for system dependent C++ extensions support case "$ac_sys_system" in AIX*) echo $ac_n "checking for genuine AIX C++ extensions support""... $ac_c" 1>&6 -echo "configure:3161: checking for genuine AIX C++ extensions support" >&5 +echo "configure:3181: checking for genuine AIX C++ extensions support" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF #define AIX_GENUINE_CPLUSPLUS 1 @@ -3190,7 +3210,7 @@ case "$ac_sys_system" in IRIX*) ;; *) echo $ac_n "checking for t_open in -lnsl""... $ac_c" 1>&6 -echo "configure:3194: checking for t_open in -lnsl" >&5 +echo "configure:3214: checking for t_open in -lnsl" >&5 ac_lib_var=`echo nsl'_'t_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3198,7 +3218,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3230,7 +3250,7 @@ else fi # SVR4 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:3234: checking for socket in -lsocket" >&5 +echo "configure:3254: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3238,7 +3258,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3274,7 +3294,7 @@ esac case "$ac_sys_system" in BeOS*) echo $ac_n "checking for socket in -lnet""... $ac_c" 1>&6 -echo "configure:3278: checking for socket in -lnet" >&5 +echo "configure:3298: checking for socket in -lnet" >&5 ac_lib_var=`echo net'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3282,7 +3302,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnet $LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3317,7 +3337,7 @@ fi esac echo $ac_n "checking for --with-libs""... $ac_c" 1>&6 -echo "configure:3321: checking for --with-libs" >&5 +echo "configure:3341: checking for --with-libs" >&5 # Check whether --with-libs or --without-libs was given. if test "${with_libs+set}" = set; then withval="$with_libs" @@ -3334,7 +3354,7 @@ fi echo $ac_n "checking for --with-signal-module""... $ac_c" 1>&6 -echo "configure:3338: checking for --with-signal-module" >&5 +echo "configure:3358: checking for --with-signal-module" >&5 # Check whether --with-signal-module or --without-signal-module was given. if test "${with_signal_module+set}" = set; then withval="$with_signal_module" @@ -3360,7 +3380,7 @@ fi USE_THREAD_MODULE="" echo $ac_n "checking for --with-dec-threads""... $ac_c" 1>&6 -echo "configure:3364: checking for --with-dec-threads" >&5 +echo "configure:3384: checking for --with-dec-threads" >&5 # Check whether --with-dec-threads or --without-dec-threads was given. if test "${with_dec_threads+set}" = set; then @@ -3377,7 +3397,7 @@ fi echo $ac_n "checking for --with-threads""... $ac_c" 1>&6 -echo "configure:3381: checking for --with-threads" >&5 +echo "configure:3401: checking for --with-threads" >&5 # Check whether --with-threads or --without-threads was given. if test "${with_threads+set}" = set; then withval="$with_threads" @@ -3403,29 +3423,43 @@ if test "$with_threads" = "no" then USE_THREAD_MODULE="#" else - if test ! -z "$with_threads" -a -d "$with_threads" - then LDFLAGS="$LDFLAGS -L$with_threads" - fi - if test ! -z "$withval" -a -d "$withval" - then LDFLAGS="$LDFLAGS -L$withval" - fi - cat >> confdefs.h <<\EOF + if test "$ac_sys_system" = "UnixWare" + then + CC="${CC} -Kthread" + LIBOBJS="$LIBOBJS thread.o" + cat >> confdefs.h <<\EOF +#define WITH_THREAD 1 +EOF + + cat >> confdefs.h <<\EOF +#define _POSIX_THREADS 1 +EOF + + USE_THREAD_MODULE="" + else + if test ! -z "$with_threads" -a -d "$with_threads" + then LDFLAGS="$LDFLAGS -L$with_threads" + fi + if test ! -z "$withval" -a -d "$withval" + then LDFLAGS="$LDFLAGS -L$withval" + fi + cat >> confdefs.h <<\EOF #define _REENTRANT 1 EOF - ac_safe=`echo "mach/cthreads.h" | sed 'y%./+-%__p_%'` + ac_safe=`echo "mach/cthreads.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for mach/cthreads.h""... $ac_c" 1>&6 -echo "configure:3419: checking for mach/cthreads.h" >&5 +echo "configure:3453: checking for mach/cthreads.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3429: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3463: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3445,36 +3479,36 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then #define WITH_THREAD 1 EOF - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define C_THREADS 1 EOF - LIBOBJS="$LIBOBJS thread.o" + LIBOBJS="$LIBOBJS thread.o" else echo "$ac_t""no" 1>&6 - echo $ac_n "checking for --with-pth""... $ac_c" 1>&6 -echo "configure:3458: checking for --with-pth" >&5 - # Check whether --with-pth or --without-pth was given. + echo $ac_n "checking for --with-pth""... $ac_c" 1>&6 +echo "configure:3492: checking for --with-pth" >&5 + # Check whether --with-pth or --without-pth was given. if test "${with_pth+set}" = set; then withval="$with_pth" - echo "$ac_t""$withval" 1>&6 - cat >> confdefs.h <<\EOF + echo "$ac_t""$withval" 1>&6 + cat >> confdefs.h <<\EOF #define WITH_THREAD 1 EOF - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_PTH 1 EOF - LIBS="-lpth $LIBS" - LIBOBJS="$LIBOBJS thread.o" + LIBS="-lpth $LIBS" + LIBOBJS="$LIBOBJS thread.o" else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:3478: checking for pthread_create in -lpthread" >&5 + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 +echo "configure:3512: checking for pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3482,7 +3516,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3512,22 +3546,22 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then #define WITH_THREAD 1 EOF - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define _POSIX_THREADS 1 EOF - LIBS="-lpthread $LIBS" - LIBOBJS="$LIBOBJS thread.o" + LIBS="-lpthread $LIBS" + LIBOBJS="$LIBOBJS thread.o" else echo "$ac_t""no" 1>&6 - echo $ac_n "checking for pthread_detach""... $ac_c" 1>&6 -echo "configure:3526: checking for pthread_detach" >&5 + echo $ac_n "checking for pthread_detach""... $ac_c" 1>&6 +echo "configure:3560: checking for pthread_detach" >&5 if eval "test \"`echo '$''{'ac_cv_func_pthread_detach'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_pthread_detach=yes" else @@ -3568,30 +3602,30 @@ if eval "test \"`echo '$ac_cv_func_'pthread_detach`\" = yes"; then #define WITH_THREAD 1 EOF - case $ac_sys_system in - Darwin*) ;; - *) cat >> confdefs.h <<\EOF + case $ac_sys_system in + Darwin*) ;; + *) cat >> confdefs.h <<\EOF #define _POSIX_THREADS 1 EOF ;; - esac - LIBOBJS="$LIBOBJS thread.o" + esac + LIBOBJS="$LIBOBJS thread.o" else echo "$ac_t""no" 1>&6 - ac_safe=`echo "kernel/OS.h" | sed 'y%./+-%__p_%'` + ac_safe=`echo "kernel/OS.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for kernel/OS.h""... $ac_c" 1>&6 -echo "configure:3585: checking for kernel/OS.h" >&5 +echo "configure:3619: checking for kernel/OS.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3595: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3629: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3611,16 +3645,16 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then #define WITH_THREAD 1 EOF - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define BEOS_THREADS 1 EOF - LIBOBJS="$LIBOBJS thread.o" + LIBOBJS="$LIBOBJS thread.o" else echo "$ac_t""no" 1>&6 - echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 -echo "configure:3624: checking for pthread_create in -lpthreads" >&5 + echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 +echo "configure:3658: checking for pthread_create in -lpthreads" >&5 ac_lib_var=`echo pthreads'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3628,7 +3662,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthreads $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3658,17 +3692,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then #define WITH_THREAD 1 EOF - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define _POSIX_THREADS 1 EOF - LIBS="$LIBS -lpthreads" - LIBOBJS="$LIBOBJS thread.o" + LIBS="$LIBS -lpthreads" + LIBOBJS="$LIBOBJS thread.o" else echo "$ac_t""no" 1>&6 - echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:3672: checking for pthread_create in -lc_r" >&5 + echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 +echo "configure:3706: checking for pthread_create in -lc_r" >&5 ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3676,7 +3710,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3706,17 +3740,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then #define WITH_THREAD 1 EOF - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define _POSIX_THREADS 1 EOF - LIBS="$LIBS -lc_r" - LIBOBJS="$LIBOBJS thread.o" + LIBS="$LIBS -lc_r" + LIBOBJS="$LIBOBJS thread.o" else echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __d6_pthread_create in -lthread""... $ac_c" 1>&6 -echo "configure:3720: checking for __d6_pthread_create in -lthread" >&5 + echo $ac_n "checking for __d6_pthread_create in -lthread""... $ac_c" 1>&6 +echo "configure:3754: checking for __d6_pthread_create in -lthread" >&5 ac_lib_var=`echo thread'_'__d6_pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3724,7 +3758,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3754,17 +3788,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then #define WITH_THREAD 1 EOF - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define _POSIX_THREADS 1 EOF - LIBS="$LIBS -lthread" - LIBOBJS="$LIBOBJS thread.o" + LIBS="$LIBS -lthread" + LIBOBJS="$LIBOBJS thread.o" else echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __pthread_create_system in -lpthread""... $ac_c" 1>&6 -echo "configure:3768: checking for __pthread_create_system in -lpthread" >&5 + echo $ac_n "checking for __pthread_create_system in -lpthread""... $ac_c" 1>&6 +echo "configure:3802: checking for __pthread_create_system in -lpthread" >&5 ac_lib_var=`echo pthread'_'__pthread_create_system | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3772,7 +3806,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3802,17 +3836,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then #define WITH_THREAD 1 EOF - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define _POSIX_THREADS 1 EOF - LIBS="$LIBS -lpthread" - LIBOBJS="$LIBOBJS thread.o" + LIBS="$LIBS -lpthread" + LIBOBJS="$LIBOBJS thread.o" else echo "$ac_t""no" 1>&6 - echo $ac_n "checking for pthread_create in -lcma""... $ac_c" 1>&6 -echo "configure:3816: checking for pthread_create in -lcma" >&5 + echo $ac_n "checking for pthread_create in -lcma""... $ac_c" 1>&6 +echo "configure:3850: checking for pthread_create in -lcma" >&5 ac_lib_var=`echo cma'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3820,7 +3854,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcma $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3850,19 +3884,19 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then #define WITH_THREAD 1 EOF - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define _POSIX_THREADS 1 EOF - LIBS="$LIBS -lcma" - LIBOBJS="$LIBOBJS thread.o" + LIBS="$LIBS -lcma" + LIBOBJS="$LIBOBJS thread.o" else echo "$ac_t""no" 1>&6 - USE_THREAD_MODULE="#" + USE_THREAD_MODULE="#" fi - + fi fi @@ -3882,8 +3916,8 @@ fi fi - echo $ac_n "checking for usconfig in -lmpc""... $ac_c" 1>&6 -echo "configure:3887: checking for usconfig in -lmpc" >&5 + echo $ac_n "checking for usconfig in -lmpc""... $ac_c" 1>&6 +echo "configure:3921: checking for usconfig in -lmpc" >&5 ac_lib_var=`echo mpc'_'usconfig | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3891,7 +3925,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmpc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3921,15 +3955,15 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then #define WITH_THREAD 1 EOF - LIBS="$LIBS -lmpc" - LIBOBJS="$LIBOBJS thread.o" - USE_THREAD_MODULE="" + LIBS="$LIBS -lmpc" + LIBOBJS="$LIBOBJS thread.o" + USE_THREAD_MODULE="" else echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for thr_create in -lthread""... $ac_c" 1>&6 -echo "configure:3933: checking for thr_create in -lthread" >&5 + echo $ac_n "checking for thr_create in -lthread""... $ac_c" 1>&6 +echo "configure:3967: checking for thr_create in -lthread" >&5 ac_lib_var=`echo thread'_'thr_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3937,7 +3971,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3967,21 +4001,22 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then #define WITH_THREAD 1 EOF - LIBS="$LIBS -lthread" - LIBOBJS="$LIBOBJS thread.o" - USE_THREAD_MODULE="" + LIBS="$LIBS -lthread" + LIBOBJS="$LIBOBJS thread.o" + USE_THREAD_MODULE="" else echo "$ac_t""no" 1>&6 fi - if test "$USE_THREAD_MODULE" != "#" - then - # If the above checks didn't disable threads, (at least) OSF1 - # needs this '-threads' argument during linking. - case $ac_sys_system in - OSF1) LDLAST=-threads;; - esac + if test "$USE_THREAD_MODULE" != "#" + then + # If the above checks didn't disable threads, (at least) OSF1 + # needs this '-threads' argument during linking. + case $ac_sys_system in + OSF1) LDLAST=-threads;; + esac + fi fi fi @@ -3989,7 +4024,7 @@ fi USE_GC_MODULE="" echo $ac_n "checking for --with-cycle-gc""... $ac_c" 1>&6 -echo "configure:3993: checking for --with-cycle-gc" >&5 +echo "configure:4028: checking for --with-cycle-gc" >&5 # Check whether --with-cycle-gc or --without-cycle-gc was given. if test "${with_cycle_gc+set}" = set; then withval="$with_cycle_gc" @@ -4013,7 +4048,7 @@ echo "$ac_t""$with_cycle_gc" 1>&6 # Check for Python-specific malloc support echo $ac_n "checking for --with-pymalloc""... $ac_c" 1>&6 -echo "configure:4017: checking for --with-pymalloc" >&5 +echo "configure:4052: checking for --with-pymalloc" >&5 # Check whether --with-pymalloc or --without-pymalloc was given. if test "${with_pymalloc+set}" = set; then withval="$with_pymalloc" @@ -4032,7 +4067,7 @@ fi # Check for --with-wctype-functions echo $ac_n "checking for --with-wctype-functions""... $ac_c" 1>&6 -echo "configure:4036: checking for --with-wctype-functions" >&5 +echo "configure:4071: checking for --with-wctype-functions" >&5 # Check whether --with-wctype-functions or --without-wctype-functions was given. if test "${with_wctype_functions+set}" = set; then withval="$with_wctype_functions" @@ -4054,7 +4089,7 @@ fi DLINCLDIR=/ echo $ac_n "checking for --with-sgi-dl""... $ac_c" 1>&6 -echo "configure:4058: checking for --with-sgi-dl" >&5 +echo "configure:4093: checking for --with-sgi-dl" >&5 # Check whether --with-sgi-dl or --without-sgi-dl was given. if test "${with_sgi_dl+set}" = set; then withval="$with_sgi_dl" @@ -4078,7 +4113,7 @@ fi echo $ac_n "checking for --with-dl-dld""... $ac_c" 1>&6 -echo "configure:4082: checking for --with-dl-dld" >&5 +echo "configure:4117: checking for --with-dl-dld" >&5 # Check whether --with-dl-dld or --without-dl-dld was given. if test "${with_dl_dld+set}" = set; then withval="$with_dl_dld" @@ -4107,12 +4142,12 @@ fi for ac_func in dlopen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4111: checking for $ac_func" >&5 +echo "configure:4146: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4164,7 +4199,7 @@ done # loading of modules. echo $ac_n "checking DYNLOADFILE""... $ac_c" 1>&6 -echo "configure:4168: checking DYNLOADFILE" >&5 +echo "configure:4203: checking DYNLOADFILE" >&5 if test -z "$DYNLOADFILE" then case $ac_sys_system/$ac_sys_release in @@ -4205,12 +4240,12 @@ for ac_func in alarm chown clock confstr ctermid ctermid_r execv \ truncate uname waitpid _getpty do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4209: checking for $ac_func" >&5 +echo "configure:4244: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4263,12 +4298,12 @@ done for ac_func in openpty do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4267: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4313,7 +4348,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6 -echo "configure:4317: checking for openpty in -lutil" >&5 +echo "configure:4352: checking for openpty in -lutil" >&5 ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4321,7 +4356,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lutil $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4361,12 +4396,12 @@ done for ac_func in forkpty do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4365: checking for $ac_func" >&5 +echo "configure:4400: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4411,7 +4446,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for forkpty in -lutil""... $ac_c" 1>&6 -echo "configure:4415: checking for forkpty in -lutil" >&5 +echo "configure:4450: checking for forkpty in -lutil" >&5 ac_lib_var=`echo util'_'forkpty | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4419,7 +4454,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lutil $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4461,12 +4496,12 @@ done for ac_func in fseek64 fseeko fstatvfs ftell64 ftello statvfs do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4465: checking for $ac_func" >&5 +echo "configure:4500: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4517,12 +4552,12 @@ done for ac_func in dup2 getcwd strdup strerror memmove do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4521: checking for $ac_func" >&5 +echo "configure:4556: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4574,12 +4609,12 @@ done for ac_func in getpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4578: checking for $ac_func" >&5 +echo "configure:4613: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4621,14 +4656,14 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then #define $ac_tr_func 1 EOF cat > conftest.$ac_ext < int main() { getpgrp(0); ; return 0; } EOF -if { (eval echo configure:4632: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4667: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define GETPGRP_HAVE_ARG 1 @@ -4647,12 +4682,12 @@ done for ac_func in setpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4651: checking for $ac_func" >&5 +echo "configure:4686: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4694,14 +4729,14 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then #define $ac_tr_func 1 EOF cat > conftest.$ac_ext < int main() { setpgrp(0,0); ; return 0; } EOF -if { (eval echo configure:4705: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4740: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define SETPGRP_HAVE_ARG 1 @@ -4720,12 +4755,12 @@ done for ac_func in gettimeofday do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4724: checking for $ac_func" >&5 +echo "configure:4759: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4767,14 +4802,14 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then #define $ac_tr_func 1 EOF cat > conftest.$ac_ext < int main() { gettimeofday((struct timeval*)0,(struct timezone*)0); ; return 0; } EOF -if { (eval echo configure:4778: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4813: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -4794,12 +4829,12 @@ done # checks for structures echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:4798: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:4833: 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 < #include @@ -4808,7 +4843,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:4812: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -4829,12 +4864,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:4833: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:4868: 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 < #include @@ -4842,7 +4877,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:4846: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4881: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -4863,12 +4898,12 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:4867: checking for tm_zone in struct tm" >&5 +echo "configure:4902: 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 < #include <$ac_cv_struct_tm> @@ -4876,7 +4911,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:4880: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -4896,12 +4931,12 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:4900: checking for tzname" >&5 +echo "configure:4935: 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 < #ifndef tzname /* For SGI. */ @@ -4911,7 +4946,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:4915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -4934,19 +4969,19 @@ fi echo $ac_n "checking for time.h that defines altzone""... $ac_c" 1>&6 -echo "configure:4938: checking for time.h that defines altzone" >&5 +echo "configure:4973: checking for time.h that defines altzone" >&5 if eval "test \"`echo '$''{'ac_cv_header_time_altzone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return altzone; ; return 0; } EOF -if { (eval echo configure:4950: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4985: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time_altzone=yes else @@ -4968,9 +5003,9 @@ fi was_it_defined=no echo $ac_n "checking whether sys/select.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:4972: checking whether sys/select.h and sys/time.h may both be included" >&5 +echo "configure:5007: checking whether sys/select.h and sys/time.h may both be included" >&5 cat > conftest.$ac_ext < @@ -4981,7 +5016,7 @@ int main() { ; ; return 0; } EOF -if { (eval echo configure:4985: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5020: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define SYS_SELECT_WITH_SYS_TIME 1 @@ -4997,14 +5032,14 @@ echo "$ac_t""$was_it_defined" 1>&6 # checks for compiler characteristics echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6 -echo "configure:5001: checking whether char is unsigned" >&5 +echo "configure:5036: checking whether char is unsigned" >&5 if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$GCC" = yes; then # GCC predefines this symbol on systems where it applies. cat > conftest.$ac_ext <&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_char_unsigned=yes else @@ -5060,18 +5095,18 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:5064: checking for working const" >&5 +echo "configure:5099: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5153: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -5137,16 +5172,16 @@ fi works=no echo $ac_n "checking for working volatile""... $ac_c" 1>&6 -echo "configure:5141: checking for working volatile" >&5 +echo "configure:5176: checking for working volatile" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5185: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* works=yes else @@ -5163,16 +5198,16 @@ echo "$ac_t""$works" 1>&6 works=no echo $ac_n "checking for working signed char""... $ac_c" 1>&6 -echo "configure:5167: checking for working signed char" >&5 +echo "configure:5202: checking for working signed char" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5211: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* works=yes else @@ -5189,16 +5224,16 @@ echo "$ac_t""$works" 1>&6 have_prototypes=no echo $ac_n "checking for prototypes""... $ac_c" 1>&6 -echo "configure:5193: checking for prototypes" >&5 +echo "configure:5228: checking for prototypes" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5237: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_PROTOTYPES 1 @@ -5213,9 +5248,9 @@ echo "$ac_t""$have_prototypes" 1>&6 works=no echo $ac_n "checking for variable length prototypes and stdarg.h""... $ac_c" 1>&6 -echo "configure:5217: checking for variable length prototypes and stdarg.h" >&5 +echo "configure:5252: checking for variable length prototypes and stdarg.h" >&5 cat > conftest.$ac_ext < @@ -5232,7 +5267,7 @@ int main() { return foo(10, "", 3.14); ; return 0; } EOF -if { (eval echo configure:5236: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5271: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_STDARG_PROTOTYPES 1 @@ -5248,16 +5283,16 @@ echo "$ac_t""$works" 1>&6 if test "$have_prototypes" = yes; then bad_prototypes=no echo $ac_n "checking for bad exec* prototypes""... $ac_c" 1>&6 -echo "configure:5252: checking for bad exec* prototypes" >&5 +echo "configure:5287: checking for bad exec* prototypes" >&5 cat > conftest.$ac_ext < int main() { char **t;execve("@",t,t); ; return 0; } EOF -if { (eval echo configure:5261: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5296: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -5274,12 +5309,12 @@ fi bad_forward=no echo $ac_n "checking for bad static forward""... $ac_c" 1>&6 -echo "configure:5278: checking for bad static forward" >&5 +echo "configure:5313: checking for bad static forward" >&5 if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -5314,9 +5349,9 @@ echo "$ac_t""$bad_forward" 1>&6 va_list_is_array=no echo $ac_n "checking whether va_list is an array""... $ac_c" 1>&6 -echo "configure:5318: checking whether va_list is an array" >&5 +echo "configure:5353: checking whether va_list is an array" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5368: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -5345,12 +5380,12 @@ echo "$ac_t""$va_list_is_array" 1>&6 # sigh -- gethostbyname_r is a mess; it can have 3, 5 or 6 arguments :-( echo $ac_n "checking for gethostbyname_r""... $ac_c" 1>&6 -echo "configure:5349: checking for gethostbyname_r" >&5 +echo "configure:5384: checking for gethostbyname_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname_r=yes" else @@ -5393,11 +5428,11 @@ if eval "test \"`echo '$ac_cv_func_'gethostbyname_r`\" = yes"; then EOF echo $ac_n "checking gethostbyname_r with 6 args""... $ac_c" 1>&6 -echo "configure:5397: checking gethostbyname_r with 6 args" >&5 +echo "configure:5432: checking gethostbyname_r with 6 args" >&5 OLD_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $MY_CPPFLAGS $MY_THREAD_CPPFLAGS $MY_CFLAGS" cat > conftest.$ac_ext < @@ -5414,7 +5449,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5418: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5453: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -5434,9 +5469,9 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking gethostbyname_r with 5 args""... $ac_c" 1>&6 -echo "configure:5438: checking gethostbyname_r with 5 args" >&5 +echo "configure:5473: checking gethostbyname_r with 5 args" >&5 cat > conftest.$ac_ext < @@ -5453,7 +5488,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5457: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -5473,9 +5508,9 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking gethostbyname_r with 3 args""... $ac_c" 1>&6 -echo "configure:5477: checking gethostbyname_r with 3 args" >&5 +echo "configure:5512: checking gethostbyname_r with 3 args" >&5 cat > conftest.$ac_ext < @@ -5490,7 +5525,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5494: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5529: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -5526,12 +5561,12 @@ else for ac_func in gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5530: checking for $ac_func" >&5 +echo "configure:5565: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5592,12 +5627,12 @@ fi # Linux requires this for correct f.p. operations echo $ac_n "checking for __fpu_control""... $ac_c" 1>&6 -echo "configure:5596: checking for __fpu_control" >&5 +echo "configure:5631: checking for __fpu_control" >&5 if eval "test \"`echo '$''{'ac_cv_func___fpu_control'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func___fpu_control=yes" else @@ -5638,7 +5673,7 @@ if eval "test \"`echo '$ac_cv_func_'__fpu_control`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __fpu_control in -lieee""... $ac_c" 1>&6 -echo "configure:5642: checking for __fpu_control in -lieee" >&5 +echo "configure:5677: checking for __fpu_control in -lieee" >&5 ac_lib_var=`echo ieee'_'__fpu_control | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5646,7 +5681,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lieee $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5690,7 +5725,7 @@ fi # Check for --with-fpectl echo $ac_n "checking for --with-fpectl""... $ac_c" 1>&6 -echo "configure:5694: checking for --with-fpectl" >&5 +echo "configure:5729: checking for --with-fpectl" >&5 # Check whether --with-fpectl or --without-fpectl was given. if test "${with_fpectl+set}" = set; then withval="$with_fpectl" @@ -5716,7 +5751,7 @@ BeOS) ;; *) LIBM=-lm esac echo $ac_n "checking for --with-libm=STRING""... $ac_c" 1>&6 -echo "configure:5720: checking for --with-libm=STRING" >&5 +echo "configure:5755: checking for --with-libm=STRING" >&5 # Check whether --with-libm or --without-libm was given. if test "${with_libm+set}" = set; then withval="$with_libm" @@ -5737,7 +5772,7 @@ fi # check for --with-libc=... echo $ac_n "checking for --with-libc=STRING""... $ac_c" 1>&6 -echo "configure:5741: checking for --with-libc=STRING" >&5 +echo "configure:5776: checking for --with-libc=STRING" >&5 # Check whether --with-libc or --without-libc was given. if test "${with_libc+set}" = set; then withval="$with_libc" @@ -5761,12 +5796,12 @@ LIBS="$LIBS $LIBM" for ac_func in hypot do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5765: checking for $ac_func" >&5 +echo "configure:5800: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5819,7 +5854,7 @@ LIBS=$LIBS_SAVE # check whether malloc(0) returns NULL or not echo $ac_n "checking what malloc(0) returns""... $ac_c" 1>&6 -echo "configure:5823: checking what malloc(0) returns" >&5 +echo "configure:5858: checking what malloc(0) returns" >&5 if eval "test \"`echo '$''{'ac_cv_malloc_zero'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5827,7 +5862,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < #ifdef HAVE_STDLIB @@ -5846,7 +5881,7 @@ main() { exit(0); } EOF -if { (eval echo configure:5850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_malloc_zero=nonnull else @@ -5872,17 +5907,17 @@ fi # check for wchar.h ac_safe=`echo "wchar.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for wchar.h""... $ac_c" 1>&6 -echo "configure:5876: checking for wchar.h" >&5 +echo "configure:5911: checking for wchar.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5886: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5921: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5912,12 +5947,12 @@ fi # check for usable wchar_t usable_wchar_t="unkown" echo $ac_n "checking for usable wchar_t""... $ac_c" 1>&6 -echo "configure:5916: checking for usable wchar_t" >&5 +echo "configure:5951: checking for usable wchar_t" >&5 if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF #define HAVE_USABLE_WCHAR_T 1 @@ -5950,14 +5985,14 @@ echo "$ac_t""$usable_wchar_t" 1>&6 # check for endianness echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:5954: checking whether byte ordering is bigendian" >&5 +echo "configure:5989: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -5968,11 +6003,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:5972: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6007: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -5983,7 +6018,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:5987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6022: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -6003,7 +6038,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -6043,7 +6078,7 @@ fi # Check whether right shifting a negative integer extends the sign bit # or fills with zeros (like the Cray J90, according to Tim Peters). echo $ac_n "checking whether right shift extends the sign bit""... $ac_c" 1>&6 -echo "configure:6047: checking whether right shift extends the sign bit" >&5 +echo "configure:6082: checking whether right shift extends the sign bit" >&5 if eval "test \"`echo '$''{'ac_cv_rshift_extends_sign'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6052,7 +6087,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_rshift_extends_sign=yes else @@ -6086,13 +6121,13 @@ fi # check for getc_unlocked and related locking functions echo $ac_n "checking for getc_unlocked() and friends""... $ac_c" 1>&6 -echo "configure:6090: checking for getc_unlocked() and friends" >&5 +echo "configure:6125: checking for getc_unlocked() and friends" >&5 if eval "test \"`echo '$''{'ac_cv_have_getc_unlocked'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -6104,7 +6139,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_getc_unlocked=yes else @@ -6133,12 +6168,12 @@ cat >> confdefs.h <<\EOF #endif EOF echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 -echo "configure:6137: checking for socklen_t" >&5 +echo "configure:6172: checking for socklen_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6187,7 +6222,7 @@ done SRCDIRS="Parser Grammar Objects Python Modules" echo $ac_n "checking for build directories""... $ac_c" 1>&6 -echo "configure:6191: checking for build directories" >&5 +echo "configure:6226: checking for build directories" >&5 for dir in $SRCDIRS; do if test ! -d $dir; then mkdir $dir diff --git a/configure.in b/configure.in index 5dcd7651ad4..9fe7a9f10a1 100644 --- a/configure.in +++ b/configure.in @@ -52,7 +52,9 @@ AC_MSG_CHECKING(MACHDEP) if test -z "$MACHDEP" then ac_sys_system=`uname -s` - if test "$ac_sys_system" = "AIX" -o "$ac_sys_system" = "Monterey64"; then + if test "$ac_sys_system" = "AIX" -o \ + "$ac_sys_system" = "Monterey64" -o \ + "$ac_sys_system" = "UnixWare"; then ac_sys_release=`uname -v` else ac_sys_release=`uname -r` @@ -125,8 +127,15 @@ AC_ARG_WITH(gcc, [ --without-gcc never use gcc], [ ;; Monterey*) RANLIB=: - without_gcc=;; - *) without_gcc=no;; + without_gcc= + ;; + UnixWare*) + RANLIB=: + without_gcc= + ;; + *) + without_gcc=no + ;; esac]) AC_MSG_RESULT($without_gcc) @@ -264,6 +273,9 @@ cygwin*) LDLIBRARY='libpython$(VERSION).dll.a' DLLLIBRARY='libpython$(VERSION).dll' ;; +unixware*) + LDLIBRARY='libpython$(VERSION).so' + ;; esac AC_MSG_RESULT($LDLIBRARY) @@ -298,12 +310,20 @@ then case $GCC in yes) case $ac_cv_prog_cc_g in - yes) OPT="-g -O2 -Wall -Wstrict-prototypes";; - *) OPT="-O2 -Wall -Wstrict-prototypes";; + yes) + OPT="-g -O2 -Wall -Wstrict-prototypes";; + *) + OPT="-O2 -Wall -Wstrict-prototypes";; esac ;; - *) OPT="-O";; + *) + case $ac_sys_system in + UnixWare*) + OPT="-O -K pentium,host,inline,loop_unroll,alloca ";; + *) + OPT="-O";; esac + esac fi # The current (beta) Monterey compiler dies with optimizations @@ -597,7 +617,7 @@ then UnixWare*) if test "$GCC" = "yes" then LDSHARED="$(CC) -shared" - else LDSHARED="$(CC) -G" + else LDSHARED="ld -G -dy -Bdynamic" fi;; SCO_SV*) LDSHARED="cc -G -KPIC -Ki486 -belf -Wl,-Bexport";; Monterey*) LDSHARED="cc -G -dy -Bdynamic -Bexport -L/usr/lib/ia64l64";; @@ -627,7 +647,7 @@ then UnixWare*) if test "$GCC" = "yes" then CCSHARED="-fPIC" - else CCSHARED="-KPIC" + else CCSHARED="-KPIC -G -dy -Bdynamic" fi;; SCO_SV*) CCSHARED="-KPIC -dy -Bdynamic";; Monterey*) CCSHARED="-G";; @@ -658,7 +678,7 @@ then # loading of any modules which reference it in System.framework next/4*|next/5*) LINKFORSHARED="-u __dummy -framework System" ;; Darwin/*) LINKFORSHARED="-u __dummy -framework System -framework Foundation" ;; - UnixWare*) LINKFORSHARED="-Wl,-Bexport";; + UnixWare*) LINKFORSHARED="-dy -Bdynamic -Wl,-Bexport";; SCO_SV*) LINKFORSHARED="-Bdynamic -dy -Wl,-Bexport";; ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";; FreeBSD*|NetBSD*) @@ -793,77 +813,86 @@ if test "$with_threads" = "no" then USE_THREAD_MODULE="#" else - if test ! -z "$with_threads" -a -d "$with_threads" - then LDFLAGS="$LDFLAGS -L$with_threads" - fi - if test ! -z "$withval" -a -d "$withval" - then LDFLAGS="$LDFLAGS -L$withval" - fi - AC_DEFINE(_REENTRANT) - AC_CHECK_HEADER(mach/cthreads.h, [AC_DEFINE(WITH_THREAD) - AC_DEFINE(C_THREADS) - LIBOBJS="$LIBOBJS thread.o"],[ - AC_MSG_CHECKING(for --with-pth) - AC_ARG_WITH(pth, - [ --with-pth use GNU pth threading libraries], [ - AC_MSG_RESULT($withval) - AC_DEFINE(WITH_THREAD) - AC_DEFINE(HAVE_PTH) - LIBS="-lpth $LIBS" - LIBOBJS="$LIBOBJS thread.o"],[ - AC_MSG_RESULT(no) - AC_CHECK_LIB(pthread, pthread_create, [AC_DEFINE(WITH_THREAD) - AC_DEFINE(_POSIX_THREADS) - LIBS="-lpthread $LIBS" - LIBOBJS="$LIBOBJS thread.o"],[ - AC_CHECK_FUNC(pthread_detach, [AC_DEFINE(WITH_THREAD) - case $ac_sys_system in - Darwin*) ;; - *) AC_DEFINE(_POSIX_THREADS);; - esac - LIBOBJS="$LIBOBJS thread.o"],[ - AC_CHECK_HEADER(kernel/OS.h, [AC_DEFINE(WITH_THREAD) - AC_DEFINE(BEOS_THREADS) - LIBOBJS="$LIBOBJS thread.o"],[ - AC_CHECK_LIB(pthreads, pthread_create, [AC_DEFINE(WITH_THREAD) - AC_DEFINE(_POSIX_THREADS) - LIBS="$LIBS -lpthreads" - LIBOBJS="$LIBOBJS thread.o"], [ - AC_CHECK_LIB(c_r, pthread_create, [AC_DEFINE(WITH_THREAD) - AC_DEFINE(_POSIX_THREADS) - LIBS="$LIBS -lc_r" - LIBOBJS="$LIBOBJS thread.o"], [ - AC_CHECK_LIB(thread, __d6_pthread_create, [AC_DEFINE(WITH_THREAD) - AC_DEFINE(_POSIX_THREADS) - LIBS="$LIBS -lthread" - LIBOBJS="$LIBOBJS thread.o"], [ - AC_CHECK_LIB(pthread, __pthread_create_system, [AC_DEFINE(WITH_THREAD) - AC_DEFINE(_POSIX_THREADS) - LIBS="$LIBS -lpthread" - LIBOBJS="$LIBOBJS thread.o"], [ - AC_CHECK_LIB(cma, pthread_create, [AC_DEFINE(WITH_THREAD) - AC_DEFINE(_POSIX_THREADS) - LIBS="$LIBS -lcma" - LIBOBJS="$LIBOBJS thread.o"],[ - USE_THREAD_MODULE="#"]) - ])])])])])])])])]) + if test "$ac_sys_system" = "UnixWare" + then + CC="${CC} -Kthread" + LIBOBJS="$LIBOBJS thread.o" + AC_DEFINE(WITH_THREAD) + AC_DEFINE(_POSIX_THREADS) + USE_THREAD_MODULE="" + else + if test ! -z "$with_threads" -a -d "$with_threads" + then LDFLAGS="$LDFLAGS -L$with_threads" + fi + if test ! -z "$withval" -a -d "$withval" + then LDFLAGS="$LDFLAGS -L$withval" + fi + AC_DEFINE(_REENTRANT) + AC_CHECK_HEADER(mach/cthreads.h, [AC_DEFINE(WITH_THREAD) + AC_DEFINE(C_THREADS) + LIBOBJS="$LIBOBJS thread.o"],[ + AC_MSG_CHECKING(for --with-pth) + AC_ARG_WITH(pth, + [ --with-pth use GNU pth threading libraries], [ + AC_MSG_RESULT($withval) + AC_DEFINE(WITH_THREAD) + AC_DEFINE(HAVE_PTH) + LIBS="-lpth $LIBS" + LIBOBJS="$LIBOBJS thread.o"],[ + AC_MSG_RESULT(no) + AC_CHECK_LIB(pthread, pthread_create, [AC_DEFINE(WITH_THREAD) + AC_DEFINE(_POSIX_THREADS) + LIBS="-lpthread $LIBS" + LIBOBJS="$LIBOBJS thread.o"],[ + AC_CHECK_FUNC(pthread_detach, [AC_DEFINE(WITH_THREAD) + case $ac_sys_system in + Darwin*) ;; + *) AC_DEFINE(_POSIX_THREADS);; + esac + LIBOBJS="$LIBOBJS thread.o"],[ + AC_CHECK_HEADER(kernel/OS.h, [AC_DEFINE(WITH_THREAD) + AC_DEFINE(BEOS_THREADS) + LIBOBJS="$LIBOBJS thread.o"],[ + AC_CHECK_LIB(pthreads, pthread_create, [AC_DEFINE(WITH_THREAD) + AC_DEFINE(_POSIX_THREADS) + LIBS="$LIBS -lpthreads" + LIBOBJS="$LIBOBJS thread.o"], [ + AC_CHECK_LIB(c_r, pthread_create, [AC_DEFINE(WITH_THREAD) + AC_DEFINE(_POSIX_THREADS) + LIBS="$LIBS -lc_r" + LIBOBJS="$LIBOBJS thread.o"], [ + AC_CHECK_LIB(thread, __d6_pthread_create, [AC_DEFINE(WITH_THREAD) + AC_DEFINE(_POSIX_THREADS) + LIBS="$LIBS -lthread" + LIBOBJS="$LIBOBJS thread.o"], [ + AC_CHECK_LIB(pthread, __pthread_create_system, [AC_DEFINE(WITH_THREAD) + AC_DEFINE(_POSIX_THREADS) + LIBS="$LIBS -lpthread" + LIBOBJS="$LIBOBJS thread.o"], [ + AC_CHECK_LIB(cma, pthread_create, [AC_DEFINE(WITH_THREAD) + AC_DEFINE(_POSIX_THREADS) + LIBS="$LIBS -lcma" + LIBOBJS="$LIBOBJS thread.o"],[ + USE_THREAD_MODULE="#"]) + ])])])])])])])])]) - AC_CHECK_LIB(mpc, usconfig, [AC_DEFINE(WITH_THREAD) - LIBS="$LIBS -lmpc" - LIBOBJS="$LIBOBJS thread.o" - USE_THREAD_MODULE=""]) - AC_CHECK_LIB(thread, thr_create, [AC_DEFINE(WITH_THREAD) - LIBS="$LIBS -lthread" - LIBOBJS="$LIBOBJS thread.o" - USE_THREAD_MODULE=""]) + AC_CHECK_LIB(mpc, usconfig, [AC_DEFINE(WITH_THREAD) + LIBS="$LIBS -lmpc" + LIBOBJS="$LIBOBJS thread.o" + USE_THREAD_MODULE=""]) + AC_CHECK_LIB(thread, thr_create, [AC_DEFINE(WITH_THREAD) + LIBS="$LIBS -lthread" + LIBOBJS="$LIBOBJS thread.o" + USE_THREAD_MODULE=""]) - if test "$USE_THREAD_MODULE" != "#" - then - # If the above checks didn't disable threads, (at least) OSF1 - # needs this '-threads' argument during linking. - case $ac_sys_system in - OSF1) LDLAST=-threads;; - esac + if test "$USE_THREAD_MODULE" != "#" + then + # If the above checks didn't disable threads, (at least) OSF1 + # needs this '-threads' argument during linking. + case $ac_sys_system in + OSF1) LDLAST=-threads;; + esac + fi fi fi