autoconf/automake:
Fixed handling of bits/socket.h MSG_NODELAY
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@664732 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lib/cpp/Makefile.am b/lib/cpp/Makefile.am
index 1d79b5b..822a2c7 100644
--- a/lib/cpp/Makefile.am
+++ b/lib/cpp/Makefile.am
@@ -10,6 +10,7 @@
libconcurrency_inst_headers = src/concurrency/Exception.h \
src/concurrency/Monitor.h \
+ src/concurrency/PosixThreadFactory.h \
src/concurrency/Thread.h \
src/concurrency/ThreadManager.h \
src/concurrency/TimerManager.h
diff --git a/lib/cpp/bootstrap.sh b/lib/cpp/bootstrap.sh
index df392e7..e85fd2b 100755
--- a/lib/cpp/bootstrap.sh
+++ b/lib/cpp/bootstrap.sh
@@ -16,24 +16,25 @@
config.guess \
config.h \
config.hin \
-config.hin \
config.log \
config.status \
config.sub \
configure \
configure.scan \
depcomp \
+.deps \
install-sh \
+.libs \
libtool \
ltmain.sh \
-missing \
-stamp-h1
+Makefile.in \
+missing
autoscan
autoheader
aclocal
-libtoolize --force
+libtoolize --automake
touch NEWS README AUTHORS ChangeLog
autoconf
automake -ac
diff --git a/lib/cpp/configure.ac b/lib/cpp/configure.ac
index 0499a0e..a269df6 100644
--- a/lib/cpp/configure.ac
+++ b/lib/cpp/configure.ac
@@ -28,12 +28,12 @@
AC_CHECK_HEADERS([sys/socket.h])
-AC_CHECK_HEADERS([bits/socket.h])
-
AC_CHECK_HEADERS([sys/time.h])
AC_CHECK_HEADERS([unistd.h])
+AC_CHECK_LIB(pthread, pthread_create)
+
AC_C_CONST
AC_C_VOLATILE
@@ -47,7 +47,7 @@
AC_TYPE_SIZE_T
AC_TYPE_INT32_T
-x
+
AC_TYPE_INT64_T
AC_TYPE_UINT16_T
diff --git a/lib/cpp/src/transport/TSocket.cc b/lib/cpp/src/transport/TSocket.cc
index 55f512e..2161697 100644
--- a/lib/cpp/src/transport/TSocket.cc
+++ b/lib/cpp/src/transport/TSocket.cc
@@ -1,3 +1,4 @@
+#include <config.h>
#include <sys/socket.h>
#include <arpa/inet.h>
#include <netinet/in.h>
@@ -165,11 +166,11 @@
int flags = 0;
- #if HAVE_BITS_SOCKET_H
+ #if defined(MSG_NOSIGNAL)
// Note the use of MSG_NOSIGNAL to suppress SIGPIPE errors, instead we
// check for the EPIPE return condition and close the socket in that case
flags |= MSG_NOSIGNAL;
- #endif // HAVE_BITS_SOCKET_H
+ #endif // defined(MSG_NOSIGNAL)
int b = send(socket_, buf + sent, len - sent, flags);
++g_socket_syscalls;