- dbus-c++ passes now compiling on ubuntu 8.10 machine (-lrt addded for Test1/TestApp)

- identified a potential problem in pipe.cpp and marked it with FIXME
- changed version to 0.9.0-pre1 to inform it's near to 1.0 stable release

6 files changed, 24 insertions, 12 deletions

diff --git a/configure.ac b/configure.ac
index 3318b57..e83c96a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # Autojunk script for libdbus-c++
 
 AC_PREREQ(2.59)
-AC_INIT([libdbus-c++], 0.6.0-pre1, [andreas.volz@tux-style.com])
+AC_INIT([libdbus-c++], 0.9.0-pre1, [andreas.volz@tux-style.com])
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AM_CONFIG_HEADER([config.h])
@@ -35,6 +35,14 @@ AC_ARG_ENABLE(doxygen-docs,
  	[enable_doxygen_docs=no]
 )
 
+AC_CHECK_FUNCS(clock_gettime, [], [
+  AC_CHECK_LIB(rt, clock_gettime, [
+    AC_DEFINE(HAVE_CLOCK_GETTIME, 1)
+    RT_LIBS="-lrt"
+  ])
+])
+AC_SUBST(RT_LIBS)
+
 # Check for programs
 
 AC_LANG_CPLUSPLUS
@@ -178,7 +186,6 @@ AC_SUBST(BUILD_LIBDBUS_CXX_DIR)
 
 # Save processed files
 
-PKG_CHECK_MODULES(CPPUNIT, cppunit)
 AC_OUTPUT(
 	Makefile
         src/Makefile
diff --git a/examples/echo/Makefile.am b/examples/echo/Makefile.am
index 6e6dac5..35d7b57 100644
--- a/examples/echo/Makefile.am
+++ b/examples/echo/Makefile.am
@@ -13,8 +13,8 @@ echo-server-glue.h: echo-introspect.xml
 noinst_PROGRAMS += echo-client-mt
 
 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 @PTHREAD_LIBS@
-echo_client_mt_CXXFLAGS = @PTHREAD_CFLAGS@
+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=$@
diff --git a/examples/echo_ecore/Makefile.am b/examples/echo_ecore/Makefile.am
index d3a6e77..b4e18f6 100644
--- a/examples/echo_ecore/Makefile.am
+++ b/examples/echo_ecore/Makefile.am
@@ -21,9 +21,9 @@ endif
 
 echo_client_mt_SOURCES = echo-client-glue.h echo-client.h echo-client.cpp
 echo_client_mt_LDADD = $(top_builddir)/src/libdbus-c++-ecore-1.la \
-	$(top_builddir)/src/libdbus-c++-1.la @PTHREAD_LIBS@ \
+	$(top_builddir)/src/libdbus-c++-1.la $(PTHREAD_LIBS) \
 	$(ecore_LIBS)
-echo_client_mt_CXXFLAGS = @PTHREAD_CFLAGS@
+echo_client_mt_CXXFLAGS = $(PTHREAD_CFLAGS)
 
 echo-client-glue.h: echo-introspect.xml
 	$(top_builddir)/tools/dbusxx-xml2cpp $^ --proxy=$@
diff --git a/src/pipe.cpp b/src/pipe.cpp
index 21f4985..01211b3 100644
--- a/src/pipe.cpp
+++ b/src/pipe.cpp
@@ -62,6 +62,7 @@ Pipe::Pipe(void(*handler)(const void *data, void *buffer, unsigned int nbyte), c
 
 void Pipe::write(const void *buffer, unsigned int nbytes)
 {
+  // TODO: ignoring return of read/write generates warning; maybe relevant for eventloop work...
   // first write the size into the pipe...
   ::write(_fd_write, static_cast <const void *>(&nbytes), sizeof(nbytes));
 
@@ -71,6 +72,7 @@ void Pipe::write(const void *buffer, unsigned int nbytes)
 
 ssize_t Pipe::read(void *buffer, unsigned int &nbytes)
 {
+  // TODO: ignoring return of read/write generates warning; maybe relevant for eventloop work...
   // first read the size from the pipe...
   ::read(_fd_read, &nbytes, sizeof(nbytes));
 
@@ -80,5 +82,6 @@ ssize_t Pipe::read(void *buffer, unsigned int &nbytes)
 
 void Pipe::signal()
 {
+  // TODO: ignoring return of read/write generates warning; maybe relevant for eventloop work...
   ::write(_fd_write, '\0', 1);
 }
diff --git a/test/functional/Test1/Makefile.am b/test/functional/Test1/Makefile.am
index f8a1818..3269751 100644
--- a/test/functional/Test1/Makefile.am
+++ b/test/functional/Test1/Makefile.am
@@ -28,8 +28,10 @@ TestApp_SOURCES = \
 	TestAppIntro.h \
 	TestAppIntroProvider.h
 
-TestApp_LDFLAGS = \
-	$(top_builddir)/src/libdbus-c++-1.la
+TestApp_LDADD = \
+	$(top_builddir)/src/libdbus-c++-1.la \
+	$(PTHREAD_LIBS) \
+	$(RT_LIBS)
 
 TestApp_CXXFLAGS = \
 	-I$(top_srcdir)/include
diff --git a/test/generator/Makefile.am b/test/generator/Makefile.am
index 6065cab..6c2403d 100644
--- a/test/generator/Makefile.am
+++ b/test/generator/Makefile.am
@@ -8,8 +8,8 @@ dbuscxx_test_generator_server_SOURCES = dbuscxx_test_generator-server-glue.h \
 					dbuscxx_test_generator-server.h \
 					dbuscxx_test_generator-server.cpp
 
-dbuscxx_test_generator_server_LDADD = $(top_builddir)/src/libdbus-c++-1.la @PTHREAD_LIBS@
-dbuscxx_test_generator_server_CXXFLAGS = @PTHREAD_CFLAGS@
+dbuscxx_test_generator_server_LDADD = $(top_builddir)/src/libdbus-c++-1.la 
+dbuscxx_test_generator_server_CXXFLAGS = 
 
 dbuscxx_test_generator-server-glue.h: dbuscxx_test_generator.xml
 	$(top_builddir)/tools/dbusxx-xml2cpp $^ --adaptor=$@
@@ -22,8 +22,8 @@ dbuscxx_test_generator_client_SOURCES = dbuscxx_test_generator-client-glue.h \
 					dbuscxx_test_generator-client.h \
 					dbuscxx_test_generator-client.cpp
 
-dbuscxx_test_generator_client_LDADD = $(top_builddir)/src/libdbus-c++-1.la @PTHREAD_LIBS@
-dbuscxx_test_generator_client_CXXFLAGS = @PTHREAD_CFLAGS@
+dbuscxx_test_generator_client_LDADD = $(top_builddir)/src/libdbus-c++-1.la 
+dbuscxx_test_generator_client_CXXFLAGS = 
 
 dbuscxx_test_generator-client-glue.h: dbuscxx_test_generator.xml
 	$(top_builddir)/tools/dbusxx-xml2cpp $^ --proxy=$@