--- Makefile.am	2010-02-14 18:50:27.000000000 +0100
+++ Makefile.am.oden	2010-02-16 12:16:19.298970268 +0100
@@ -7,19 +7,21 @@
 ACLOCAL_AMFLAGS = -I acinclude.d
 
 INCLUDES = ${APACHE_CFLAGS} ${OPKELE_CFLAGS} ${SQLITE3_CFLAGS} ${PCRE_CFLAGS} ${CURL_CFLAGS}
-AM_LDFLAGS = ${OPKELE_LIBS} ${SQLITE3_LDFLAGS} ${PCRE_LIBS} ${CURL_LIBS} ${APR_LDFLAGS}
 
 libmodauthopenid_la_SOURCES = mod_auth_openid.cpp MoidConsumer.cpp moid_utils.cpp http_helpers.cpp \
 	SessionManager.cpp config.h  http_helpers.h  mod_auth_openid.h  MoidConsumer.h  moid_utils.h \
 	SessionManager.h  types.h
 
+libmodauthopenid_la_LIBADD = ${OPKELE_LIBS} ${SQLITE3_LDFLAGS} ${PCRE_LIBS} ${CURL_LIBS} ${APR_LDFLAGS}
+
 db_info_SOURCES = db_info.cpp
-db_info_LDFLAGS = -lmodauthopenid
+db_info_LDADD = libmodauthopenid.la $(libmodauthopenid_la_LIBADD)
 db_info_DEPENDENCIES = libmodauthopenid.la
 
 install-exec-local:
 	${APXS} -i -a -n 'authopenid' mod_auth_openid.la
 
 mod_auth_openid.la: libmodauthopenid.la
-	${APXS} -c -o $@ $< ${APACHE_CFLAGS} ${OPKELE_CFLAGS} ${OPKELE_LIBS} \
+	${APXS} -c -o $@ $< ${APACHE_CFLAGS} ${OPKELE_CFLAGS} $(LDFLAGS) ${OPKELE_LIBS} \
+			    ${SQLITE3_CFLAGS} ${PCRE_LIBS} ${CURL_LIBS} `pkg-config --libs apr-util-1 apr-1`
 			    ${SQLITE3_CFLAGS} ${PCRE_LIBS} ${CURL_LIBS}
\ No newline at end of file