many changes

examples/echo/Makefile.am

@@ -15,7 +15,8 @@ noinst_PROGRAMS += echo-client-mt
 endif
 
 echo_client_mt_SOURCES = echo-client-glue.h echo-client.h echo-client.cpp
-echo_client_mt_LDADD = $(top_builddir)/src/libdbus-c++-1.la -lpthread
+echo_client_mt_LDADD = $(top_builddir)/src/libdbus-c++-1.la @PTHREAD_LIBS@
+echo_client_mt_CXXFLAGS = @PTHREAD_CFLAGS@
 
 echo-client-glue.h: echo-introspect.xml
 	$(top_builddir)/tools/dbusxx-xml2cpp $^ --proxy=$@

examples/echo/echo-client.cpp

@@ -1,12 +1,12 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "echo-client.h"
 #include <iostream>
 #include <pthread.h>
 #include <signal.h>
 
-#ifdef HAVE_CONFIG_H
-#include <dbus-c++/config.h>
-#endif
-
 using namespace std;
 
 static const char* ECHO_SERVER_NAME = "org.freedesktop.DBus.Examples.Echo";

examples/echo/echo-server.cpp

@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "echo-server.h"
 #include <unistd.h>
 #include <stdlib.h>