diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-08-31 19:21:03 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-08-31 19:21:03 +0000 |
commit | 9839451a4a8344322d6a1578540e2eb1919427d7 (patch) | |
tree | 9b3073727d059805ac94598a78a13d309111d8cf /src/multicast | |
parent | 7d8f30700625ba1a94cbdb66362d92943a447412 (diff) | |
download | gnunet-9839451a4a8344322d6a1578540e2eb1919427d7.tar.gz gnunet-9839451a4a8344322d6a1578540e2eb1919427d7.zip |
trying to fix #3006, libltdl detection on FreeBSD
Diffstat (limited to 'src/multicast')
-rw-r--r-- | src/multicast/Makefile | 40 | ||||
-rw-r--r-- | src/multicast/Makefile.in | 28 |
2 files changed, 16 insertions, 52 deletions
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 |
63 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | 63 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
64 | am__aclocal_m4_deps = $(top_srcdir)/m4/absolute-header.m4 \ | 64 | am__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 | |||
187 | AMTAR = $${TAR-tar} | 186 | AMTAR = $${TAR-tar} |
188 | AM_DEFAULT_VERBOSITY = 0 | 187 | AM_DEFAULT_VERBOSITY = 0 |
189 | AR = ar | 188 | AR = ar |
190 | ARGZ_H = | ||
191 | AS = as | 189 | AS = as |
192 | AUTOCONF = ${SHELL} /home/grothoff/svn/gnunet/missing --run autoconf | 190 | AUTOCONF = ${SHELL} /home/grothoff/svn/gnunet/missing --run autoconf |
193 | AUTOHEADER = ${SHELL} /home/grothoff/svn/gnunet/missing --run autoheader | 191 | AUTOHEADER = ${SHELL} /home/grothoff/svn/gnunet/missing --run autoheader |
@@ -195,13 +193,13 @@ AUTOMAKE = ${SHELL} /home/grothoff/svn/gnunet/missing --run automake-1.11 | |||
195 | AWK = gawk | 193 | AWK = gawk |
196 | CC = gcc | 194 | CC = gcc |
197 | CCDEPMODE = depmode=gcc3 | 195 | CCDEPMODE = depmode=gcc3 |
198 | CFLAGS = -fno-strict-aliasing -Wall -g -O0 -Wall -I/home/grothoff/include | 196 | CFLAGS = -fno-strict-aliasing -Wall -g -Wall -O0 -I/home/grothoff/include |
199 | CPP = gcc -E | 197 | CPP = gcc -E |
200 | CPPFLAGS = -I/home/grothoff//include -I/home/grothoff//include | 198 | CPPFLAGS = -I/home/grothoff//include -I/home/grothoff//include |
201 | CXX = g++ | 199 | CXX = g++ |
202 | CXXCPP = g++ -E | 200 | CXXCPP = g++ -E |
203 | CXXDEPMODE = depmode=gcc3 | 201 | CXXDEPMODE = depmode=gcc3 |
204 | CXXFLAGS = -g -O0 -Wall | 202 | CXXFLAGS = -g -Wall -O0 |
205 | CYGPATH_W = echo | 203 | CYGPATH_W = echo |
206 | DEFAULT_INTERFACE = "eth0" | 204 | DEFAULT_INTERFACE = "eth0" |
207 | DEFS = -DHAVE_CONFIG_H | 205 | DEFS = -DHAVE_CONFIG_H |
@@ -230,7 +228,6 @@ GN_PLUGIN_LDFLAGS = -export-dynamic -avoid-version -module -no-undefined | |||
230 | GN_USER_HOME_DIR = ~/.gnunet | 228 | GN_USER_HOME_DIR = ~/.gnunet |
231 | GREP = /bin/grep | 229 | GREP = /bin/grep |
232 | HAVE_LIBUNISTRING = yes | 230 | HAVE_LIBUNISTRING = yes |
233 | INCLTDL = | ||
234 | INSTALL = /usr/bin/install -c | 231 | INSTALL = /usr/bin/install -c |
235 | INSTALL_DATA = ${INSTALL} -m 644 | 232 | INSTALL_DATA = ${INSTALL} -m 644 |
236 | INSTALL_PROGRAM = ${INSTALL} | 233 | INSTALL_PROGRAM = ${INSTALL} |
@@ -241,35 +238,24 @@ INTL_MACOSX_LIBS = | |||
241 | JAVAPORT = # | 238 | JAVAPORT = # |
242 | LD = /usr/bin/ld -m elf_x86_64 | 239 | LD = /usr/bin/ld -m elf_x86_64 |
243 | LDFLAGS = -L/home/grothoff//lib -L/home/grothoff//lib | 240 | LDFLAGS = -L/home/grothoff//lib -L/home/grothoff//lib |
244 | LIBADD_DL = -ldl | 241 | LIBCURL = -L/usr/lib/x86_64-linux-gnu -lcurl |
245 | LIBADD_DLD_LINK = | 242 | LIBCURL_CPPFLAGS = |
246 | LIBADD_DLOPEN = -ldl | ||
247 | LIBADD_SHL_LOAD = | ||
248 | LIBCURL = -L/home/grothoff/lib -lcurl -L/usr/lib | ||
249 | LIBCURL_CPPFLAGS = -I/home/grothoff/include | ||
250 | LIBGCRYPT_CFLAGS = -I/home/grothoff/include | 243 | LIBGCRYPT_CFLAGS = -I/home/grothoff/include |
251 | LIBGCRYPT_CONFIG = /home/grothoff/bin//libgcrypt-config | 244 | LIBGCRYPT_CONFIG = /home/grothoff/bin/libgcrypt-config |
252 | LIBGCRYPT_LIBS = -L/home/grothoff/lib -lgcrypt -lgpg-error | 245 | LIBGCRYPT_LIBS = -L/home/grothoff/lib -lgcrypt -lgpg-error |
253 | LIBICONV = | 246 | LIBICONV = |
254 | LIBINTL = | 247 | LIBINTL = |
255 | LIBLTDL = -lltdl | ||
256 | LIBOBJS = | 248 | LIBOBJS = |
257 | LIBPREFIX = | 249 | LIBPREFIX = |
258 | LIBS = -lm -ldl | 250 | LIBS = -lm |
259 | LIBTOOL = $(SHELL) $(top_builddir)/libtool | 251 | LIBTOOL = $(SHELL) $(top_builddir)/libtool |
260 | LIBUNISTRING = -lunistring | 252 | LIBUNISTRING = -lunistring |
261 | LIPO = | 253 | LIPO = |
262 | LN_S = ln -s | 254 | LN_S = ln -s |
263 | LTDLDEPS = | ||
264 | LTDLINCL = | ||
265 | LTDLOPEN = libltdl | ||
266 | LTLIBICONV = | 255 | LTLIBICONV = |
267 | LTLIBINTL = | 256 | LTLIBINTL = |
268 | LTLIBOBJS = | 257 | LTLIBOBJS = |
269 | LTLIBUNISTRING = -lunistring | 258 | LTLIBUNISTRING = -lunistring |
270 | LT_CONFIG_H = gnunet_config.h | ||
271 | LT_DLLOADERS = libltdl/dlopen.la | ||
272 | LT_DLPREOPEN = -dlpreopen libltdl/dlopen.la | ||
273 | MAKEINFO = ${SHELL} /home/grothoff/svn/gnunet/missing --run makeinfo | 259 | MAKEINFO = ${SHELL} /home/grothoff/svn/gnunet/missing --run makeinfo |
274 | MANIFEST_TOOL = : | 260 | MANIFEST_TOOL = : |
275 | MKDIR_P = /bin/mkdir -p | 261 | MKDIR_P = /bin/mkdir -p |
@@ -367,8 +353,6 @@ libdir = ${exec_prefix}/lib | |||
367 | libexecdir = $(pkglibdir)/libexec/ | 353 | libexecdir = $(pkglibdir)/libexec/ |
368 | localedir = ${datarootdir}/locale | 354 | localedir = ${datarootdir}/locale |
369 | localstatedir = ${prefix}/var | 355 | localstatedir = ${prefix}/var |
370 | ltdl_LIBOBJS = lt__strl.o | ||
371 | ltdl_LTLIBOBJS = lt__strl.lo | ||
372 | mandir = ${datarootdir}/man | 356 | mandir = ${datarootdir}/man |
373 | mkdir_p = /bin/mkdir -p | 357 | mkdir_p = /bin/mkdir -p |
374 | oldincludedir = /usr/include | 358 | oldincludedir = /usr/include |
@@ -383,9 +367,7 @@ pythondir = ${prefix}/lib/python2.7/site-packages | |||
383 | sbindir = ${exec_prefix}/sbin | 367 | sbindir = ${exec_prefix}/sbin |
384 | sharedstatedir = ${prefix}/com | 368 | sharedstatedir = ${prefix}/com |
385 | srcdir = . | 369 | srcdir = . |
386 | subdirs = libltdl | ||
387 | svnversioncommand = /usr/bin/svnversion | 370 | svnversioncommand = /usr/bin/svnversion |
388 | sys_symbol_underscore = no | ||
389 | sysconfdir = ${prefix}/etc | 371 | sysconfdir = ${prefix}/etc |
390 | target = x86_64-unknown-linux-gnu | 372 | target = x86_64-unknown-linux-gnu |
391 | target_alias = | 373 | target_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 |
63 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | 63 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
64 | am__aclocal_m4_deps = $(top_srcdir)/m4/absolute-header.m4 \ | 64 | am__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@ | |||
187 | AMTAR = @AMTAR@ | 186 | AMTAR = @AMTAR@ |
188 | AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ | 187 | AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ |
189 | AR = @AR@ | 188 | AR = @AR@ |
190 | ARGZ_H = @ARGZ_H@ | ||
191 | AS = @AS@ | 189 | AS = @AS@ |
192 | AUTOCONF = @AUTOCONF@ | 190 | AUTOCONF = @AUTOCONF@ |
193 | AUTOHEADER = @AUTOHEADER@ | 191 | AUTOHEADER = @AUTOHEADER@ |
@@ -230,7 +228,6 @@ GN_PLUGIN_LDFLAGS = @GN_PLUGIN_LDFLAGS@ | |||
230 | GN_USER_HOME_DIR = @GN_USER_HOME_DIR@ | 228 | GN_USER_HOME_DIR = @GN_USER_HOME_DIR@ |
231 | GREP = @GREP@ | 229 | GREP = @GREP@ |
232 | HAVE_LIBUNISTRING = @HAVE_LIBUNISTRING@ | 230 | HAVE_LIBUNISTRING = @HAVE_LIBUNISTRING@ |
233 | INCLTDL = @INCLTDL@ | ||
234 | INSTALL = @INSTALL@ | 231 | INSTALL = @INSTALL@ |
235 | INSTALL_DATA = @INSTALL_DATA@ | 232 | INSTALL_DATA = @INSTALL_DATA@ |
236 | INSTALL_PROGRAM = @INSTALL_PROGRAM@ | 233 | INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
@@ -241,10 +238,6 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ | |||
241 | JAVAPORT = @JAVAPORT@ | 238 | JAVAPORT = @JAVAPORT@ |
242 | LD = @LD@ | 239 | LD = @LD@ |
243 | LDFLAGS = @LDFLAGS@ | 240 | LDFLAGS = @LDFLAGS@ |
244 | LIBADD_DL = @LIBADD_DL@ | ||
245 | LIBADD_DLD_LINK = @LIBADD_DLD_LINK@ | ||
246 | LIBADD_DLOPEN = @LIBADD_DLOPEN@ | ||
247 | LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@ | ||
248 | LIBCURL = @LIBCURL@ | 241 | LIBCURL = @LIBCURL@ |
249 | LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@ | 242 | LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@ |
250 | LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ | 243 | LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ |
@@ -252,7 +245,6 @@ LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ | |||
252 | LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ | 245 | LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ |
253 | LIBICONV = @LIBICONV@ | 246 | LIBICONV = @LIBICONV@ |
254 | LIBINTL = @LIBINTL@ | 247 | LIBINTL = @LIBINTL@ |
255 | LIBLTDL = @LIBLTDL@ | ||
256 | LIBOBJS = @LIBOBJS@ | 248 | LIBOBJS = @LIBOBJS@ |
257 | LIBPREFIX = @LIBPREFIX@ | 249 | LIBPREFIX = @LIBPREFIX@ |
258 | LIBS = @LIBS@ | 250 | LIBS = @LIBS@ |
@@ -260,16 +252,10 @@ LIBTOOL = @LIBTOOL@ | |||
260 | LIBUNISTRING = @LIBUNISTRING@ | 252 | LIBUNISTRING = @LIBUNISTRING@ |
261 | LIPO = @LIPO@ | 253 | LIPO = @LIPO@ |
262 | LN_S = @LN_S@ | 254 | LN_S = @LN_S@ |
263 | LTDLDEPS = @LTDLDEPS@ | ||
264 | LTDLINCL = @LTDLINCL@ | ||
265 | LTDLOPEN = @LTDLOPEN@ | ||
266 | LTLIBICONV = @LTLIBICONV@ | 255 | LTLIBICONV = @LTLIBICONV@ |
267 | LTLIBINTL = @LTLIBINTL@ | 256 | LTLIBINTL = @LTLIBINTL@ |
268 | LTLIBOBJS = @LTLIBOBJS@ | 257 | LTLIBOBJS = @LTLIBOBJS@ |
269 | LTLIBUNISTRING = @LTLIBUNISTRING@ | 258 | LTLIBUNISTRING = @LTLIBUNISTRING@ |
270 | LT_CONFIG_H = @LT_CONFIG_H@ | ||
271 | LT_DLLOADERS = @LT_DLLOADERS@ | ||
272 | LT_DLPREOPEN = @LT_DLPREOPEN@ | ||
273 | MAKEINFO = @MAKEINFO@ | 259 | MAKEINFO = @MAKEINFO@ |
274 | MANIFEST_TOOL = @MANIFEST_TOOL@ | 260 | MANIFEST_TOOL = @MANIFEST_TOOL@ |
275 | MKDIR_P = @MKDIR_P@ | 261 | MKDIR_P = @MKDIR_P@ |
@@ -367,8 +353,6 @@ libdir = @libdir@ | |||
367 | libexecdir = $(pkglibdir)/libexec/ | 353 | libexecdir = $(pkglibdir)/libexec/ |
368 | localedir = @localedir@ | 354 | localedir = @localedir@ |
369 | localstatedir = @localstatedir@ | 355 | localstatedir = @localstatedir@ |
370 | ltdl_LIBOBJS = @ltdl_LIBOBJS@ | ||
371 | ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@ | ||
372 | mandir = @mandir@ | 356 | mandir = @mandir@ |
373 | mkdir_p = @mkdir_p@ | 357 | mkdir_p = @mkdir_p@ |
374 | oldincludedir = @oldincludedir@ | 358 | oldincludedir = @oldincludedir@ |
@@ -383,9 +367,7 @@ pythondir = @pythondir@ | |||
383 | sbindir = @sbindir@ | 367 | sbindir = @sbindir@ |
384 | sharedstatedir = @sharedstatedir@ | 368 | sharedstatedir = @sharedstatedir@ |
385 | srcdir = @srcdir@ | 369 | srcdir = @srcdir@ |
386 | subdirs = @subdirs@ | ||
387 | svnversioncommand = @svnversioncommand@ | 370 | svnversioncommand = @svnversioncommand@ |
388 | sys_symbol_underscore = @sys_symbol_underscore@ | ||
389 | sysconfdir = @sysconfdir@ | 371 | sysconfdir = @sysconfdir@ |
390 | target = @target@ | 372 | target = @target@ |
391 | target_alias = @target_alias@ | 373 | target_alias = @target_alias@ |