From c91cda209a1e2467bbb5fbb5a3116757d38ef374 Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Sun, 8 Jul 2012 18:04:56 -0400 Subject: Avoid libdl dependencies in bundled libverto The upstream libverto depends on dynamic loading and in particular on dladdr(), which is not universal. To avoid this dependency, stub out support for module loading (by replacing module.c) and instead integrate the k5ev module directly into the bundled verto library. This change removes the need to link, include, and invoke libverto differently depending on whether we're using the bundled library; we can always just link with -lverto and call verto_default(). bigredbutton: whitespace ticket: 7351 (new) --- src/config/pre.in | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/config') diff --git a/src/config/pre.in b/src/config/pre.in index e5a087c02c..1ba26d8502 100644 --- a/src/config/pre.in +++ b/src/config/pre.in @@ -369,9 +369,6 @@ VERTO_VERSION = @VERTO_VERSION@ VERTO_DEPS = $(VERTO_DEPS-@VERTO_VERSION@) VERTO_DEPS-sys = VERTO_DEPS-k5 = $(BUILDTOP)/include/verto.h -VERTO_K5EV_DEPS = $(VERTO_K5EV_DEPS-@VERTO_VERSION@) -VERTO_K5EV_DEPS-sys = -VERTO_K5EV_DEPS-k5 = $(BUILDTOP)/include/verto-k5ev.h # LIBS gets substituted in... e.g. -lnsl -lsocket @@ -389,7 +386,7 @@ KDB5_LIB = -lkdb5 $(KDB5_PLUGIN_LIBS) VERTO_DEPLIB = $(VERTO_DEPLIB-@VERTO_VERSION@) VERTO_DEPLIB-sys = # empty -VERTO_DEPLIB-k5 = $(TOPLIBD)/libverto-k5ev$(DEPLIBEXT) $(TOPLIBD)/libverto$(DEPLIBEXT) +VERTO_DEPLIB-k5 = $(TOPLIBD)/libverto$(DEPLIBEXT) VERTO_CFLAGS = @VERTO_CFLAGS@ VERTO_LIBS = @VERTO_LIBS@ -- cgit