From 404a3933154dc57b2e650cdabb51f80e4aeb1dbe Mon Sep 17 00:00:00 2001
From: Kazuki Ohta <kzk@il.is.s.u-tokyo.ac.jp>
Date: Thu, 21 Jan 2010 21:55:06 +0900
Subject: [PATCH] c, cpp: fix test problem

- using LDADD instead of LDFLAGS
- fix include path in test.cpp
---
 c/Makefile.am   | 2 +-
 cpp/Makefile.am | 2 +-
 cpp/test.cpp    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/c/Makefile.am b/c/Makefile.am
index 23995a51..f84759a1 100644
--- a/c/Makefile.am
+++ b/c/Makefile.am
@@ -23,6 +23,6 @@ check_PROGRAMS = \
 
 msgpackc_test_SOURCES = test.cpp
 msgpackc_test_CXXFLAGS = -I$(top_srcdir) -I$(top_srcdir)/c
-msgpackc_test_LDFLAGS = libmsgpackc.la -lgtest_main
+msgpackc_test_LDADD = libmsgpackc.la -lgtest_main
 
 TESTS = $(check_PROGRAMS)
diff --git a/cpp/Makefile.am b/cpp/Makefile.am
index 99f4a322..d4de1612 100644
--- a/cpp/Makefile.am
+++ b/cpp/Makefile.am
@@ -39,6 +39,6 @@ check_PROGRAMS = \
 
 msgpack_test_SOURCES = test.cpp
 msgpack_test_CXXFLAGS = -I$(top_srcdir) -I$(top_srcdir)/c -I$(top_srcdir)/cpp
-msgpack_test_LDFLAGS = libmsgpack.la -lgtest_main
+msgpack_test_LDADD = libmsgpack.la -lgtest_main
 
 TESTS = $(check_PROGRAMS)
diff --git a/cpp/test.cpp b/cpp/test.cpp
index b152e6d3..113914ab 100644
--- a/cpp/test.cpp
+++ b/cpp/test.cpp
@@ -438,7 +438,7 @@ TEST(MSGPACK_STL, simple_buffer_multiset)
 
 #ifdef HAVE_TR1_UNORDERED_MAP
 #include <tr1/unordered_map>
-#include "cpp/type/tr1/unordered_map.hpp"
+#include "cpp/msgpack/type/tr1/unordered_map.hpp"
 TEST(MSGPACK_TR1, simple_buffer_unordered_map)
 {
   for (unsigned int k = 0; k < kLoop; k++) {
@@ -499,7 +499,7 @@ TEST(MSGPACK_TR1, simple_buffer_unordered_multimap)
 
 #ifdef HAVE_TR1_UNORDERED_SET
 #include <tr1/unordered_set>
-#include "cpp/type/tr1/unordered_set.hpp"
+#include "cpp/msgpack/type/tr1/unordered_set.hpp"
 TEST(MSGPACK_TR1, simple_buffer_unordered_set)
 {
   for (unsigned int k = 0; k < kLoop; k++) {