Updated Branches: refs/heads/master 9fa553f84 -> cad40541a
Check for struct tcp_info before building the plugin Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/cad40541 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/cad40541 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/cad40541 Branch: refs/heads/master Commit: cad40541a7acbc761037d5a9a987637bb1397d15 Parents: 9fa553f Author: James Peach <[email protected]> Authored: Fri Aug 10 22:08:11 2012 -0700 Committer: James Peach <[email protected]> Committed: Fri Aug 10 22:10:06 2012 -0700 ---------------------------------------------------------------------- configure.ac | 7 +++++++ plugins/experimental/tcp_info/Makefile.am | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/cad40541/configure.ac ---------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index 471629d..7adeb9b 100644 --- a/configure.ac +++ b/configure.ac @@ -1441,6 +1441,13 @@ TS_CHECK_LOOPBACK_IFACE TS_CHECK_GETHOSTBYNAME_R_STYLE TS_CHECK_MACRO_IN6_IS_ADDR_UNSPECIFIED +AC_CHECK_TYPE([struct tcp_info], + [enable_tcpinfo_plugin=yes], + [enable_tcpinfo_plugin=no], + [[#include <netinet/tcp.h>]] +) +AM_CONDITIONAL([BUILD_TCPINFO_PLUGIN], [ test "x${enable_tcpinfo_plugin}" != "xno" ]) + # # use modular IOCORE # http://git-wip-us.apache.org/repos/asf/trafficserver/blob/cad40541/plugins/experimental/tcp_info/Makefile.am ---------------------------------------------------------------------- diff --git a/plugins/experimental/tcp_info/Makefile.am b/plugins/experimental/tcp_info/Makefile.am index 1b4fb42..d200ad2 100644 --- a/plugins/experimental/tcp_info/Makefile.am +++ b/plugins/experimental/tcp_info/Makefile.am @@ -14,11 +14,16 @@ # See the License for the specific language governing permissions and # limitations under the License. +pkglibdir = ${pkglibexecdir} + AM_CPPFLAGS = -I$(top_builddir)/proxy/api -I$(top_srcdir)/proxy/api \ -I$(top_srcdir)/lib/ts -I$(top_builddir)/lib/ts -pkglibdir = ${pkglibexecdir} +if BUILD_TCPINFO_PLUGIN + pkglib_LTLIBRARIES = tcp_info.la tcp_info_la_SOURCES = tcp_info.cc tcp_info_la_LDFLAGS = -module -avoid-version -shared +endif +
