From a3c87fd4c658fb85cf89ac62c85cbced0456182c Mon Sep 17 00:00:00 2001 From: Taylor R Campbell Date: Sun, 14 Feb 2010 13:53:28 -0500 Subject: [PATCH] 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. --- src/microcode/configure.ac | 7 ++----- src/microcode/makegen/Makefile.in.in | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/microcode/configure.ac b/src/microcode/configure.ac index 20c7d3467..4aefa313d 100644 --- 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 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 477354307..bae43b34e 100644 --- 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) -- 2.25.1