3 files changed, 8 insertions, 2 deletions

diff --git a/configure.ac b/configure.ac
index 92e460b30..0f6602f21 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,6 +43,7 @@ AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AM_PROG_CC_C_O
 LT_INIT([disable-static dlopen win32-dll])
+LT_CONFIG_LTDL_DIR([libltdl])
 LTDL_INIT
 AC_SUBST(LTDLINCL)
 AC_SUBST(LIBLTDL)
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 01919d4f2..e32ab0e28 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -82,11 +82,14 @@ TESTS = $(check_PROGRAMS)
 test_gnunet_prefix_SOURCES = \
  test_gnunet_prefix.c
 
+test_gnunet_prefix_CPPFLAGS = \
+  $(LTDLINCL)
+
 test_gnunet_prefix_LDADD = \
   $(GCLIBADD) $(WINLIB) \
   $(LTLIBICONV) \
   $(GN_LIBINTL) \
-  -lltdl -lunistring $(XLIB) 
+  $(LIBLTDL) -lunistring $(XLIB) 
 
 pkghellodir= $(pkgdatadir)/hellos
 
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 06cd283c8..275c98847 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -110,13 +110,15 @@ libgnunetutil_la_SOURCES = \
   time.c \
   speedup.c
 
+libgnunetutil_la_CPPFLAGS = \
+  $(LTDLINCL)
 
 libgnunetutil_la_LIBADD = \
   $(GCLIBADD) $(WINLIB) \
   $(LIBGCRYPT_LIBS) \
   $(LTLIBICONV) \
   $(LTLIBINTL) \
-  -lltdl $(Z_LIBS) -lunistring $(XLIB) 
+  $(LIBLTDL) $(Z_LIBS) -lunistring $(XLIB) 
 
 libgnunetutil_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) \