diff --git a/ChangeLog b/ChangeLog index 6ad4384..35abb49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 0.8.1 ===== + 26-Apr-2010: - Clean building from distribuion TAR did fail if the host + installed libltdl lib was used (and not the convenience lib) 29-Mar-2010: - fix: siproxd could crash when trying to rewrite a malformed SIP message. (thank you, Lucas) diff --git a/Makefile.am b/Makefile.am index fc65056..5485280 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,11 @@ # -SUBDIRS = libltdl src doc scripts contrib +if use_convenience_ltdl + OPT_LTDL_DIR = libltdl +endif + +SUBDIRS = $(OPT_LTDL_DIR) src doc scripts contrib INCLUDES = $(LTDLINCL) EXTRA_DIST = TODO RELNOTES siproxd.spec autogen.sh diff --git a/configure.in b/configure.in index a364b92..71a9507 100644 --- a/configure.in +++ b/configure.in @@ -47,6 +47,9 @@ dnl --disable-shared to be set as well (plugins will dnl be statically linked into siproxd) dnl 19-Feb-2010 tries CVE-2009-3736: use libltdl on host if existing dnl and fall back using convenienve libltdl (WARN) +dnl 26-Apr-2010 tries Fresh building from distribuion TAR did fail if +dnl the host-installed libltdl lib is used (and not the +dnl convenience lib) dnl dnl @@ -108,6 +111,9 @@ AC_CHECK_LIB(ltdl, lt_dlopen, [ if test "x$use_native_ltdl" = "xno"; then AC_LIBLTDL_CONVENIENCE + AM_CONDITIONAL(use_convenience_ltdl,true) +else + AM_CONDITIONAL(use_convenience_ltdl,false) fi dnl