From bf377ba45c8c1cbcf843fdecc6d5c68fda6bad18 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 28 Jan 1999 09:41:07 +0000 Subject: [PATCH] Initial revision --- README.txt | 35 + include/yaz-ir-assoc.h | 52 ++ include/yaz-pdu-assoc.h | 61 ++ include/yaz-pdu-observer.h | 53 ++ include/yaz-proxy.h | 47 ++ include/yaz-socket-manager.h | 59 ++ include/yaz-socket-observer.h | 68 ++ src/Makefile.in | 67 ++ src/yaz-client.cpp | 83 ++ src/yaz-ir-assoc.cpp | 105 +++ src/yaz-pdu-assoc.cpp | 315 ++++++++ src/yaz-proxy-main.cpp | 26 + src/yaz-proxy.cpp | 78 ++ src/yaz-server.cpp | 72 ++ src/yaz-socket-manager.cpp | 239 ++++++ unix/Makefile.in | 20 + unix/configure | 1777 +++++++++++++++++++++++++++++++++++++++++ unix/configure.in | 47 ++ unix/install-sh | 250 ++++++ 19 files changed, 3454 insertions(+) create mode 100644 README.txt create mode 100644 include/yaz-ir-assoc.h create mode 100644 include/yaz-pdu-assoc.h create mode 100644 include/yaz-pdu-observer.h create mode 100644 include/yaz-proxy.h create mode 100644 include/yaz-socket-manager.h create mode 100644 include/yaz-socket-observer.h create mode 100644 src/Makefile.in create mode 100644 src/yaz-client.cpp create mode 100644 src/yaz-ir-assoc.cpp create mode 100644 src/yaz-pdu-assoc.cpp create mode 100644 src/yaz-proxy-main.cpp create mode 100644 src/yaz-proxy.cpp create mode 100644 src/yaz-server.cpp create mode 100644 src/yaz-socket-manager.cpp create mode 100644 unix/Makefile.in create mode 100755 unix/configure create mode 100644 unix/configure.in create mode 100755 unix/install-sh diff --git a/README.txt b/README.txt new file mode 100644 index 0000000..c7a07e5 --- /dev/null +++ b/README.txt @@ -0,0 +1,35 @@ +YAZ++ - A C++ library for YAZ + +$Id: README.txt,v 1.1 1999-01-28 09:41:07 adam Exp $ + +o Introduction + +YAZ is development toolkit that implements the ANSI Z39.50 protocol. +YAZ homepage is: http://www.indexdata.dk/yaz + +YAZ++ is a C++ wrapper on top of that YAZ. It provides a relatively +simple, high level, interface to YAZ. + +o Documentatation + +Description of object model can be found in the sub directory doc, file +index.html. + +The documentation was auto-generated from source using doc++. + +o Installation + +Before compilation can take place YAZ must be installed. Unpack +yaz-.tar.gz in the same directory as yaz++. + +For Unix - make sure you have a C++ compiler available. g++ works fine. + $ cd unix + $ ./configure + $ make + +For Windows. The software was build using Microsoft Visual C++ 5.0 and +6.0. Other compilers should work but the makefile will have to be +modified. + > cd win + > nmake (Visual C++ makefile not yet created) + diff --git a/include/yaz-ir-assoc.h b/include/yaz-ir-assoc.h new file mode 100644 index 0000000..e615c0a --- /dev/null +++ b/include/yaz-ir-assoc.h @@ -0,0 +1,52 @@ +/* + * Copyright (c) 1998-1999, Index Data. + * See the file LICENSE for details. + * Sebastian Hammer, Adam Dickmeiss + * + * $Log: yaz-ir-assoc.h,v $ + * Revision 1.1 1999-01-28 09:41:07 adam + * Initial revision + * + */ + + +#include +#include +#include + +/** Information Retrieval Assocation. + This object implements the client - and server role of a generic + Z39.50 Association. + */ +class Yaz_IR_Assoc : public IYaz_PDU_Observer { + public: + /// Create object using the PDU Observer specified + Yaz_IR_Assoc(IYaz_PDU_Observable *the_PDU_Observable); + /// Destroy assocation and close PDU Observer + virtual ~Yaz_IR_Assoc(); + /// Receive PDU + void recv_PDU(const char *buf, int len); + /// Connect notification + void connectNotify(); + /// Failure notification + void failNotify(); + /// Begin Z39.50 client role + void client(const char *addr); + /// Begin Z39.50 server role + void server(const char *addr); + /// Decode Z39.50 PDU. + Z_APDU *decode_Z_PDU(const char *buf, int len); + /// Encode Z39.50 PDU. + int encode_Z_PDU(Z_APDU *apdu, char **buf, int *len); + /// Send Z39.50 PDU + int send_Z_PDU(Z_APDU *apdu); + /// Receive Z39.50 PDU + virtual void recv_Z_PDU (Z_APDU *apdu) = 0; + /// Create Z39.50 with reasonable defaults + Z_APDU *create_Z_PDU(int type); + private: + IYaz_PDU_Observable *m_PDU_Observable; + ODR m_odr_in; + ODR m_odr_out; + ODR m_odr_print; +}; diff --git a/include/yaz-pdu-assoc.h b/include/yaz-pdu-assoc.h new file mode 100644 index 0000000..079a55f --- /dev/null +++ b/include/yaz-pdu-assoc.h @@ -0,0 +1,61 @@ +/* + * Copyright (c) 1998-1999, Index Data. + * See the file LICENSE for details. + * Sebastian Hammer, Adam Dickmeiss + * + * $Log: yaz-pdu-assoc.h,v $ + * Revision 1.1 1999-01-28 09:41:07 adam + * Initial revision + * + */ + +#include +#include +#include + +/** Simple Protocol Data Unit Assocation. + This object sends - and receives PDU's using the COMSTACK + network utility. To use the association in client role, use + the method connect. The server role is initiated by using the + listen method. + */ +class Yaz_PDU_Assoc : public IYaz_PDU_Observable, IYazSocketObserver { + private: + enum { Connecting, Connected, Listen, Ready, Closed } m_state; + class PDU_Queue { + public: + PDU_Queue(const char *buf, int len); + PDU_Queue::~PDU_Queue(); + char *m_buf; + int m_len; + PDU_Queue *m_next; + }; + Yaz_PDU_Assoc *m_parent; + Yaz_PDU_Assoc *m_children; + Yaz_PDU_Assoc *m_next; + COMSTACK Yaz_PDU_Assoc::comstack(); + COMSTACK m_cs; + IYazSocketObservable *m_socketObservable; + IYaz_PDU_Observer *m_PDU_Observer; + char *m_input_buf; + int m_input_len; + PDU_Queue *m_queue_out; + int Yaz_PDU_Assoc::flush_PDU(); + public: + /// Create object using specified socketObservable + Yaz_PDU_Assoc(IYazSocketObservable *socketObservable, COMSTACK cs); + /// Close socket and destroy object. + virtual ~Yaz_PDU_Assoc(); + /// Clone the object + IYaz_PDU_Observable *clone(); + /// Send PDU + int send_PDU(const char *buf, int len); + /// connect to server (client role) + void connect(IYaz_PDU_Observer *observer, const char *addr); + /// listen for clients (server role) + void listen(IYaz_PDU_Observer *observer, const char *addr); + /// Socket notification + void socketNotify(int event); + /// Close socket + void close(); +}; diff --git a/include/yaz-pdu-observer.h b/include/yaz-pdu-observer.h new file mode 100644 index 0000000..eef08b4 --- /dev/null +++ b/include/yaz-pdu-observer.h @@ -0,0 +1,53 @@ +/* + * Copyright (c) 1998-1999, Index Data. + * See the file LICENSE for details. + * Sebastian Hammer, Adam Dickmeiss + * + * $Log: yaz-pdu-observer.h,v $ + * Revision 1.1 1999-01-28 09:41:07 adam + * Initial revision + * + */ + +#ifndef YAZ_PDU_OBSERVER_H +#define YAZ_PDU_OBSERVER_H + +class IYaz_PDU_Observer; + +/** Protocol Data Unit Observable. + This interface implements a Protocol Data Unit (PDU) network driver. + The PDU's is not encoded/decoded by this interface. They are simply + transmitted/received over the network. To use this interface the + IYaz_PDU_Observer interface must be implemented. + */ +class IYaz_PDU_Observable { + public: + /// Send encoded PDU buffer of specified length + virtual int send_PDU(const char *buf, int len) = 0; + /// Connect with server specified by addr. + virtual void connect(IYaz_PDU_Observer *observer, const char *addr) = 0; + /// Listen on address addr. + virtual void listen(IYaz_PDU_Observer *observer, const char *addr) = 0; + /// Close connection + virtual void close() = 0; + /// Make clone of this object using this interface + virtual IYaz_PDU_Observable *clone() = 0; +}; + +/** Protocol Data Unit Observer. + This interface is used together with the IYaz_PDU_Observable interface + and acts as a callback interface for it. + */ +class IYaz_PDU_Observer { + public: + /// A PDU has been received + virtual void recv_PDU(const char *buf, int len) = 0; + /// Called when Iyaz_PDU_Observabvle::connect was successful. + virtual void connectNotify() = 0; + /// Called whenever the connection was closed + virtual void failNotify() = 0; + /// Make clone of observer using IYaz_PDU_Observable interface + virtual IYaz_PDU_Observer *clone(IYaz_PDU_Observable *the_PDU_Observable) = 0; +}; + +#endif diff --git a/include/yaz-proxy.h b/include/yaz-proxy.h new file mode 100644 index 0000000..edb2c9a --- /dev/null +++ b/include/yaz-proxy.h @@ -0,0 +1,47 @@ +/* + * Copyright (c) 1998-1999, Index Data. + * See the file LICENSE for details. + * Sebastian Hammer, Adam Dickmeiss + * + * $Log: yaz-proxy.h,v $ + * Revision 1.1 1999-01-28 09:41:07 adam + * Initial revision + * + * + */ + +#include + +class Yaz_Proxy; + +/// Private class +class Yaz_ProxyClient : public Yaz_IR_Assoc { + friend Yaz_Proxy; + Yaz_ProxyClient(IYaz_PDU_Observable *the_PDU_Observable); + void recv_Z_PDU(Z_APDU *apdu); + IYaz_PDU_Observer* clone(IYaz_PDU_Observable *the_PDU_Observable); + Yaz_Proxy *m_server; + void failNotify(); +}; + +/// Private class +class Yaz_ProxyMap { + friend Yaz_Proxy; + char *m_databaseName; /* from database name */ + char *m_ZURL; /* to this address */ + Yaz_ProxyMap *m_next; +}; + +/// Information Retrieval Proxy Server. +class Yaz_Proxy : public Yaz_IR_Assoc { + public: + Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable); + ~Yaz_Proxy(); + void recv_Z_PDU(Z_APDU *apdu); + IYaz_PDU_Observer* clone(IYaz_PDU_Observable *the_PDU_Observable); + void failNotify(); + Yaz_ProxyClient *m_client; + IYaz_PDU_Observable *m_PDU_Observable; + private: + Yaz_ProxyMap *m_maps; +}; diff --git a/include/yaz-socket-manager.h b/include/yaz-socket-manager.h new file mode 100644 index 0000000..dae89d6 --- /dev/null +++ b/include/yaz-socket-manager.h @@ -0,0 +1,59 @@ +/* + * Copyright (c) 1998-1999, Index Data. + * See the file LICENSE for details. + * Sebastian Hammer, Adam Dickmeiss + * + * $Log: yaz-socket-manager.h,v $ + * Revision 1.1 1999-01-28 09:41:07 adam + * Initial revision + * + */ + +#include + +/** Simple Socket Manager. + Implements a stand-alone simple model that uses select(2) to + observe socket events. +*/ +class Yaz_SocketManager : public IYazSocketObservable { + private: + struct YazSocketEntry { + IYazSocketObserver *observer; + int fd; + unsigned mask; + unsigned timeout; + YazSocketEntry *next; + }; + YazSocketEntry *m_observers; // all registered observers + struct YazSocketEvent { + IYazSocketObserver *observer; + int event; + YazSocketEvent *next; // front in queue + YazSocketEvent *prev; // back in queue + }; + YazSocketEvent *m_queue_front; + YazSocketEvent *m_queue_back; + + YazSocketEntry **Yaz_SocketManager::lookupObserver + (IYazSocketObserver *observer); + YazSocketEvent *Yaz_SocketManager::getEvent(); + void putEvent(YazSocketEvent *event); + void removeEvent(IYazSocketObserver *observer); + public: + /// Add an observer + virtual void addObserver(int fd, IYazSocketObserver *observer); + /// Delete an observer + virtual void deleteObserver(IYazSocketObserver *observer); + /// Delete all observers + virtual void deleteObservers(); + /// Set event mask for observer + virtual void maskObserver(IYazSocketObserver *observer, int mask); + /// Set timeout + virtual void timeoutObserver(IYazSocketObserver *observer, + unsigned timeout); + /// Process one event. return > 0 if event could be processed; + int Yaz_SocketManager::processEvent(); + Yaz_SocketManager(); + virtual ~Yaz_SocketManager(); +}; + diff --git a/include/yaz-socket-observer.h b/include/yaz-socket-observer.h new file mode 100644 index 0000000..c859bbb --- /dev/null +++ b/include/yaz-socket-observer.h @@ -0,0 +1,68 @@ +/* + * Copyright (c) 1998-1999, Index Data. + * See the file LICENSE for details. + * Sebastian Hammer, Adam Dickmeiss + * + * $Log: yaz-socket-observer.h,v $ + * Revision 1.1 1999-01-28 09:41:07 adam + * Initial revision + * + */ + +#ifndef YAZ_SOCKET_OBSERVER_H +#define YAZ_SOCKET_OBSERVER_H + +#define YAZ_SOCKET_OBSERVE_READ 1 +#define YAZ_SOCKET_OBSERVE_WRITE 2 +#define YAZ_SOCKET_OBSERVE_EXCEPT 4 +#define YAZ_SOCKET_OBSERVE_TIME 8 + +/** + Forward reference + */ +class IYazSocketObserver; + +/** Socket Observable. + This interface implements notification of socket events. + The module interested in (observing) the sockets + must implement the IYazSocketObserver interface. The + IYazSocketObserver only have to implement one function, so it's + quite simple to observe sockets change state. + The socket events below specifies read, write, exception, + and timeout respectively: + 
+    YAZ_SOCKET_OBSERVE_READ
+    YAZ_SOCKET_OBSERVE_WRITE
+    YAZ_SOCKET_OBSERVE_EXCEPT
+    YAZ_SOCKET_OBSERVE_TIMEOUT
+
+ The maskObserver method specifies which of these events the + observer is intertested in. +*/ +class IYazSocketObservable { + public: + /// Add an observer interested in socket fd + virtual void addObserver(int fd, IYazSocketObserver *observer) = 0; + /// Delete an observer + virtual void deleteObserver(IYazSocketObserver *observer) = 0; + /// Delete all observers + virtual void deleteObservers() = 0; + /// Specify the events that the observer is intersted in. + virtual void maskObserver(IYazSocketObserver *observer, int mask) = 0; + /// Specify timeout + virtual void timeoutObserver(IYazSocketObserver *observer, + unsigned timeout)=0; +}; + +/** Socket Observer. + The IYazSocketObserver interface implements a module interested + socket events. Look for objects that implements the + IYazSocketObservable interface! +*/ +class IYazSocketObserver { + public: + /// Notify the observer that something happened to socket + virtual void socketNotify(int event) = 0; +}; + +#endif diff --git a/src/Makefile.in b/src/Makefile.in new file mode 100644 index 0000000..da2c0af --- /dev/null +++ b/src/Makefile.in @@ -0,0 +1,67 @@ +# Copyright (C) 1999, Index Data +# All rights reserved. +# Sebastian Hammer, Adam Dickmeiss +# $Id: Makefile.in,v 1.1 1999-01-28 09:41:07 adam Exp $ + +SHELL=/bin/sh + +CC=@CC@ +CXX=@CXX@ +CPP=@CPP@ +CXXCPP=@CXXCPP@ +RANLIB=@RANLIB@ +CDEFS=@DEFS@ +LIBS=@LIBS@ + +LIBDIR=../../yaz/lib + +INCLUDE=-I../../yaz/z39.50 -I../../yaz/include -I../include +DEFS=$(INCLUDE) $(CDEFS) +YAZLIBS=$(LIBDIR)/libasn.a \ + $(LIBDIR)/libcomstack.a $(LIBDIR)/ccl.a \ + $(LIBDIR)/libodr.a $(LIBDIR)/libutil.a +PROG1=yaz-client +PROGO1=yaz-client.o +PROG2=yaz-server +PROGO2=yaz-server.o +PROG3=yaz-proxy +PROGO3=yaz-proxy-main.o +LIB=$(LIBDIR)/yazchan.lib +PO=yaz-socket-manager.o yaz-pdu-assoc.o yaz-ir-assoc.o yaz-proxy.o + +.SUFFIXES: .cc + +all: $(PROG1) $(PROG2) $(PROG3) + +$(LIB): $(PO) + rm -f $(LIB) + ar qc $(LIB) $(PO) + $(RANLIB) $(LIB) + +$(PROG1): $(PROGO1) $(YAZLIBS) $(LIB) + $(CXX) $(CXXFLAGS) -o $(PROG1) $(PROGO1) $(LIB) $(YAZLIBS) $(LIBS) + +$(PROG2): $(PROGO2) $(YAZLIBS) $(LIB) + $(CXX) $(CXXFLAGS) -o $(PROG2) $(PROGO2) $(LIB) $(YAZLIBS) $(LIBS) + +$(PROG3): $(PROGO3) $(YAZLIBS) $(LIB) + $(CXX) $(CXXFLAGS) -o $(PROG3) $(PROGO3) $(LIB) $(YAZLIBS) $(LIBS) + +alll: + +.cc.o: + $(CXX) -c $(DEFS) $(CXXFLAGS) $< + +.c.o: + $(CC) -c $(DEFS) $(FLAGS) $< + +clean: + rm -f *.[oa] test core mon.out gmon.out errlist + rm -f $(PROG1) $(PROG2) $(PROG3) + +depend: + sed '/^#Depend/q' Makefile.tmp + $(CXXCPP) $(DEFS) -M *.cc >>Makefile.tmp + mv -f Makefile.tmp Makefile + +#Depend --- DOT NOT DELETE THIS LINE diff --git a/src/yaz-client.cpp b/src/yaz-client.cpp new file mode 100644 index 0000000..20c3ced --- /dev/null +++ b/src/yaz-client.cpp @@ -0,0 +1,83 @@ +/* + * Copyright (c) 1998-1999, Index Data. + * See the file LICENSE for details. + * Sebastian Hammer, Adam Dickmeiss + * + * $Log: yaz-client.cpp,v $ + * Revision 1.1 1999-01-28 09:41:07 adam + * Initial revision + * + */ + +#include +#include +#include +#include + +class MyClient : public Yaz_IR_Assoc { +public: + MyClient(IYaz_PDU_Observable *the_PDU_Observable); + void recv_Z_PDU(Z_APDU *apdu); + IYaz_PDU_Observer *clone(IYaz_PDU_Observable *the_PDU_Observable); + void sendInit(); +}; + +void MyClient::recv_Z_PDU(Z_APDU *apdu) +{ + logf (LOG_LOG, "recv_APDU"); + switch (apdu->which) + { + case Z_APDU_initResponse: + logf (LOG_LOG, "got InitResponse"); + break; + case Z_APDU_searchResponse: + logf (LOG_LOG, "got searchResponse"); + break; + } +} + +IYaz_PDU_Observer *MyClient::clone(IYaz_PDU_Observable *the_PDU_Observable) +{ + return new MyClient(the_PDU_Observable); +} + +MyClient::MyClient(IYaz_PDU_Observable *the_PDU_Observable) : + Yaz_IR_Assoc (the_PDU_Observable) +{ + +} + +void MyClient::sendInit() +{ + Z_APDU *apdu = create_Z_PDU(Z_APDU_initRequest); + Z_InitRequest *req = apdu->u.initRequest; + + ODR_MASK_SET(req->options, Z_Options_search); + ODR_MASK_SET(req->options, Z_Options_present); + ODR_MASK_SET(req->options, Z_Options_namedResultSets); + ODR_MASK_SET(req->options, Z_Options_triggerResourceCtrl); + ODR_MASK_SET(req->options, Z_Options_scan); + ODR_MASK_SET(req->options, Z_Options_sort); + ODR_MASK_SET(req->options, Z_Options_extendedServices); + ODR_MASK_SET(req->options, Z_Options_delSet); + + ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_1); + ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_2); + ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_3); + + send_Z_PDU(apdu); +} + +int main(int argc, char **argv) +{ + Yaz_SocketManager mySocketManager; + + Yaz_PDU_Assoc my_PDU_Assoc(&mySocketManager, 0); + MyClient z(&my_PDU_Assoc); + + z.client("localhost:9999"); + z.sendInit(); + + while (mySocketManager.processEvent() > 0) + ; +} diff --git a/src/yaz-ir-assoc.cpp b/src/yaz-ir-assoc.cpp new file mode 100644 index 0000000..ccaa002 --- /dev/null +++ b/src/yaz-ir-assoc.cpp @@ -0,0 +1,105 @@ +/* + * Copyright (c) 1998-1999, Index Data. + * See the file LICENSE for details. + * Sebastian Hammer, Adam Dickmeiss + * + * $Log: yaz-ir-assoc.cpp,v $ + * Revision 1.1 1999-01-28 09:41:07 adam + * Initial revision + * + */ + +#include +#include + +Yaz_IR_Assoc::Yaz_IR_Assoc(IYaz_PDU_Observable *the_PDU_Observable) +{ + m_PDU_Observable = the_PDU_Observable; + m_odr_in = odr_createmem (ODR_DECODE); + m_odr_out = odr_createmem (ODR_ENCODE); + m_odr_print = odr_createmem (ODR_PRINT); +} + +Yaz_IR_Assoc::~Yaz_IR_Assoc() +{ + if (m_PDU_Observable) + m_PDU_Observable->close(); + odr_destroy (m_odr_print); + odr_destroy (m_odr_out); + odr_destroy (m_odr_in); +} + +void Yaz_IR_Assoc::recv_PDU(const char *buf, int len) +{ + logf (LOG_LOG, "recv_PDU len=%d", len); + Z_APDU *apdu = decode_Z_PDU (buf, len); + if (apdu) + recv_Z_PDU (apdu); +} + +Z_APDU *Yaz_IR_Assoc::create_Z_PDU(int type) +{ + return zget_APDU(m_odr_out, type); +} + +int Yaz_IR_Assoc::send_Z_PDU(Z_APDU *apdu) +{ + char *buf; + int len; + if (encode_Z_PDU(apdu, &buf, &len) > 0) + return m_PDU_Observable->send_PDU(buf, len); + return -1; +} + +Z_APDU *Yaz_IR_Assoc::decode_Z_PDU(const char *buf, int len) +{ + Z_APDU *apdu; + + odr_reset (m_odr_in); + odr_setbuf (m_odr_in, (char*) buf, len, 0); + + if (!z_APDU(m_odr_in, &apdu, 0)) + { + logf(LOG_LOG, "ODR error on incoming PDU: %s [near byte %d] ", + odr_errmsg(odr_geterror(m_odr_in)), + odr_offset(m_odr_in)); + logf(LOG_LOG, "PDU dump:"); + odr_dumpBER(log_file(), buf, len); + return 0; + } + else + { + logf (LOG_LOG, "decoded ok"); + return apdu; + } +} + +int Yaz_IR_Assoc::encode_Z_PDU(Z_APDU *apdu, char **buf, int *len) +{ + if (!z_APDU(m_odr_out, &apdu, 0)) + return -1; + *buf = odr_getbuf (m_odr_out, len, 0); + odr_reset (m_odr_out); + return *len; +} + +void Yaz_IR_Assoc::connectNotify() +{ + logf (LOG_LOG, "connectNotify"); +} + +void Yaz_IR_Assoc::failNotify() +{ + logf (LOG_LOG, "failNotify"); +} + +void Yaz_IR_Assoc::client(const char *addr) +{ + m_PDU_Observable->connect (this, addr); +} + +void Yaz_IR_Assoc::server(const char *addr) +{ + m_PDU_Observable->listen (this, addr); +} + diff --git a/src/yaz-pdu-assoc.cpp b/src/yaz-pdu-assoc.cpp new file mode 100644 index 0000000..6056b2d --- /dev/null +++ b/src/yaz-pdu-assoc.cpp @@ -0,0 +1,315 @@ +/* + * Copyright (c) 1998-1999, Index Data. + * See the file LICENSE for details. + * Sebastian Hammer, Adam Dickmeiss + * + * $Log: yaz-pdu-assoc.cpp,v $ + * Revision 1.1 1999-01-28 09:41:07 adam + * Initial revision + * + */ + +#include + +#include + +#include +#include + +Yaz_PDU_Assoc::Yaz_PDU_Assoc(IYazSocketObservable *socketObservable, + COMSTACK cs) +{ + m_state = Closed; + m_cs = cs; + m_socketObservable = socketObservable; + m_PDU_Observer = 0; + m_queue_out = 0; + m_input_buf = 0; + m_input_len = 0; + m_children = 0; + m_parent = 0; + m_next = 0; +} + +IYaz_PDU_Observable *Yaz_PDU_Assoc::clone() +{ + Yaz_PDU_Assoc *copy = new Yaz_PDU_Assoc(m_socketObservable, 0); + return copy; +} + +Yaz_PDU_Assoc::~Yaz_PDU_Assoc() +{ + Yaz_PDU_Assoc **c; + close(); + + logf (LOG_LOG, "m_children=%p m_parent=%p", m_children, + m_parent); + // delete from parent's child list (if any) + if (m_parent) + { + c = &m_parent->m_children; + while (*c != this) + { + assert (*c); + c = &(*c)->m_next; + } + *c = (*c)->m_next; + } + // delete all children ... + c = &m_children; + while (*c) + { + Yaz_PDU_Assoc *here = *c; + *c = (*c)->m_next; + here->m_parent = 0; + delete here; + } +} + +void Yaz_PDU_Assoc::socketNotify(int event) +{ + logf (LOG_LOG, "socketNotify p=%p event = %d", this, event); + if (m_state == Connected) + { + m_state = Ready; + m_socketObservable->maskObserver(this, YAZ_SOCKET_OBSERVE_READ| + YAZ_SOCKET_OBSERVE_EXCEPT); + m_PDU_Observer->connectNotify(); + flush_PDU(); + } + else if (m_state == Connecting) + { + if (event & YAZ_SOCKET_OBSERVE_READ) + { + close(); + m_PDU_Observer->failNotify(); + } + else + { + m_state = Ready; + m_socketObservable->maskObserver(this, YAZ_SOCKET_OBSERVE_READ| + YAZ_SOCKET_OBSERVE_EXCEPT); + m_PDU_Observer->connectNotify(); + flush_PDU(); + } + } + else if (m_state == Listen) + { + logf (LOG_LOG, "handler_listen %d", event); + if (event & YAZ_SOCKET_OBSERVE_READ) + { + int res; + COMSTACK new_line; + + if ((res = cs_listen(m_cs, 0, 0)) == 1) + return; + if (res < 0) + { + logf(LOG_FATAL, "cs_listen failed"); + return; + } + if (!(new_line = cs_accept(m_cs))) + return; + + Yaz_PDU_Assoc *assoc = new Yaz_PDU_Assoc (m_socketObservable, + new_line); + assoc->m_parent = this; + assoc->m_next = m_children; + m_children = assoc; + + assoc->m_PDU_Observer = m_PDU_Observer->clone(assoc); + assoc->m_state = Ready; + assoc->m_socketObservable->addObserver(cs_fileno(new_line), assoc); + assoc->m_socketObservable->maskObserver(assoc, + YAZ_SOCKET_OBSERVE_READ| + YAZ_SOCKET_OBSERVE_EXCEPT); + } + } + else if (m_state == Ready) + { + if (event & YAZ_SOCKET_OBSERVE_WRITE) + { + logf (LOG_LOG, "socketNotify write"); + flush_PDU(); + } + if (event & YAZ_SOCKET_OBSERVE_READ) + { + logf (LOG_LOG, "socketNotify read"); + do + { + int res = cs_get (m_cs, &m_input_buf, &m_input_len); + if (res == 1) + return; + else if (res <= 0) + { + logf (LOG_LOG, "Connection closed by server"); + close(); + m_PDU_Observer->failNotify(); + return; + } + m_PDU_Observer->recv_PDU(m_input_buf, res); + } while (cs_more (m_cs)); + } + } +} + +void Yaz_PDU_Assoc::close() +{ + m_socketObservable->deleteObserver(this); + m_state = Closed; + if (m_cs) + { + logf (LOG_LOG, "Yaz_PDU_Assoc::close fd=%d", cs_fileno(m_cs)); + cs_close (m_cs); + } + m_cs = 0; + PDU_Queue **q = &m_queue_out; + while (*q) + { + PDU_Queue *q_this = *q; + *q = (*q)->m_next; + delete q_this; + } + free (m_input_buf); + m_input_buf = 0; + m_input_len = 0; +} + +Yaz_PDU_Assoc::PDU_Queue::PDU_Queue(const char *buf, int len) +{ + m_buf = (char *) malloc (len); + memcpy (m_buf, buf, len); + m_len = len; + m_next = 0; +} + +Yaz_PDU_Assoc::PDU_Queue::~PDU_Queue() +{ + free (m_buf); +} + +int Yaz_PDU_Assoc::flush_PDU() +{ + int r; + + logf (LOG_LOG, "flush_PDU fd=%d", cs_fileno(m_cs)); + if (m_state != Ready) + return 1; + PDU_Queue *q = m_queue_out; + if (!q) + { + m_socketObservable->maskObserver(this, YAZ_SOCKET_OBSERVE_READ| + YAZ_SOCKET_OBSERVE_EXCEPT); + return 0; + } + r = cs_put (m_cs, q->m_buf, q->m_len); + if (r < 0) + { + close(); + m_PDU_Observer->failNotify(); + return r; + } + if (r == 1) + { + m_socketObservable->maskObserver(this, YAZ_SOCKET_OBSERVE_READ| + YAZ_SOCKET_OBSERVE_EXCEPT| + YAZ_SOCKET_OBSERVE_WRITE); + logf (LOG_LOG, "put %d bytes (incomplete write)", q->m_len); + return r; + } + logf (LOG_LOG, "put %d bytes fd=%d", q->m_len, cs_fileno(m_cs)); + // whole packet sent... delete this and proceed to next ... + m_queue_out = q->m_next; + logf (LOG_LOG, "m_queue_out = %p", m_queue_out); + delete q; + // don't select on write if queue is empty ... + if (!m_queue_out) + m_socketObservable->maskObserver(this, YAZ_SOCKET_OBSERVE_READ| + YAZ_SOCKET_OBSERVE_EXCEPT); + return r; +} + +int Yaz_PDU_Assoc::send_PDU(const char *buf, int len) +{ + PDU_Queue **pq = &m_queue_out; + int is_idle = (*pq ? 0 : 1); + + logf (LOG_LOG, "send_PDU, m_queue_out=%p fd=%d", m_queue_out, + cs_fileno(m_cs)); + if (!m_cs) + { + logf (LOG_LOG, "send_PDU failed, m_cs == 0"); + return 0; + } + while (*pq) + pq = &(*pq)->m_next; + *pq = new PDU_Queue(buf, len); + if (is_idle) + { + return flush_PDU (); + } + else + { + logf (LOG_LOG, "cannot send_PDU fd=%d", cs_fileno(m_cs)); + } + return 0; +} + +COMSTACK Yaz_PDU_Assoc::comstack() +{ + if (!m_cs) + { + CS_TYPE cs_type = tcpip_type; + int protocol = PROTO_Z3950; + m_cs = cs_create (cs_type, 0, protocol); + } + return m_cs; +} + +void Yaz_PDU_Assoc::listen(IYaz_PDU_Observer *observer, + const char *addr) +{ + close(); + void *ap; + COMSTACK cs = comstack(); + + m_PDU_Observer = observer; + if (!cs) + return; + ap = cs_straddr (cs, addr); + if (!ap) + return; + if (cs_bind(cs, ap, CS_SERVER) < 0) + return; + m_socketObservable->addObserver(cs_fileno(cs), this); + m_socketObservable->maskObserver(this, YAZ_SOCKET_OBSERVE_READ| + YAZ_SOCKET_OBSERVE_EXCEPT); + m_state = Listen; +} + +void Yaz_PDU_Assoc::connect(IYaz_PDU_Observer *observer, + const char *addr) +{ + logf (LOG_LOG, "Yaz_PDU_Assoc::connect"); + close(); + m_PDU_Observer = observer; + COMSTACK cs = comstack(); + void *ap = cs_straddr (cs, addr); + if (!ap) + return; + int res = cs_connect (cs, ap); + if (res < 0) + { + logf (LOG_DEBUG, "Yaz_PDU_Assoc::connect failed"); + close (); + return; + } + m_socketObservable->addObserver(cs_fileno(cs), this); + m_socketObservable->maskObserver(this, YAZ_SOCKET_OBSERVE_READ| + YAZ_SOCKET_OBSERVE_EXCEPT| + YAZ_SOCKET_OBSERVE_WRITE); + if (res == 1) + m_state = Connecting; + else + m_state = Connected; +} diff --git a/src/yaz-proxy-main.cpp b/src/yaz-proxy-main.cpp new file mode 100644 index 0000000..20592b4 --- /dev/null +++ b/src/yaz-proxy-main.cpp @@ -0,0 +1,26 @@ +/* + * Copyright (c) 1998-1999, Index Data. + * See the file LICENSE for details. + * Sebastian Hammer, Adam Dickmeiss + * + * $Log: yaz-proxy-main.cpp,v $ + * Revision 1.1 1999-01-28 09:41:07 adam + * Initial revision + * + */ + +#include +#include +#include + +int main(int argc, char **argv) +{ + Yaz_SocketManager mySocketManager; + Yaz_PDU_Assoc *my_PDU_Assoc = new Yaz_PDU_Assoc(&mySocketManager, 0); + Yaz_Proxy proxy(my_PDU_Assoc); + + proxy.server("@:9999"); + while (mySocketManager.processEvent() > 0) + ; + return 0; +} diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp new file mode 100644 index 0000000..83bf5db --- /dev/null +++ b/src/yaz-proxy.cpp @@ -0,0 +1,78 @@ +/* + * Copyright (c) 1998-1999, Index Data. + * See the file LICENSE for details. + * Sebastian Hammer, Adam Dickmeiss + * + * $Log: yaz-proxy.cpp,v $ + * Revision 1.1 1999-01-28 09:41:07 adam + * Initial revision + * + */ + +#include + +#include + +#include + +Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable) : + Yaz_IR_Assoc(the_PDU_Observable) +{ + m_PDU_Observable = the_PDU_Observable; + m_maps = 0; + m_client = 0; +} + +Yaz_Proxy::~Yaz_Proxy() +{ +} + +IYaz_PDU_Observer *Yaz_Proxy::clone(IYaz_PDU_Observable + *the_PDU_Observable) +{ + return new Yaz_Proxy(the_PDU_Observable); +} + +void Yaz_Proxy::recv_Z_PDU(Z_APDU *apdu) +{ + if (apdu->which == Z_APDU_initRequest) + { + assert (m_client == 0); + logf (LOG_LOG, "got InitRequest"); + m_client = new Yaz_ProxyClient(m_PDU_Observable->clone()); + m_client->m_server = this; + m_client->client("localhost:8888"); + } + assert (m_client); + logf (LOG_LOG, "sending PDU"); + m_client->send_Z_PDU(apdu); +} + +void Yaz_Proxy::failNotify() +{ + delete m_client; + delete this; +} + +void Yaz_ProxyClient::failNotify() +{ + delete m_server; + delete this; +} + +IYaz_PDU_Observer *Yaz_ProxyClient::clone(IYaz_PDU_Observable + *the_PDU_Observable) +{ + return new Yaz_ProxyClient(the_PDU_Observable); +} + +Yaz_ProxyClient::Yaz_ProxyClient(IYaz_PDU_Observable *the_PDU_Observable) : + Yaz_IR_Assoc (the_PDU_Observable) +{ + +} + +void Yaz_ProxyClient::recv_Z_PDU(Z_APDU *apdu) +{ + m_server->send_Z_PDU(apdu); +} diff --git a/src/yaz-server.cpp b/src/yaz-server.cpp new file mode 100644 index 0000000..7d496c9 --- /dev/null +++ b/src/yaz-server.cpp @@ -0,0 +1,72 @@ +/* + * Copyright (c) 1998-1999, Index Data. + * See the file LICENSE for details. + * Sebastian Hammer, Adam Dickmeiss + * + * $Log: yaz-server.cpp,v $ + * Revision 1.1 1999-01-28 09:41:07 adam + * Initial revision + * + */ + +#include +#include +#include +#include + +class MyServer : public Yaz_IR_Assoc { +public: + MyServer(IYaz_PDU_Observable *the_PDU_Observable); + void recv_Z_PDU(Z_APDU *apdu); + IYaz_PDU_Observer* clone(IYaz_PDU_Observable *the_PDU_Observable); +}; + +static int stop = 0; + +void MyServer::recv_Z_PDU(Z_APDU *apdu) +{ + logf (LOG_LOG, "recv_Z_PDU"); + switch (apdu->which) + { + case Z_APDU_initRequest: + logf (LOG_LOG, "got InitRequest"); + apdu = create_Z_PDU(Z_APDU_initResponse); + send_Z_PDU(apdu); + break; + case Z_APDU_searchRequest: + logf (LOG_LOG, "got searchRequest"); + apdu = create_Z_PDU(Z_APDU_searchResponse); + send_Z_PDU(apdu); + break; + case Z_APDU_presentRequest: + logf (LOG_LOG, "got presentRequest"); + apdu = create_Z_PDU(Z_APDU_presentResponse); + send_Z_PDU(apdu); + stop = 1; + break; + } +} + +IYaz_PDU_Observer *MyServer::clone(IYaz_PDU_Observable *the_PDU_Observable) +{ + return new MyServer(the_PDU_Observable); +} + +MyServer::MyServer(IYaz_PDU_Observable *the_PDU_Observable) : + Yaz_IR_Assoc (the_PDU_Observable) +{ + +} + +int main(int argc, char **argv) +{ + Yaz_SocketManager mySocketManager; + + Yaz_PDU_Assoc my_PDU_Assoc(&mySocketManager, 0); + MyServer z(&my_PDU_Assoc); + + z.server("@:9999"); + + while (!stop && mySocketManager.processEvent() > 0) + ; +} diff --git a/src/yaz-socket-manager.cpp b/src/yaz-socket-manager.cpp new file mode 100644 index 0000000..a1ebbc5 --- /dev/null +++ b/src/yaz-socket-manager.cpp @@ -0,0 +1,239 @@ +/* + * Copyright (c) 1998-1999, Index Data. + * See the file LICENSE for details. + * Sebastian Hammer, Adam Dickmeiss + * + * $Log: yaz-socket-manager.cpp,v $ + * Revision 1.1 1999-01-28 09:41:07 adam + * Initial revision + * + */ +#include +#ifdef WINDOWS +#include +#else +#include +#include +#include +#endif +#include + +#include +#include + + +Yaz_SocketManager::YazSocketEntry **Yaz_SocketManager::lookupObserver( + IYazSocketObserver *observer) +{ + YazSocketEntry **se; + + for (se = &m_observers; *se; se = &(*se)->next) + if ((*se)->observer == observer) + break; + return se; +} + +void Yaz_SocketManager::addObserver(int fd, IYazSocketObserver *observer) +{ + YazSocketEntry *se; + + se = *lookupObserver(observer); + if (!se) + { + se = new YazSocketEntry; + se->next= m_observers; + m_observers = se; + se->observer = observer; + } + se->fd = fd; + se->mask = 0; +} + +void Yaz_SocketManager::deleteObserver(IYazSocketObserver *observer) +{ + YazSocketEntry **se = lookupObserver(observer); + if (*se) + { + removeEvent (observer); + YazSocketEntry *se_tmp = *se; + *se = (*se)->next; + delete se_tmp; + } +} + +void Yaz_SocketManager::deleteObservers() +{ + YazSocketEntry *se = m_observers; + + while (se) + { + YazSocketEntry *se_next = se->next; + delete se; + se = se_next; + } + m_observers = 0; +} + +void Yaz_SocketManager::maskObserver(IYazSocketObserver *observer, int mask) +{ + YazSocketEntry *se; + + se = *lookupObserver(observer); + if (se) + se->mask = mask; +} + +void Yaz_SocketManager::timeoutObserver(IYazSocketObserver *observer, + unsigned timeout) +{ + YazSocketEntry *se; + + se = *lookupObserver(observer); + if (se) + se->timeout = timeout; +} + +int Yaz_SocketManager::processEvent() +{ + YazSocketEvent *event = getEvent(); + if (event) + { + event->observer->socketNotify(event->event); + return 1; + } + + fd_set in, out, except; + int res; + int max = 0; + int no = 0; + struct timeval to; + struct timeval *timeout = &to; + + FD_ZERO(&in); + FD_ZERO(&out); + FD_ZERO(&except); + + timeout = &to; /* hang on select */ + to.tv_sec = 5*60; + to.tv_usec = 0; + + for (YazSocketEntry *p = m_observers; p; p = p->next) + { + int fd = p->fd; + logf (LOG_LOG, "fd = %d mask=%d", fd, p->mask); + if (p->mask) + no++; + if (p->mask & YAZ_SOCKET_OBSERVE_READ) + FD_SET(fd, &in); + if (p->mask & YAZ_SOCKET_OBSERVE_WRITE) + FD_SET(fd, &out); + if (p->mask & YAZ_SOCKET_OBSERVE_EXCEPT) + FD_SET(fd, &except); + if (fd > max) + max = fd; + } + if (!no) + return 0; + while ((res = select(max + 1, &in, &out, &except, timeout)) < 0) + if (errno != EINTR) + return -1; + + for (YazSocketEntry * p = m_observers; p; p = p->next) + { + int fd = p->fd; + int mask = 0; + if (FD_ISSET(fd, &in)) + mask |= YAZ_SOCKET_OBSERVE_READ; + + if (FD_ISSET(fd, &out)) + mask |= YAZ_SOCKET_OBSERVE_WRITE; + + if (FD_ISSET(fd, &except)) + mask |= YAZ_SOCKET_OBSERVE_EXCEPT; + + if (mask) + { + YazSocketEvent *event = new YazSocketEvent; + event->observer = p->observer; + event->event = mask; + putEvent (event); + } + } + if ((event = getEvent())) + { + event->observer->socketNotify(event->event); + return 1; + } + return 0; +} + +void Yaz_SocketManager::putEvent(YazSocketEvent *event) +{ + logf (LOG_LOG, "putEvent p=%p event=%d", event, event->event); + // put in back of queue + if (m_queue_back) + { + m_queue_back->prev = event; + assert (m_queue_front); + } + else + { + assert (!m_queue_front); + m_queue_front = event; + } + event->next = m_queue_back; + event->prev = 0; + m_queue_back = event; +} + +Yaz_SocketManager::YazSocketEvent *Yaz_SocketManager::getEvent() +{ + // get from front of queue + YazSocketEvent *event = m_queue_front; + if (!event) + return 0; + assert (m_queue_back); + m_queue_front = event->prev; + if (m_queue_front) + { + assert (m_queue_back); + m_queue_front->next = 0; + } + else + m_queue_back = 0; + return event; +} + +void Yaz_SocketManager::removeEvent(IYazSocketObserver *observer) +{ + YazSocketEvent *ev = m_queue_back; + while (ev) + { + YazSocketEvent *ev_next = ev->next; + if (observer == ev->observer) + { + if (ev->prev) + ev->prev->next = ev->next; + else + m_queue_back = ev->next; + if (ev->next) + ev->next->prev = ev->prev; + else + m_queue_front = ev->prev; + delete ev; + } + ev = ev_next; + } +} + +Yaz_SocketManager::Yaz_SocketManager() +{ + m_observers = 0; + m_queue_front = 0; + m_queue_back = 0; +} + +Yaz_SocketManager::~Yaz_SocketManager() +{ + deleteObservers(); +} diff --git a/unix/Makefile.in b/unix/Makefile.in new file mode 100644 index 0000000..55a6de6 --- /dev/null +++ b/unix/Makefile.in @@ -0,0 +1,20 @@ +# Copyright (C) 1999, Index Data +# All rights reserved. +# Sebastian Hammer, Adam Dickmeiss +# $Id: Makefile.in,v 1.1 1999-01-28 09:41:07 adam Exp $ +SHELL=/bin/sh +MAKE=make + +.PHONY: all doc clean distclean + +all: + cd ../src; $(MAKE) + +doc: + cd ../include; doc++ -H -d ../doc *.h + +clean: + cd ../src; $(MAKE) clean + +distclean: clean + rm -f ../src/Makefile Makefile config.* diff --git a/unix/configure b/unix/configure new file mode 100755 index 0000000..f9fa7e4 --- /dev/null +++ b/unix/configure @@ -0,0 +1,1777 @@ +#! /bin/sh + +# Guess values for system-dependent variables and create Makefiles. +# Generated automatically using autoconf version 2.12 +# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. +# +# This configure script is free software; the Free Software Foundation +# gives unlimited permission to copy, distribute and modify it. + +# Defaults: +ac_help= +ac_default_prefix=/usr/local +# Any additions from configure.in: +ac_help="$ac_help + --enable-threads enable threads if available" + +# Initialize some variables set by options. +# The variables have the same names as the options, with +# dashes changed to underlines. +build=NONE +cache_file=./config.cache +exec_prefix=NONE +host=NONE +no_create= +nonopt=NONE +no_recursion= +prefix=NONE +program_prefix=NONE +program_suffix=NONE +program_transform_name=s,x,x, +silent= +site= +srcdir= +target=NONE +verbose= +x_includes=NONE +x_libraries=NONE +bindir='${exec_prefix}/bin' +sbindir='${exec_prefix}/sbin' +libexecdir='${exec_prefix}/libexec' +datadir='${prefix}/share' +sysconfdir='${prefix}/etc' +sharedstatedir='${prefix}/com' +localstatedir='${prefix}/var' +libdir='${exec_prefix}/lib' +includedir='${prefix}/include' +oldincludedir='/usr/include' +infodir='${prefix}/info' +mandir='${prefix}/man' + +# Initialize some other variables. +subdirs= +MFLAGS= MAKEFLAGS= +# Maximum number of lines to put in a shell here document. +ac_max_here_lines=12 + +ac_prev= +for ac_option +do + + # If the previous option needs an argument, assign it. + if test -n "$ac_prev"; then + eval "$ac_prev=\$ac_option" + ac_prev= + continue + fi + + case "$ac_option" in + -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) ac_optarg= ;; + esac + + # Accept the important Cygnus configure options, so we can diagnose typos. + + case "$ac_option" in + + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; + -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) + bindir="$ac_optarg" ;; + + -build | --build | --buil | --bui | --bu) + ac_prev=build ;; + -build=* | --build=* | --buil=* | --bui=* | --bu=*) + build="$ac_optarg" ;; + + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) + cache_file="$ac_optarg" ;; + + -datadir | --datadir | --datadi | --datad | --data | --dat | --da) + ac_prev=datadir ;; + -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ + | --da=*) + datadir="$ac_optarg" ;; + + -disable-* | --disable-*) + ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` + # Reject names that are not valid shell variable names. + if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then + { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } + fi + ac_feature=`echo $ac_feature| sed 's/-/_/g'` + eval "enable_${ac_feature}=no" ;; + + -enable-* | --enable-*) + ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` + # Reject names that are not valid shell variable names. + if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then + { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } + fi + ac_feature=`echo $ac_feature| sed 's/-/_/g'` + case "$ac_option" in + *=*) ;; + *) ac_optarg=yes ;; + esac + eval "enable_${ac_feature}='$ac_optarg'" ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ + | --exec | --exe | --ex) + ac_prev=exec_prefix ;; + -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ + | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ + | --exec=* | --exe=* | --ex=*) + exec_prefix="$ac_optarg" ;; + + -gas | --gas | --ga | --g) + # Obsolete; use --with-gas. + with_gas=yes ;; + + -help | --help | --hel | --he) + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat << EOF +Usage: configure [options] [host] +Options: [defaults in brackets after descriptions] +Configuration: + --cache-file=FILE cache test results in FILE + --help print this message + --no-create do not create output files + --quiet, --silent do not print \`checking...' messages + --version print the version of autoconf that created configure +Directory and file names: + --prefix=PREFIX install architecture-independent files in PREFIX + [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [same as prefix] + --bindir=DIR user executables in DIR [EPREFIX/bin] + --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] + --libexecdir=DIR program executables in DIR [EPREFIX/libexec] + --datadir=DIR read-only architecture-independent data in DIR + [PREFIX/share] + --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data in DIR + [PREFIX/com] + --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] + --libdir=DIR object code libraries in DIR [EPREFIX/lib] + --includedir=DIR C header files in DIR [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] + --infodir=DIR info documentation in DIR [PREFIX/info] + --mandir=DIR man documentation in DIR [PREFIX/man] + --srcdir=DIR find the sources in DIR [configure dir or ..] + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM + run sed PROGRAM on installed program names +EOF + cat << EOF +Host type: + --build=BUILD configure for building on BUILD [BUILD=HOST] + --host=HOST configure for HOST [guessed] + --target=TARGET configure for TARGET [TARGET=HOST] +Features and packages: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --x-includes=DIR X include files are in DIR + --x-libraries=DIR X library files are in DIR +EOF + if test -n "$ac_help"; then + echo "--enable and --with options recognized:$ac_help" + fi + exit 0 ;; + + -host | --host | --hos | --ho) + ac_prev=host ;; + -host=* | --host=* | --hos=* | --ho=*) + host="$ac_optarg" ;; + + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; + -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ + | --includ=* | --inclu=* | --incl=* | --inc=*) + includedir="$ac_optarg" ;; + + -infodir | --infodir | --infodi | --infod | --info | --inf) + ac_prev=infodir ;; + -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) + infodir="$ac_optarg" ;; + + -libdir | --libdir | --libdi | --libd) + ac_prev=libdir ;; + -libdir=* | --libdir=* | --libdi=* | --libd=*) + libdir="$ac_optarg" ;; + + -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ + | --libexe | --libex | --libe) + ac_prev=libexecdir ;; + -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ + | --libexe=* | --libex=* | --libe=*) + libexecdir="$ac_optarg" ;; + + -localstatedir | --localstatedir | --localstatedi | --localstated \ + | --localstate | --localstat | --localsta | --localst \ + | --locals | --local | --loca | --loc | --lo) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ + | --localstate=* | --localstat=* | --localsta=* | --localst=* \ + | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) + localstatedir="$ac_optarg" ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) + ac_prev=mandir ;; + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) + mandir="$ac_optarg" ;; + + -nfp | --nfp | --nf) + # Obsolete; use --without-fp. + with_fp=no ;; + + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c) + no_create=yes ;; + + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) + no_recursion=yes ;; + + -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ + | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ + | --oldin | --oldi | --old | --ol | --o) + ac_prev=oldincludedir ;; + -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ + | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ + | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) + oldincludedir="$ac_optarg" ;; + + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) + prefix="$ac_optarg" ;; + + -program-prefix | --program-prefix | --program-prefi | --program-pref \ + | --program-pre | --program-pr | --program-p) + ac_prev=program_prefix ;; + -program-prefix=* | --program-prefix=* | --program-prefi=* \ + | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) + program_prefix="$ac_optarg" ;; + + -program-suffix | --program-suffix | --program-suffi | --program-suff \ + | --program-suf | --program-su | --program-s) + ac_prev=program_suffix ;; + -program-suffix=* | --program-suffix=* | --program-suffi=* \ + | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) + program_suffix="$ac_optarg" ;; + + -program-transform-name | --program-transform-name \ + | --program-transform-nam | --program-transform-na \ + | --program-transform-n | --program-transform- \ + | --program-transform | --program-transfor \ + | --program-transfo | --program-transf \ + | --program-trans | --program-tran \ + | --progr-tra | --program-tr | --program-t) + ac_prev=program_transform_name ;; + -program-transform-name=* | --program-transform-name=* \ + | --program-transform-nam=* | --program-transform-na=* \ + | --program-transform-n=* | --program-transform-=* \ + | --program-transform=* | --program-transfor=* \ + | --program-transfo=* | --program-transf=* \ + | --program-trans=* | --program-tran=* \ + | --progr-tra=* | --program-tr=* | --program-t=*) + program_transform_name="$ac_optarg" ;; + + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; + + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ + | --sbi=* | --sb=*) + sbindir="$ac_optarg" ;; + + -sharedstatedir | --sharedstatedir | --sharedstatedi \ + | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ + | --sharedst | --shareds | --shared | --share | --shar \ + | --sha | --sh) + ac_prev=sharedstatedir ;; + -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ + | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ + | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ + | --sha=* | --sh=*) + sharedstatedir="$ac_optarg" ;; + + -site | --site | --sit) + ac_prev=site ;; + -site=* | --site=* | --sit=*) + site="$ac_optarg" ;; + + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + srcdir="$ac_optarg" ;; + + -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ + | --syscon | --sysco | --sysc | --sys | --sy) + ac_prev=sysconfdir ;; + -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ + | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) + sysconfdir="$ac_optarg" ;; + + -target | --target | --targe | --targ | --tar | --ta | --t) + ac_prev=target ;; + -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) + target="$ac_optarg" ;; + + -v | -verbose | --verbose | --verbos | --verbo | --verb) + verbose=yes ;; + + -version | --version | --versio | --versi | --vers) + echo "configure generated by autoconf version 2.12" + exit 0 ;; + + -with-* | --with-*) + ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` + # Reject names that are not valid shell variable names. + if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then + { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } + fi + ac_package=`echo $ac_package| sed 's/-/_/g'` + case "$ac_option" in + *=*) ;; + *) ac_optarg=yes ;; + esac + eval "with_${ac_package}='$ac_optarg'" ;; + + -without-* | --without-*) + ac_package=`echo $ac_option|sed -e 's/-*without-//'` + # Reject names that are not valid shell variable names. + if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then + { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } + fi + ac_package=`echo $ac_package| sed 's/-/_/g'` + eval "with_${ac_package}=no" ;; + + --x) + # Obsolete; use --with-x. + with_x=yes ;; + + -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ + | --x-incl | --x-inc | --x-in | --x-i) + ac_prev=x_includes ;; + -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ + | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) + x_includes="$ac_optarg" ;; + + -x-libraries | --x-libraries | --x-librarie | --x-librari \ + | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) + ac_prev=x_libraries ;; + -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries="$ac_optarg" ;; + + -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } + ;; + + *) + if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then + echo "configure: warning: $ac_option: invalid host type" 1>&2 + fi + if test "x$nonopt" != xNONE; then + { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } + fi + nonopt="$ac_option" + ;; + + esac +done + +if test -n "$ac_prev"; then + { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } +fi + +trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 + +# File descriptor usage: +# 0 standard input +# 1 file creation +# 2 errors and warnings +# 3 some systems may open it to /dev/tty +# 4 used on the Kubota Titan +# 6 checking for... messages and results +# 5 compiler messages saved in config.log +if test "$silent" = yes; then + exec 6>/dev/null +else + exec 6>&1 +fi +exec 5>./config.log + +echo "\ +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. +" 1>&5 + +# Strip out --no-create and --no-recursion so they do not pile up. +# Also quote any args containing shell metacharacters. +ac_configure_args= +for ac_arg +do + case "$ac_arg" in + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c) ;; + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) + ac_configure_args="$ac_configure_args '$ac_arg'" ;; + *) ac_configure_args="$ac_configure_args $ac_arg" ;; + esac +done + +# NLS nuisances. +# Only set these to C if already set. These must not be set unconditionally +# because not all systems understand e.g. LANG=C (notably SCO). +# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! +# Non-C LC_CTYPE values break the ctype check. +if test "${LANG+set}" = set; then LANG=C; export LANG; fi +if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi +if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi + +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -rf conftest* confdefs.h +# AIX cpp loses on an empty file, so make sure it contains at least a newline. +echo > confdefs.h + +# A filename unique to this package, relative to the directory that +# configure is in, which we can look for to find out if srcdir is correct. +ac_unique_file=../include/yaz-socket-manager.h + +# Find the source files, if location was not specified. +if test -z "$srcdir"; then + ac_srcdir_defaulted=yes + # Try the directory containing this script, then its parent. + ac_prog=$0 + ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` + test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. + srcdir=$ac_confdir + if test ! -r $srcdir/$ac_unique_file; then + srcdir=.. + fi +else + ac_srcdir_defaulted=no +fi +if test ! -r $srcdir/$ac_unique_file; then + if test "$ac_srcdir_defaulted" = yes; then + { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } + else + { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } + fi +fi +srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` + +# Prefer explicitly selected file to automatically selected ones. +if test -z "$CONFIG_SITE"; then + if test "x$prefix" != xNONE; then + CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" + else + CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" + fi +fi +for ac_site_file in $CONFIG_SITE; do + if test -r "$ac_site_file"; then + echo "loading site script $ac_site_file" + . "$ac_site_file" + fi +done + +if test -r "$cache_file"; then + echo "loading cache $cache_file" + . $cache_file +else + echo "creating cache $cache_file" + > $cache_file +fi + +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then + # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. + if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then + ac_n= ac_c=' +' ac_t=' ' + else + ac_n=-n ac_c= ac_t= + fi +else + ac_n= ac_c='\c' ac_t= +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:527: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC="gcc" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +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:556: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + ac_prog_rejected=no + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + break + fi + done + IFS="$ac_save_ifs" +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# -gt 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + set dummy "$ac_dir/$ac_word" "$@" + shift + ac_cv_prog_CC="$@" + fi +fi +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } +fi + +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +echo "configure:604: 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. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then + ac_cv_prog_cc_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then + ac_cv_prog_cc_cross=no + else + ac_cv_prog_cc_cross=yes + fi +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_prog_cc_works=no +fi +rm -fr conftest* + +echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 +if test $ac_cv_prog_cc_works = no; then + { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } +fi +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +echo "configure:638: 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:643: checking whether we are using GNU C" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gcc=yes +else + ac_cv_prog_gcc=no +fi +fi + +echo "$ac_t""$ac_cv_prog_gcc" 1>&6 + +if test $ac_cv_prog_gcc = yes; then + GCC=yes + 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:667: checking whether ${CC-cc} accepts -g" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + echo 'void f(){}' > conftest.c +if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then + ac_cv_prog_cc_g=yes +else + ac_cv_prog_cc_g=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 + if test "$ac_test_CFLAGS" = set; then + CFLAGS="$ac_save_CFLAGS" + elif test $ac_cv_prog_cc_g = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-O2" + fi +else + GCC= + test "${CFLAGS+set}" = set || CFLAGS="-g" +fi + +for ac_prog in $CCC c++ g++ gcc CC cxx cc++ +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:699: 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 + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CXX="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CXX="$ac_cv_prog_CXX" +if test -n "$CXX"; then + echo "$ac_t""$CXX" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$CXX" && break +done +test -n "$CXX" || CXX="gcc" + + +echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +echo "configure:730: 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. +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cxx_cross + +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then + ac_cv_prog_cxx_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then + ac_cv_prog_cxx_cross=no + else + ac_cv_prog_cxx_cross=yes + fi +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_prog_cxx_works=no +fi +rm -fr conftest* +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6 +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:770: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 +cross_compiling=$ac_cv_prog_cxx_cross + +echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 +echo "configure:775: checking whether we are using GNU C++" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.C <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gxx=yes +else + ac_cv_prog_gxx=no +fi +fi + +echo "$ac_t""$ac_cv_prog_gxx" 1>&6 + +if test $ac_cv_prog_gxx = yes; then + GXX=yes + ac_test_CXXFLAGS="${CXXFLAGS+set}" + ac_save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS= + echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 +echo "configure:799: checking whether ${CXX-g++} accepts -g" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + echo 'void f(){}' > conftest.cc +if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then + ac_cv_prog_cxx_g=yes +else + ac_cv_prog_cxx_g=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6 + if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS="$ac_save_CXXFLAGS" + elif test $ac_cv_prog_cxx_g = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-O2" + fi +else + GXX= + test "${CXXFLAGS+set}" = set || CXXFLAGS="-g" +fi + +echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +echo "configure:827: checking how to run the C preprocessor" >&5 +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then +if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + # This must be in double quotes, not single quotes, because CPP may get + # substituted into the Makefile and "${CC-cc}" will confuse make. + CPP="${CC-cc} -E" + # 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:848: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out` +if test -z "$ac_err"; then + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + 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:865: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out` +if test -z "$ac_err"; then + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CPP=/lib/cpp +fi +rm -f conftest* +fi +rm -f conftest* + ac_cv_prog_CPP="$CPP" +fi + CPP="$ac_cv_prog_CPP" +else + ac_cv_prog_CPP="$CPP" +fi +echo "$ac_t""$CPP" 1>&6 + +echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 +echo "configure:888: checking how to run the C++ preprocessor" >&5 +if test -z "$CXXCPP"; then +if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_ext=C +# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cxx_cross + CXXCPP="${CXX-g++} -E" + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:906: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out` +if test -z "$ac_err"; then + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CXXCPP=/lib/cpp +fi +rm -f conftest* + ac_cv_prog_CXXCPP="$CXXCPP" +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross +fi +fi +CXXCPP="$ac_cv_prog_CXXCPP" +echo "$ac_t""$CXXCPP" 1>&6 + +ac_aux_dir= +for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do + if test -f $ac_dir/install-sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f $ac_dir/install.sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + fi +done +if test -z "$ac_aux_dir"; then + { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } +fi +ac_config_guess=$ac_aux_dir/config.guess +ac_config_sub=$ac_aux_dir/config.sub +ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. + +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# 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:960: 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 +else + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + # Account for people who put trailing slashes in PATH elements. + case "$ac_dir/" in + /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + for ac_prog in ginstall installbsd scoinst install; do + if test -f $ac_dir/$ac_prog; then + if test $ac_prog = install && + grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + # OSF/1 installbsd also uses dspmsg, but is usable. + : + else + ac_cv_path_install="$ac_dir/$ac_prog -c" + break 2 + fi + fi + done + ;; + esac + done + IFS="$ac_save_IFS" + +fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL="$ac_cv_path_install" + else + # As a last resort, use the slow shell script. We don't cache a + # path for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the path is relative. + INSTALL="$ac_install_sh" + fi +fi +echo "$ac_t""$INSTALL" 1>&6 + +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +# Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1012: 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 + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_RANLIB="ranlib" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" +fi +fi +RANLIB="$ac_cv_prog_RANLIB" +if test -n "$RANLIB"; then + echo "$ac_t""$RANLIB" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +checkBoth=0 +echo $ac_n "checking for connect""... $ac_c" 1>&6 +echo "configure:1040: checking for connect" >&5 +if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char connect(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_connect) || defined (__stub___connect) +choke me +#else +connect(); +#endif + +; return 0; } +EOF +if { (eval echo configure:1068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_func_connect=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_connect=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then + echo "$ac_t""yes" 1>&6 + : +else + echo "$ac_t""no" 1>&6 +fi + +if test "$ac_cv_func_connect" = "no"; then + echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 +echo "configure:1089: checking for main in -lsocket" >&5 +ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lsocket $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + LIBS="$LIBS -lsocket" +else + echo "$ac_t""no" 1>&6 +checkBoth=1 +fi + +fi +if test "$checkBoth" = "1"; then + oldLibs=$LIBS + LIBS="$LIBS -lsocket -lnsl" + echo $ac_n "checking for accept""... $ac_c" 1>&6 +echo "configure:1130: checking for accept" >&5 +if eval "test \"`echo '$''{'ac_cv_func_accept'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char accept(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_accept) || defined (__stub___accept) +choke me +#else +accept(); +#endif + +; return 0; } +EOF +if { (eval echo configure:1158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_func_accept=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_accept=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'accept`\" = yes"; then + echo "$ac_t""yes" 1>&6 + : +else + echo "$ac_t""no" 1>&6 +LIBS=$oldLibs +fi + +fi +echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 +echo "configure:1180: checking for gethostbyname" >&5 +if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char gethostbyname(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname) +choke me +#else +gethostbyname(); +#endif + +; return 0; } +EOF +if { (eval echo configure:1208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_func_gethostbyname=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_gethostbyname=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then + echo "$ac_t""yes" 1>&6 + : +else + echo "$ac_t""no" 1>&6 +echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 +echo "configure:1226: checking for main in -lnsl" >&5 +ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lnsl $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + LIBS="$LIBS -lnsl" +else + echo "$ac_t""no" 1>&6 +fi + +fi + +echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 +echo "configure:1264: 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 +#include +#include +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:1277: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out` +if test -z "$ac_err"; then + rm -rf conftest* + ac_cv_header_stdc=yes +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_header_stdc=no +fi +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 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "memchr" >/dev/null 2>&1; then + : +else + rm -rf conftest* + ac_cv_header_stdc=no +fi +rm -f conftest* + +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 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "free" >/dev/null 2>&1; then + : +else + rm -rf conftest* + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. +if test "$cross_compiling" = yes; then + : +else + cat > conftest.$ac_ext < +#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int main () { int i; for (i = 0; i < 256; i++) +if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); +exit (0); } + +EOF +if { (eval echo configure:1344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +then + : +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_header_stdc=no +fi +rm -fr conftest* +fi + +fi +fi + +echo "$ac_t""$ac_cv_header_stdc" 1>&6 +if test $ac_cv_header_stdc = yes; then + cat >> confdefs.h <<\EOF +#define STDC_HEADERS 1 +EOF + +fi + +if test "$ac_cv_header_stdc" = "no"; then + echo "configure: warning: Your system doesn't seem to support ANSI C" 1>&2 +fi +# Check whether --enable-threads or --disable-threads was given. +if test "${enable_threads+set}" = set; then + enableval="$enable_threads" + threads_ok=$enableval +else + threads_ok=no +fi + +if test "$threads_ok" = "yes"; then + for ac_hdr in pthread.h threads.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:1383: 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:1393: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 +fi +done + + echo $ac_n "checking for pthread_mutex_lock""... $ac_c" 1>&6 +echo "configure:1420: checking for pthread_mutex_lock" >&5 +if eval "test \"`echo '$''{'ac_cv_func_pthread_mutex_lock'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char pthread_mutex_lock(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_pthread_mutex_lock) || defined (__stub___pthread_mutex_lock) +choke me +#else +pthread_mutex_lock(); +#endif + +; return 0; } +EOF +if { (eval echo configure:1448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_func_pthread_mutex_lock=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_pthread_mutex_lock=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'pthread_mutex_lock`\" = yes"; then + echo "$ac_t""yes" 1>&6 + : +else + echo "$ac_t""no" 1>&6 +fi + + if test "$ac_cv_func_pthread_mutex_lock" = "no"; then + echo $ac_n "checking for main in -lpthread""... $ac_c" 1>&6 +echo "configure:1469: checking for main in -lpthread" >&5 +ac_lib_var=`echo pthread'_'main | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lpthread $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo pthread | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi + + fi + cat >> confdefs.h <<\EOF +#define _REENTRANT 1 +EOF + +fi +trap '' 1 2 15 +cat > confcache <<\EOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs. It is not useful on other systems. +# If it contains results you don't want to keep, you may remove or edit it. +# +# By default, configure uses ./config.cache as the cache file, +# creating it if it does not exist already. You can give configure +# the --cache-file=FILE option to use a different cache file; that is +# what configure does when it calls configure scripts in +# subdirectories, so they share the cache. +# Giving --cache-file=/dev/null disables caching, for debugging configure. +# config.status only pays attention to the cache file if you give it the +# --recheck option to rerun configure. +# +EOF +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, don't put newlines in cache variables' values. +# Ultrix sh set writes to stderr and can't be redirected directly, +# and sets the high bit in the cache file unless we assign to the vars. +(set) 2>&1 | + case `(ac_space=' '; set) 2>&1` in + *ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote substitution + # turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + -e "s/'/'\\\\''/g" \ + -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" + ;; + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' + ;; + esac >> confcache +if cmp -s $cache_file confcache; then + : +else + if test -w $cache_file; then + echo "updating cache $cache_file" + cat confcache > $cache_file + else + echo "not updating unwritable cache $cache_file" + fi +fi +rm -f confcache + +trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 + +test "x$prefix" = xNONE && prefix=$ac_default_prefix +# Let make expand exec_prefix. +test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + +# Any assignment to VPATH causes Sun make to only execute +# the first set of double-colon rules, so remove it if not needed. +# If there is a colon in the path, we need to keep it. +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' +fi + +trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 + +# Transform confdefs.h into DEFS. +# Protect against shell expansion while executing Makefile rules. +# Protect against Makefile macro expansion. +cat > conftest.defs <<\EOF +s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g +s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g +s%\[%\\&%g +s%\]%\\&%g +s%\$%$$%g +EOF +DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` +rm -f conftest.defs + + +# Without the "./", some shells look in PATH for config.status. +: ${CONFIG_STATUS=./config.status} + +echo creating $CONFIG_STATUS +rm -f $CONFIG_STATUS +cat > $CONFIG_STATUS </dev/null | sed 1q`: +# +# $0 $ac_configure_args +# +# Compiler output produced by configure, useful for debugging +# configure, is in ./config.log if it exists. + +ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" +for ac_option +do + case "\$ac_option" in + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" + exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; + -version | --version | --versio | --versi | --vers | --ver | --ve | --v) + echo "$CONFIG_STATUS generated by autoconf version 2.12" + exit 0 ;; + -help | --help | --hel | --he | --h) + echo "\$ac_cs_usage"; exit 0 ;; + *) echo "\$ac_cs_usage"; exit 1 ;; + esac +done + +ac_given_srcdir=$srcdir +ac_given_INSTALL="$INSTALL" + +trap 'rm -fr `echo "Makefile ../src/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +EOF +cat >> $CONFIG_STATUS < conftest.subs <<\\CEOF +$ac_vpsub +$extrasub +s%@CFLAGS@%$CFLAGS%g +s%@CPPFLAGS@%$CPPFLAGS%g +s%@CXXFLAGS@%$CXXFLAGS%g +s%@DEFS@%$DEFS%g +s%@LDFLAGS@%$LDFLAGS%g +s%@LIBS@%$LIBS%g +s%@exec_prefix@%$exec_prefix%g +s%@prefix@%$prefix%g +s%@program_transform_name@%$program_transform_name%g +s%@bindir@%$bindir%g +s%@sbindir@%$sbindir%g +s%@libexecdir@%$libexecdir%g +s%@datadir@%$datadir%g +s%@sysconfdir@%$sysconfdir%g +s%@sharedstatedir@%$sharedstatedir%g +s%@localstatedir@%$localstatedir%g +s%@libdir@%$libdir%g +s%@includedir@%$includedir%g +s%@oldincludedir@%$oldincludedir%g +s%@infodir@%$infodir%g +s%@mandir@%$mandir%g +s%@CC@%$CC%g +s%@CXX@%$CXX%g +s%@CPP@%$CPP%g +s%@CXXCPP@%$CXXCPP%g +s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g +s%@INSTALL_DATA@%$INSTALL_DATA%g +s%@RANLIB@%$RANLIB%g + +CEOF +EOF + +cat >> $CONFIG_STATUS <<\EOF + +# Split the substitutions into bite-sized pieces for seds with +# small command number limits, like on Digital OSF/1 and HP-UX. +ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. +ac_file=1 # Number of current file. +ac_beg=1 # First line for current file. +ac_end=$ac_max_sed_cmds # Line after last line for current file. +ac_more_lines=: +ac_sed_cmds="" +while $ac_more_lines; do + if test $ac_beg -gt 1; then + sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file + else + sed "${ac_end}q" conftest.subs > conftest.s$ac_file + fi + if test ! -s conftest.s$ac_file; then + ac_more_lines=false + rm -f conftest.s$ac_file + else + if test -z "$ac_sed_cmds"; then + ac_sed_cmds="sed -f conftest.s$ac_file" + else + ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" + fi + ac_file=`expr $ac_file + 1` + ac_beg=$ac_end + ac_end=`expr $ac_end + $ac_max_sed_cmds` + fi +done +if test -z "$ac_sed_cmds"; then + ac_sed_cmds=cat +fi +EOF + +cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF +for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". + case "$ac_file" in + *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` + ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + *) ac_file_in="${ac_file}.in" ;; + esac + + # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. + + # Remove last slash and all that follows it. Not all systems have dirname. + ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` + if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then + # The file is in a subdirectory. + test ! -d "$ac_dir" && mkdir "$ac_dir" + ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" + # A "../" for each directory in $ac_dir_suffix. + ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` + else + ac_dir_suffix= ac_dots= + fi + + case "$ac_given_srcdir" in + .) srcdir=. + if test -z "$ac_dots"; then top_srcdir=. + else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; + /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; + *) # Relative path. + srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" + top_srcdir="$ac_dots$ac_given_srcdir" ;; + esac + + case "$ac_given_INSTALL" in + [/$]*) INSTALL="$ac_given_INSTALL" ;; + *) INSTALL="$ac_dots$ac_given_INSTALL" ;; + esac + + echo creating "$ac_file" + rm -f "$ac_file" + configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." + case "$ac_file" in + *Makefile*) ac_comsub="1i\\ +# $configure_input" ;; + *) ac_comsub= ;; + esac + + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + sed -e "$ac_comsub +s%@configure_input@%$configure_input%g +s%@srcdir@%$srcdir%g +s%@top_srcdir@%$top_srcdir%g +s%@INSTALL@%$INSTALL%g +" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file +fi; done +rm -f conftest.s* + +EOF +cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF + +exit 0 +EOF +chmod +x $CONFIG_STATUS +rm -fr confdefs* $ac_clean_files +test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 + diff --git a/unix/configure.in b/unix/configure.in new file mode 100644 index 0000000..4a0d7e3 --- /dev/null +++ b/unix/configure.in @@ -0,0 +1,47 @@ +dnl YAZ Toolkit +dnl (c) Index Data 1994-1999 +dnl See the file LICENSE for details. +dnl $Id: configure.in,v 1.1 1999-01-28 09:41:07 adam Exp $ +AC_INIT(../include/yaz-socket-manager.h) +dnl +dnl ------ Checking programs +AC_PROG_CC +AC_PROG_CXX +AC_PROG_CPP +AC_PROG_CXXCPP +AC_PROG_INSTALL +AC_PROG_RANLIB +dnl +dnl ----- Sockets +checkBoth=0 +AC_CHECK_FUNC(connect) +if test "$ac_cv_func_connect" = "no"; then + AC_CHECK_LIB(socket, main, LIBS="$LIBS -lsocket", checkBoth=1) +fi +if test "$checkBoth" = "1"; then + oldLibs=$LIBS + LIBS="$LIBS -lsocket -lnsl" + AC_CHECK_FUNC(accept, , [LIBS=$oldLibs]) +fi +AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"])) +dnl +dnl ------ Headers +AC_STDC_HEADERS +if test "$ac_cv_header_stdc" = "no"; then + AC_MSG_WARN(Your system doesn't seem to support ANSI C) +fi +dnl +dnl ------ Threads +AC_ARG_ENABLE(threads, [ --enable-threads enable threads if available], + [threads_ok=$enableval], [threads_ok=no]) +if test "$threads_ok" = "yes"; then + AC_CHECK_HEADERS(pthread.h threads.h) + AC_CHECK_FUNC(pthread_mutex_lock) + if test "$ac_cv_func_pthread_mutex_lock" = "no"; then + AC_CHECK_LIB(pthread, main) + fi + AC_DEFINE(_REENTRANT) +fi +dnl +dnl ------ Makefiles +AC_OUTPUT(Makefile ../src/Makefile) diff --git a/unix/install-sh b/unix/install-sh new file mode 100755 index 0000000..ebc6691 --- /dev/null +++ b/unix/install-sh @@ -0,0 +1,250 @@ +#! /bin/sh +# +# install - install a program, script, or datafile +# This comes from X11R5 (mit/util/scripts/install.sh). +# +# Copyright 1991 by the Massachusetts Institute of Technology +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of M.I.T. not be used in advertising or +# publicity pertaining to distribution of the software without specific, +# written prior permission. M.I.T. makes no representations about the +# suitability of this software for any purpose. It is provided "as is" +# without express or implied warranty. +# +# Calling this script install-sh is preferred over install.sh, to prevent +# `make' implicit rules from creating a file called install from it +# when there is no Makefile. +# +# This script is compatible with the BSD install script, but was written +# from scratch. It can only install one file at a time, a restriction +# shared with many OS's install programs. + + +# set DOITPROG to echo to test this script + +# Don't use :- since 4.3BSD and earlier shells don't like it. +doit="${DOITPROG-}" + + +# put in absolute paths if you don't have them in your path; or use env. vars. + +mvprog="${MVPROG-mv}" +cpprog="${CPPROG-cp}" +chmodprog="${CHMODPROG-chmod}" +chownprog="${CHOWNPROG-chown}" +chgrpprog="${CHGRPPROG-chgrp}" +stripprog="${STRIPPROG-strip}" +rmprog="${RMPROG-rm}" +mkdirprog="${MKDIRPROG-mkdir}" + +transformbasename="" +transform_arg="" +instcmd="$mvprog" +chmodcmd="$chmodprog 0755" +chowncmd="" +chgrpcmd="" +stripcmd="" +rmcmd="$rmprog -f" +mvcmd="$mvprog" +src="" +dst="" +dir_arg="" + +while [ x"$1" != x ]; do + case $1 in + -c) instcmd="$cpprog" + shift + continue;; + + -d) dir_arg=true + shift + continue;; + + -m) chmodcmd="$chmodprog $2" + shift + shift + continue;; + + -o) chowncmd="$chownprog $2" + shift + shift + continue;; + + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; + + -s) stripcmd="$stripprog" + shift + continue;; + + -t=*) transformarg=`echo $1 | sed 's/-t=//'` + shift + continue;; + + -b=*) transformbasename=`echo $1 | sed 's/-b=//'` + shift + continue;; + + *) if [ x"$src" = x ] + then + src=$1 + else + # this colon is to work around a 386BSD /bin/sh bug + : + dst=$1 + fi + shift + continue;; + esac +done + +if [ x"$src" = x ] +then + echo "install: no input file specified" + exit 1 +else + true +fi + +if [ x"$dir_arg" != x ]; then + dst=$src + src="" + + if [ -d $dst ]; then + instcmd=: + else + instcmd=mkdir + fi +else + +# Waiting for this to be detected by the "$instcmd $src $dsttmp" command +# might cause directories to be created, which would be especially bad +# if $src (and thus $dsttmp) contains '*'. + + if [ -f $src -o -d $src ] + then + true + else + echo "install: $src does not exist" + exit 1 + fi + + if [ x"$dst" = x ] + then + echo "install: no destination specified" + exit 1 + else + true + fi + +# If destination is a directory, append the input filename; if your system +# does not like double slashes in filenames, you may need to add some logic + + if [ -d $dst ] + then + dst="$dst"/`basename $src` + else + true + fi +fi + +## this sed command emulates the dirname command +dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` + +# Make sure that the destination directory exists. +# this part is taken from Noah Friedman's mkinstalldirs script + +# Skip lots of stat calls in the usual case. +if [ ! -d "$dstdir" ]; then +defaultIFS=' +' +IFS="${IFS-${defaultIFS}}" + +oIFS="${IFS}" +# Some sh's can't handle IFS=/ for some reason. +IFS='%' +set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` +IFS="${oIFS}" + +pathcomp='' + +while [ $# -ne 0 ] ; do + pathcomp="${pathcomp}${1}" + shift + + if [ ! -d "${pathcomp}" ] ; + then + $mkdirprog "${pathcomp}" + else + true + fi + + pathcomp="${pathcomp}/" +done +fi + +if [ x"$dir_arg" != x ] +then + $doit $instcmd $dst && + + if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && + if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && + if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && + if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi +else + +# If we're going to rename the final executable, determine the name now. + + if [ x"$transformarg" = x ] + then + dstfile=`basename $dst` + else + dstfile=`basename $dst $transformbasename | + sed $transformarg`$transformbasename + fi + +# don't allow the sed command to completely eliminate the filename + + if [ x"$dstfile" = x ] + then + dstfile=`basename $dst` + else + true + fi + +# Make a temp file name in the proper directory. + + dsttmp=$dstdir/#inst.$$# + +# Move or copy the file name to the temp name + + $doit $instcmd $src $dsttmp && + + trap "rm -f ${dsttmp}" 0 && + +# and set any options; do chmod last to preserve setuid bits + +# If any of these fail, we abort the whole thing. If we want to +# ignore errors from any of these, just make sure not to ignore +# errors from the above "$doit $instcmd $src $dsttmp" command. + + if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && + if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && + if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && + if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && + +# Now rename the file to the real destination. + + $doit $rmcmd -f $dstdir/$dstfile && + $doit $mvcmd $dsttmp $dstdir/$dstfile + +fi && + + +exit 0 -- 1.7.10.4