[GNUnet-SVN] r27542 - in gnunet: . contrib src/util

[gnunet]

Author: amatus
Date: 2013-06-23 18:23:08 +0200 (Sun, 23 Jun 2013)
New Revision: 27542

Modified:
   gnunet/configure.ac
   gnunet/contrib/Makefile.am
   gnunet/src/util/Makefile.am
Log:
Make --with-included-ltdl work.


Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2013-06-23 10:51:21 UTC (rev 27541)
+++ gnunet/configure.ac 2013-06-23 16:23:08 UTC (rev 27542)
@@ -43,6 +43,7 @@
 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)

Modified: gnunet/contrib/Makefile.am
===================================================================
--- gnunet/contrib/Makefile.am  2013-06-23 10:51:21 UTC (rev 27541)
+++ gnunet/contrib/Makefile.am  2013-06-23 16:23:08 UTC (rev 27542)
@@ -82,11 +82,14 @@
 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
 

Modified: gnunet/src/util/Makefile.am
===================================================================
--- gnunet/src/util/Makefile.am 2013-06-23 10:51:21 UTC (rev 27541)
+++ gnunet/src/util/Makefile.am 2013-06-23 16:23:08 UTC (rev 27542)
@@ -110,13 +110,15 @@
   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) \