diff options
| author | Greg Hudson <ghudson@mit.edu> | 2012-07-08 18:04:56 -0400 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2012-09-04 01:31:46 -0400 |
| commit | c91cda209a1e2467bbb5fbb5a3116757d38ef374 (patch) | |
| tree | 96f17a8541bc5e637f4fc0cb90d354bcf2fb3fda /src/configure.in | |
| parent | 6b60871d961eff2fa4c476867ae9d8cbcffb8953 (diff) | |
| download | krb5-c91cda209a1e2467bbb5fbb5a3116757d38ef374.tar.gz krb5-c91cda209a1e2467bbb5fbb5a3116757d38ef374.tar.xz krb5-c91cda209a1e2467bbb5fbb5a3116757d38ef374.zip | |
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)
Diffstat (limited to 'src/configure.in')
| -rw-r--r-- | src/configure.in | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/configure.in b/src/configure.in index 9e9c94ff99..7154f686bd 100644 --- a/src/configure.in +++ b/src/configure.in @@ -1219,7 +1219,7 @@ AC_ARG_WITH([system-verto], [AC_HELP_STRING([--with-system-verto], [always use system verto library])], [], [with_system_verto=default]) VERTO_CFLAGS= -VERTO_LIBS="-lverto-k5ev -lverto" +VERTO_LIBS="-lverto" VERTO_VERSION=k5 if test "x$with_system_verto" != xno; then if verto_cflags=`pkg-config --cflags libverto 2>&1`; then @@ -1227,7 +1227,7 @@ if test "x$with_system_verto" != xno; then VERTO_LIBS=`pkg-config --libs libverto` VERTO_VERSION=sys else - AC_CHECK_LIB([verto], [verto_run], [VERTO_VERSION=sys; VERTO_LIBS=-lverto], + AC_CHECK_LIB([verto], [verto_run], [VERTO_VERSION=sys], [if test "x$with_system_verto" = xyes; then AC_MSG_ERROR([cannot detect system libverto]) fi]) @@ -1237,7 +1237,6 @@ if test "x$VERTO_VERSION" = xsys; then AC_MSG_NOTICE([Using system libverto]) else AC_MSG_RESULT([Using built-in libverto]) - AC_DEFINE([INTERNAL_VERTO],[1],[Define if using bundled libverto]) fi AC_SUBST([VERTO_CFLAGS]) AC_SUBST([VERTO_LIBS]) @@ -1295,7 +1294,7 @@ AC_CONFIG_FILES(krb5-config, [chmod +x krb5-config]) V5_AC_OUTPUT_MAKEFILE(. util util/support util/profile util/profile/testmod util/send-pr - util/verto util/k5ev + util/verto lib lib/kdb |