aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.ac41
-rw-r--r--src/multicast/Makefile40
-rw-r--r--src/multicast/Makefile.in28
-rw-r--r--src/scalarproduct/Makefile.am7
-rw-r--r--src/util/Makefile.am5
5 files changed, 52 insertions, 69 deletions
diff --git a/configure.ac b/configure.ac
index 1810bc01e..2a6a8a8ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,10 +43,6 @@ AC_PROG_LN_S
43AC_PROG_MAKE_SET 43AC_PROG_MAKE_SET
44AM_PROG_CC_C_O 44AM_PROG_CC_C_O
45LT_INIT([disable-static dlopen win32-dll]) 45LT_INIT([disable-static dlopen win32-dll])
46LT_CONFIG_LTDL_DIR([libltdl])
47LTDL_INIT
48AC_SUBST(LTDLINCL)
49AC_SUBST(LIBLTDL)
50AC_SUBST(MKDIR_P) 46AC_SUBST(MKDIR_P)
51 47
52# large file support 48# large file support
@@ -473,6 +469,41 @@ fi
473# restore LIBS 469# restore LIBS
474LIBS=$SAVE_LIBS 470LIBS=$SAVE_LIBS
475 471
472# Check for libltdl header (#2999)
473ltdl=0
474AC_MSG_CHECKING(for libltdl)
475AC_ARG_WITH(ltdl,
476 [ --with-ltdl=PFX base of libltdl installation],
477 [AC_MSG_RESULT([$with_ltdl])
478 case $with_ltdl in
479 no)
480 ;;
481 yes)
482 AC_CHECK_HEADERS(ltdl.h,
483 AC_CHECK_LIB([ltdl], [lt_dlopenext],
484 ltdl=1))
485 ;;
486 *)
487 LDFLAGS="-L$with_ltdl/lib $LDFLAGS"
488 CPPFLAGS="-I$with_ltdl/include $CPPFLAGS"
489 AC_CHECK_HEADERS(ltdl.h,
490 AC_CHECK_LIB([ltdl], [lt_dlopenext],
491 EXT_LIB_PATH="-L$with_ltdl/lib $EXT_LIB_PATH"
492 ltdl=1))
493 ;;
494 esac
495 ],
496 [AC_MSG_RESULT([--with-ltdl not specified])
497 AC_CHECK_HEADERS(ltdl.h,
498 AC_CHECK_LIB([ltdl], [lt_dlopenext],
499 ltdl=1))])
500if test "$ltdl" != 1
501then
502 AC_MSG_ERROR([GNUnet requires libltdl (from GNU libtool), try installing libltdl-dev])
503fi
504# restore LIBS
505LIBS=$SAVE_LIBS
506
476# test for libunistring 507# test for libunistring
477gl_LIBUNISTRING 508gl_LIBUNISTRING
478if test $HAVE_LIBUNISTRING != yes; then 509if test $HAVE_LIBUNISTRING != yes; then
@@ -494,8 +525,6 @@ AC_HEADER_STDC
494AC_CHECK_HEADERS([fcntl.h math.h errno.h ctype.h limits.h stdio.h stdlib.h string.h unistd.h stdarg.h signal.h locale.h sys/stat.h sys/types.h],,AC_MSG_ERROR([Compiling GNUnet requires standard UNIX headers files])) 525AC_CHECK_HEADERS([fcntl.h math.h errno.h ctype.h limits.h stdio.h stdlib.h string.h unistd.h stdarg.h signal.h locale.h sys/stat.h sys/types.h],,AC_MSG_ERROR([Compiling GNUnet requires standard UNIX headers files]))
495 526
496 527
497# Check for libltdl header (#2999)
498AC_CHECK_HEADERS([ltdl.h],,AC_MSG_ERROR([Compiling GNUnet requires libltdl headers (try installing libltdl-dev)]))
499 528
500# Checks for headers that are only required on some systems or opional (and where we do NOT abort if they are not there) 529# Checks for headers that are only required on some systems or opional (and where we do NOT abort if they are not there)
501AC_CHECK_HEADERS([malloc.h malloc/malloc.h langinfo.h sys/param.h sys/mount.h sys/statvfs.h sys/select.h sockLib.h sys/mman.h sys/msg.h sys/vfs.h arpa/inet.h fcntl.h libintl.h netdb.h netinet/in.h netinet/in_systm.h netinet/ip.h sys/ioctl.h sys/socket.h sys/time.h unistd.h kstat.h sys/sysinfo.h kvm.h sys/file.h sys/resource.h ifaddrs.h mach/mach.h stddef.h sys/timeb.h terminos.h argz.h ucred.h endian.h sys/endian.h execinfo.h]) 530AC_CHECK_HEADERS([malloc.h malloc/malloc.h langinfo.h sys/param.h sys/mount.h sys/statvfs.h sys/select.h sockLib.h sys/mman.h sys/msg.h sys/vfs.h arpa/inet.h fcntl.h libintl.h netdb.h netinet/in.h netinet/in_systm.h netinet/ip.h sys/ioctl.h sys/socket.h sys/time.h unistd.h kstat.h sys/sysinfo.h kvm.h sys/file.h sys/resource.h ifaddrs.h mach/mach.h stddef.h sys/timeb.h terminos.h argz.h ucred.h endian.h sys/endian.h execinfo.h])
diff --git a/src/multicast/Makefile b/src/multicast/Makefile
index b1144f002..bcf6ecbe1 100644
--- a/src/multicast/Makefile
+++ b/src/multicast/Makefile
@@ -62,12 +62,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
62 $(srcdir)/multicast.conf.in 62 $(srcdir)/multicast.conf.in
63ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 63ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
64am__aclocal_m4_deps = $(top_srcdir)/m4/absolute-header.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/absolute-header.m4 \
65 $(top_srcdir)/m4/align.m4 $(top_srcdir)/m4/argz.m4 \ 65 $(top_srcdir)/m4/align.m4 $(top_srcdir)/m4/gettext.m4 \
66 $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ 66 $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
67 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ 67 $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
68 $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libcurl.m4 \ 68 $(top_srcdir)/m4/libcurl.m4 $(top_srcdir)/m4/libgcrypt.m4 \
69 $(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/libtool.m4 \ 69 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libunistring.m4 \
70 $(top_srcdir)/m4/libunistring.m4 $(top_srcdir)/m4/ltdl.m4 \
71 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 70 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
72 $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ 71 $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
73 $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ 72 $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
@@ -187,7 +186,6 @@ ACLOCAL = ${SHELL} /home/grothoff/svn/gnunet/missing --run aclocal-1.11
187AMTAR = $${TAR-tar} 186AMTAR = $${TAR-tar}
188AM_DEFAULT_VERBOSITY = 0 187AM_DEFAULT_VERBOSITY = 0
189AR = ar 188AR = ar
190ARGZ_H =
191AS = as 189AS = as
192AUTOCONF = ${SHELL} /home/grothoff/svn/gnunet/missing --run autoconf 190AUTOCONF = ${SHELL} /home/grothoff/svn/gnunet/missing --run autoconf
193AUTOHEADER = ${SHELL} /home/grothoff/svn/gnunet/missing --run autoheader 191AUTOHEADER = ${SHELL} /home/grothoff/svn/gnunet/missing --run autoheader
@@ -195,13 +193,13 @@ AUTOMAKE = ${SHELL} /home/grothoff/svn/gnunet/missing --run automake-1.11
195AWK = gawk 193AWK = gawk
196CC = gcc 194CC = gcc
197CCDEPMODE = depmode=gcc3 195CCDEPMODE = depmode=gcc3
198CFLAGS = -fno-strict-aliasing -Wall -g -O0 -Wall -I/home/grothoff/include 196CFLAGS = -fno-strict-aliasing -Wall -g -Wall -O0 -I/home/grothoff/include
199CPP = gcc -E 197CPP = gcc -E
200CPPFLAGS = -I/home/grothoff//include -I/home/grothoff//include 198CPPFLAGS = -I/home/grothoff//include -I/home/grothoff//include
201CXX = g++ 199CXX = g++
202CXXCPP = g++ -E 200CXXCPP = g++ -E
203CXXDEPMODE = depmode=gcc3 201CXXDEPMODE = depmode=gcc3
204CXXFLAGS = -g -O0 -Wall 202CXXFLAGS = -g -Wall -O0
205CYGPATH_W = echo 203CYGPATH_W = echo
206DEFAULT_INTERFACE = "eth0" 204DEFAULT_INTERFACE = "eth0"
207DEFS = -DHAVE_CONFIG_H 205DEFS = -DHAVE_CONFIG_H
@@ -230,7 +228,6 @@ GN_PLUGIN_LDFLAGS = -export-dynamic -avoid-version -module -no-undefined
230GN_USER_HOME_DIR = ~/.gnunet 228GN_USER_HOME_DIR = ~/.gnunet
231GREP = /bin/grep 229GREP = /bin/grep
232HAVE_LIBUNISTRING = yes 230HAVE_LIBUNISTRING = yes
233INCLTDL =
234INSTALL = /usr/bin/install -c 231INSTALL = /usr/bin/install -c
235INSTALL_DATA = ${INSTALL} -m 644 232INSTALL_DATA = ${INSTALL} -m 644
236INSTALL_PROGRAM = ${INSTALL} 233INSTALL_PROGRAM = ${INSTALL}
@@ -241,35 +238,24 @@ INTL_MACOSX_LIBS =
241JAVAPORT = # 238JAVAPORT = #
242LD = /usr/bin/ld -m elf_x86_64 239LD = /usr/bin/ld -m elf_x86_64
243LDFLAGS = -L/home/grothoff//lib -L/home/grothoff//lib 240LDFLAGS = -L/home/grothoff//lib -L/home/grothoff//lib
244LIBADD_DL = -ldl 241LIBCURL = -L/usr/lib/x86_64-linux-gnu -lcurl
245LIBADD_DLD_LINK = 242LIBCURL_CPPFLAGS =
246LIBADD_DLOPEN = -ldl
247LIBADD_SHL_LOAD =
248LIBCURL = -L/home/grothoff/lib -lcurl -L/usr/lib
249LIBCURL_CPPFLAGS = -I/home/grothoff/include
250LIBGCRYPT_CFLAGS = -I/home/grothoff/include 243LIBGCRYPT_CFLAGS = -I/home/grothoff/include
251LIBGCRYPT_CONFIG = /home/grothoff/bin//libgcrypt-config 244LIBGCRYPT_CONFIG = /home/grothoff/bin/libgcrypt-config
252LIBGCRYPT_LIBS = -L/home/grothoff/lib -lgcrypt -lgpg-error 245LIBGCRYPT_LIBS = -L/home/grothoff/lib -lgcrypt -lgpg-error
253LIBICONV = 246LIBICONV =
254LIBINTL = 247LIBINTL =
255LIBLTDL = -lltdl
256LIBOBJS = 248LIBOBJS =
257LIBPREFIX = 249LIBPREFIX =
258LIBS = -lm -ldl 250LIBS = -lm
259LIBTOOL = $(SHELL) $(top_builddir)/libtool 251LIBTOOL = $(SHELL) $(top_builddir)/libtool
260LIBUNISTRING = -lunistring 252LIBUNISTRING = -lunistring
261LIPO = 253LIPO =
262LN_S = ln -s 254LN_S = ln -s
263LTDLDEPS =
264LTDLINCL =
265LTDLOPEN = libltdl
266LTLIBICONV = 255LTLIBICONV =
267LTLIBINTL = 256LTLIBINTL =
268LTLIBOBJS = 257LTLIBOBJS =
269LTLIBUNISTRING = -lunistring 258LTLIBUNISTRING = -lunistring
270LT_CONFIG_H = gnunet_config.h
271LT_DLLOADERS = libltdl/dlopen.la
272LT_DLPREOPEN = -dlpreopen libltdl/dlopen.la
273MAKEINFO = ${SHELL} /home/grothoff/svn/gnunet/missing --run makeinfo 259MAKEINFO = ${SHELL} /home/grothoff/svn/gnunet/missing --run makeinfo
274MANIFEST_TOOL = : 260MANIFEST_TOOL = :
275MKDIR_P = /bin/mkdir -p 261MKDIR_P = /bin/mkdir -p
@@ -367,8 +353,6 @@ libdir = ${exec_prefix}/lib
367libexecdir = $(pkglibdir)/libexec/ 353libexecdir = $(pkglibdir)/libexec/
368localedir = ${datarootdir}/locale 354localedir = ${datarootdir}/locale
369localstatedir = ${prefix}/var 355localstatedir = ${prefix}/var
370ltdl_LIBOBJS = lt__strl.o
371ltdl_LTLIBOBJS = lt__strl.lo
372mandir = ${datarootdir}/man 356mandir = ${datarootdir}/man
373mkdir_p = /bin/mkdir -p 357mkdir_p = /bin/mkdir -p
374oldincludedir = /usr/include 358oldincludedir = /usr/include
@@ -383,9 +367,7 @@ pythondir = ${prefix}/lib/python2.7/site-packages
383sbindir = ${exec_prefix}/sbin 367sbindir = ${exec_prefix}/sbin
384sharedstatedir = ${prefix}/com 368sharedstatedir = ${prefix}/com
385srcdir = . 369srcdir = .
386subdirs = libltdl
387svnversioncommand = /usr/bin/svnversion 370svnversioncommand = /usr/bin/svnversion
388sys_symbol_underscore = no
389sysconfdir = ${prefix}/etc 371sysconfdir = ${prefix}/etc
390target = x86_64-unknown-linux-gnu 372target = x86_64-unknown-linux-gnu
391target_alias = 373target_alias =
diff --git a/src/multicast/Makefile.in b/src/multicast/Makefile.in
index a73c0528b..2711211ed 100644
--- a/src/multicast/Makefile.in
+++ b/src/multicast/Makefile.in
@@ -62,12 +62,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
62 $(srcdir)/multicast.conf.in 62 $(srcdir)/multicast.conf.in
63ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 63ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
64am__aclocal_m4_deps = $(top_srcdir)/m4/absolute-header.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/absolute-header.m4 \
65 $(top_srcdir)/m4/align.m4 $(top_srcdir)/m4/argz.m4 \ 65 $(top_srcdir)/m4/align.m4 $(top_srcdir)/m4/gettext.m4 \
66 $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ 66 $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
67 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ 67 $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
68 $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libcurl.m4 \ 68 $(top_srcdir)/m4/libcurl.m4 $(top_srcdir)/m4/libgcrypt.m4 \
69 $(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/libtool.m4 \ 69 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libunistring.m4 \
70 $(top_srcdir)/m4/libunistring.m4 $(top_srcdir)/m4/ltdl.m4 \
71 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 70 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
72 $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ 71 $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
73 $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ 72 $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
@@ -187,7 +186,6 @@ ACLOCAL = @ACLOCAL@
187AMTAR = @AMTAR@ 186AMTAR = @AMTAR@
188AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ 187AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
189AR = @AR@ 188AR = @AR@
190ARGZ_H = @ARGZ_H@
191AS = @AS@ 189AS = @AS@
192AUTOCONF = @AUTOCONF@ 190AUTOCONF = @AUTOCONF@
193AUTOHEADER = @AUTOHEADER@ 191AUTOHEADER = @AUTOHEADER@
@@ -230,7 +228,6 @@ GN_PLUGIN_LDFLAGS = @GN_PLUGIN_LDFLAGS@
230GN_USER_HOME_DIR = @GN_USER_HOME_DIR@ 228GN_USER_HOME_DIR = @GN_USER_HOME_DIR@
231GREP = @GREP@ 229GREP = @GREP@
232HAVE_LIBUNISTRING = @HAVE_LIBUNISTRING@ 230HAVE_LIBUNISTRING = @HAVE_LIBUNISTRING@
233INCLTDL = @INCLTDL@
234INSTALL = @INSTALL@ 231INSTALL = @INSTALL@
235INSTALL_DATA = @INSTALL_DATA@ 232INSTALL_DATA = @INSTALL_DATA@
236INSTALL_PROGRAM = @INSTALL_PROGRAM@ 233INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -241,10 +238,6 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
241JAVAPORT = @JAVAPORT@ 238JAVAPORT = @JAVAPORT@
242LD = @LD@ 239LD = @LD@
243LDFLAGS = @LDFLAGS@ 240LDFLAGS = @LDFLAGS@
244LIBADD_DL = @LIBADD_DL@
245LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
246LIBADD_DLOPEN = @LIBADD_DLOPEN@
247LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
248LIBCURL = @LIBCURL@ 241LIBCURL = @LIBCURL@
249LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@ 242LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@
250LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ 243LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
@@ -252,7 +245,6 @@ LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
252LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ 245LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
253LIBICONV = @LIBICONV@ 246LIBICONV = @LIBICONV@
254LIBINTL = @LIBINTL@ 247LIBINTL = @LIBINTL@
255LIBLTDL = @LIBLTDL@
256LIBOBJS = @LIBOBJS@ 248LIBOBJS = @LIBOBJS@
257LIBPREFIX = @LIBPREFIX@ 249LIBPREFIX = @LIBPREFIX@
258LIBS = @LIBS@ 250LIBS = @LIBS@
@@ -260,16 +252,10 @@ LIBTOOL = @LIBTOOL@
260LIBUNISTRING = @LIBUNISTRING@ 252LIBUNISTRING = @LIBUNISTRING@
261LIPO = @LIPO@ 253LIPO = @LIPO@
262LN_S = @LN_S@ 254LN_S = @LN_S@
263LTDLDEPS = @LTDLDEPS@
264LTDLINCL = @LTDLINCL@
265LTDLOPEN = @LTDLOPEN@
266LTLIBICONV = @LTLIBICONV@ 255LTLIBICONV = @LTLIBICONV@
267LTLIBINTL = @LTLIBINTL@ 256LTLIBINTL = @LTLIBINTL@
268LTLIBOBJS = @LTLIBOBJS@ 257LTLIBOBJS = @LTLIBOBJS@
269LTLIBUNISTRING = @LTLIBUNISTRING@ 258LTLIBUNISTRING = @LTLIBUNISTRING@
270LT_CONFIG_H = @LT_CONFIG_H@
271LT_DLLOADERS = @LT_DLLOADERS@
272LT_DLPREOPEN = @LT_DLPREOPEN@
273MAKEINFO = @MAKEINFO@ 259MAKEINFO = @MAKEINFO@
274MANIFEST_TOOL = @MANIFEST_TOOL@ 260MANIFEST_TOOL = @MANIFEST_TOOL@
275MKDIR_P = @MKDIR_P@ 261MKDIR_P = @MKDIR_P@
@@ -367,8 +353,6 @@ libdir = @libdir@
367libexecdir = $(pkglibdir)/libexec/ 353libexecdir = $(pkglibdir)/libexec/
368localedir = @localedir@ 354localedir = @localedir@
369localstatedir = @localstatedir@ 355localstatedir = @localstatedir@
370ltdl_LIBOBJS = @ltdl_LIBOBJS@
371ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
372mandir = @mandir@ 356mandir = @mandir@
373mkdir_p = @mkdir_p@ 357mkdir_p = @mkdir_p@
374oldincludedir = @oldincludedir@ 358oldincludedir = @oldincludedir@
@@ -383,9 +367,7 @@ pythondir = @pythondir@
383sbindir = @sbindir@ 367sbindir = @sbindir@
384sharedstatedir = @sharedstatedir@ 368sharedstatedir = @sharedstatedir@
385srcdir = @srcdir@ 369srcdir = @srcdir@
386subdirs = @subdirs@
387svnversioncommand = @svnversioncommand@ 370svnversioncommand = @svnversioncommand@
388sys_symbol_underscore = @sys_symbol_underscore@
389sysconfdir = @sysconfdir@ 371sysconfdir = @sysconfdir@
390target = @target@ 372target = @target@
391target_alias = @target_alias@ 373target_alias = @target_alias@
diff --git a/src/scalarproduct/Makefile.am b/src/scalarproduct/Makefile.am
index 33d7df571..e0cc72b01 100644
--- a/src/scalarproduct/Makefile.am
+++ b/src/scalarproduct/Makefile.am
@@ -64,13 +64,6 @@ if ENABLE_TEST_RUN
64 TESTS = $(check_PROGRAMS) 64 TESTS = $(check_PROGRAMS)
65endif 65endif
66 66
67test_consensus_api_SOURCES = \
68 test_consensus_api.c
69test_consensus_api_LDADD = \
70 $(top_builddir)/src/util/libgnunetutil.la \
71 $(top_builddir)/src/testing/libgnunettesting.la \
72 $(top_builddir)/src/consensus/libgnunetconsensus.la
73
74test_scalarproduct_api_SOURCES = \ 67test_scalarproduct_api_SOURCES = \
75 test_scalarproduct_api.c 68 test_scalarproduct_api.c
76test_scalarproduct_api_LDADD = \ 69test_scalarproduct_api_LDADD = \
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 17c06ddbd..cb058e40d 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -108,15 +108,12 @@ libgnunetutil_la_SOURCES = \
108 time.c \ 108 time.c \
109 speedup.c 109 speedup.c
110 110
111libgnunetutil_la_CPPFLAGS = \
112 $(LTDLINCL)
113
114libgnunetutil_la_LIBADD = \ 111libgnunetutil_la_LIBADD = \
115 $(GCLIBADD) $(WINLIB) \ 112 $(GCLIBADD) $(WINLIB) \
116 $(LIBGCRYPT_LIBS) \ 113 $(LIBGCRYPT_LIBS) \
117 $(LTLIBICONV) \ 114 $(LTLIBICONV) \
118 $(LTLIBINTL) \ 115 $(LTLIBINTL) \
119 $(LIBLTDL) $(Z_LIBS) -lunistring $(XLIB) 116 -lltdl $(Z_LIBS) -lunistring $(XLIB)
120 117
121libgnunetutil_la_LDFLAGS = \ 118libgnunetutil_la_LDFLAGS = \
122 $(GN_LIB_LDFLAGS) \ 119 $(GN_LIB_LDFLAGS) \
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-22 03:20:21 +0000