--- provider/server/Makefile.am	2010-01-26 12:03:19.000000000 +0100
+++ provider/server/Makefile.am.oden	2010-03-09 18:43:05.255381188 +0100
@@ -18,7 +18,7 @@
 	${top_builddir}/common/libcommon_util.la								\
 	${top_builddir}/common/libcommon_mapi.la								\
 	${top_builddir}/common/libcommon_ssl.la									\
-	$(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
+	$(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) $(PROG_LIBS) -lrt
 
 zarafa_server_SOURCES = ECServer.cpp  \
 						ECSoapServerConnection.h ECSoapServerConnection.cpp \
--- mapi4linux/src/Makefile.am	2010-06-17 18:08:54.781444908 +0200
+++ mapi4linux/src/Makefile.am.oden	2010-06-17 18:10:13.796436022 +0200
@@ -5,7 +5,7 @@
 
 libmapi_la_LIBADD = ${top_builddir}/common/libcommon_util.la \
 	${top_builddir}/common/libcommon_mapi.la \
-	$(PROG_LIBS)
+	$(PROG_LIBS) -lpthread
 
 # required because we're exporting extern "C" functions and want to filter with 'export-symbols'
 CXXLD=--tag=none gcc
--- common/Makefile.am	2010-05-31 15:44:41.000000000 +0200
+++ common/Makefile.am.oden	2010-06-17 18:43:36.884592366 +0200
@@ -31,7 +31,7 @@
 			ECABEntryID.cpp
 
 libcommon_util_la_LDFLAGS = -static
-libcommon_util_la_SOURCES = platform.cpp			\
+libcommon_util_la_SOURCES = CommonUtil.cpp platform.cpp			\
 			platform.linux.cpp						\
 			md5.cpp									\
 			base64.cpp								\