Merged from trunk

diff --cc configure.in
index 050ee86e3e02d5a6cddd030f4e17fb11d0232243,cdde491f5e2a4e0737e132c59ffb79d0c79174fc..7e706eb5f19786a45c494e0defef18c2ef97416e
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -123,8 -81,9 +123,8 @@@ the
      top_build_prefix=${ac_top_build_prefix}
      AC_SUBST(top_build_prefix)
  
-     AC_LIBLTDL_CONVENIENCE(lib/libLtdl)
+     AC_LIBLTDL_CONVENIENCE
  fi
 -AC_PROG_LIBTOOL
  AC_LTDL_DLLIB
  
  # Do we need these unconditionally for "make distcheck" to work?

diff --cc src/Makefile.am
Simple merge