From 6f6d24c02ef3e3a7600432bed1c801a611c3c918 Mon Sep 17 00:00:00 2001 From: Jens Thiele Date: Tue, 21 Nov 2006 17:05:56 +0000 Subject: [PATCH] commit changes to build --- Makefile.am | 2 +- config.h.in | 3 +++ configure.in | 6 +++++- src/socket_handler.cpp | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index f9360eb..dec3f8a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ # have all needed files, that a GNU package needs AUTOMAKE_OPTIONS = foreign 1.4 -SUBDIRS = src doc test +SUBDIRS = src doc test examples codegen example-codegen # Install the pkg-config file: pkgconfigdir = $(libdir)/pkgconfig diff --git a/config.h.in b/config.h.in index e427590..85b9f4b 100644 --- a/config.h.in +++ b/config.h.in @@ -36,5 +36,8 @@ /* Name of package */ #undef PACKAGE +/* protocol version used (integers, increase version if incompatible) */ +#undef PROTOCOL_VERSION + /* Version number of package */ #undef VERSION diff --git a/configure.in b/configure.in index 2522ab0..edcf792 100644 --- a/configure.in +++ b/configure.in @@ -23,4 +23,8 @@ if test "x$BOOST_SERIALIZATION_LIB" = "x"; then exit 1 fi -AC_OUTPUT(Makefile doc/Doxyfile doc/Makefile src/Makefile libt2n.pc libt2n.spec test/Makefile) +PKG_CHECK_MODULES(CODEGEN, libxml++-2.6 >= 2.8.1) +AC_SUBST(CODEGEN_CFLAGS) +AC_SUBST(CODEGEN_LIBS) + +AC_OUTPUT(Makefile doc/Doxyfile doc/Makefile src/Makefile libt2n.pc libt2n.spec test/Makefile examples/Makefile codegen/Makefile example-codegen/Makefile) diff --git a/src/socket_handler.cpp b/src/socket_handler.cpp index 98944b0..ed14895 100644 --- a/src/socket_handler.cpp +++ b/src/socket_handler.cpp @@ -126,6 +126,7 @@ bool socket_handler::data_waiting(long long usec_timeout,long long* usec_timeout int ret=select (FD_SETSIZE, &active_fd_set, NULL, NULL, timeout_ptr); // return the timeout we did not use + // todo: this is linux specific according to man 2 select if (usec_timeout > 0 && usec_timeout_remaining != NULL) *usec_timeout_remaining=(tval.tv_sec*1000000)+tval.tv_usec; -- 1.7.1