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/lib/apputils/deps | 2 +- src/lib/apputils/net-server.c | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) (limited to 'src/lib/apputils') diff --git a/src/lib/apputils/deps b/src/lib/apputils/deps index 586e1ef76..a41563e78 100644 --- a/src/lib/apputils/deps +++ b/src/lib/apputils/deps @@ -16,7 +16,7 @@ net-server.so net-server.po $(OUTPRE)net-server.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/gssapi/gssapi.h \ $(BUILDTOP)/include/gssrpc/types.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(VERTO_DEPS) $(VERTO_K5EV_DEPS) $(top_srcdir)/include/adm_proto.h \ + $(COM_ERR_DEPS) $(VERTO_DEPS) $(top_srcdir)/include/adm_proto.h \ $(top_srcdir)/include/fake-addrinfo.h $(top_srcdir)/include/foreachaddr.h \ $(top_srcdir)/include/gssrpc/auth.h $(top_srcdir)/include/gssrpc/auth_gss.h \ $(top_srcdir)/include/gssrpc/auth_unix.h $(top_srcdir)/include/gssrpc/clnt.h \ diff --git a/src/lib/apputils/net-server.c b/src/lib/apputils/net-server.c index 0fd08ecee..1f8a8f97a 100644 --- a/src/lib/apputils/net-server.c +++ b/src/lib/apputils/net-server.c @@ -58,10 +58,6 @@ #include "fake-addrinfo.h" #include "net-server.h" -#ifdef INTERNAL_VERTO -#include "verto-k5ev.h" -#endif - #include /* XXX */ @@ -269,12 +265,7 @@ loop_init(verto_ev_type types) types |= VERTO_EV_TYPE_IO; types |= VERTO_EV_TYPE_SIGNAL; types |= VERTO_EV_TYPE_TIMEOUT; - -#ifdef INTERNAL_VERTO - return verto_default_k5ev(); -#else return verto_default(NULL, types); -#endif } static void -- cgit