Don't link prmcrypt.so against libltdl.

Since 2.5.5 (released nearly eight years ago), libmcrypt has
statically linked all its modules by default, unless configured with
--enable-dynamic-loading.  If anyone actually uses that, we ought to
use `libmcrypt-config --libs' to get the actual list of linker flags,
but just passing -lmcrypt should do for now.

diff --git a/src/microcode/configure.ac b/src/microcode/configure.ac
index 20c7d3467a5df49485da1577ca495d5d7351f7f1..4aefa313dcd56d34f3ede43eafedebc5b1fb50ec 100644 (file)
--- a/src/microcode/configure.ac
+++ b/src/microcode/configure.ac
@@ -843,16 +843,13 @@ if test "${with_mcrypt}" != no; then
        [
        AC_DEFINE([HAVE_MCRYPT_H], [1],
            [Define to 1 if you have the <mcrypt.h> header file.])
-       AC_CHECK_LIB([ltdl], [lt_dlinit], [mc_libs=-lltdl], [mc_libs=])
        AC_CHECK_LIB([mcrypt], [mcrypt_generic_init],
            [
            AC_DEFINE([HAVE_LIBMCRYPT], [1],
                [Define to 1 if you have the `mcrypt' library (-lmcrypt).])
-           MODULE_LIBS="-lmcrypt ${mc_libs} ${MODULE_LIBS}"
+           MODULE_LIBS="-lmcrypt ${MODULE_LIBS}"
            MODULE_BASES="${MODULE_BASES} prmcrypt"
-           ],
-           [],
-           [${mc_libs}])
+           ])
        ])
 fi
 

diff --git a/src/microcode/makegen/Makefile.in.in b/src/microcode/makegen/Makefile.in.in
index 4773543075f536583c7f0440861fde5d9b0e0716..bae43b34eb5b8b1941fd556d7adfc1de45eec120 100644 (file)
--- a/src/microcode/makegen/Makefile.in.in
+++ b/src/microcode/makegen/Makefile.in.in
@@ -202,7 +202,7 @@ prmhash.so: prmhash.o @MODULE_LOADER@
        $(LINK_MODULE) prmhash.o -lmhash $(MODULE_LIBS)
 
 prmcrypt.so: prmcrypt.o @MODULE_LOADER@
-       $(LINK_MODULE) prmcrypt.o -lmcrypt -lltdl $(MODULE_LIBS)
+       $(LINK_MODULE) prmcrypt.o -lmcrypt $(MODULE_LIBS)
 
 prgdbm.so: prgdbm.o @MODULE_LOADER@
        $(LINK_MODULE) prgdbm.o -lgdbm $(MODULE_LIBS)