--- acinclude.m4 2004-09-17 21:38:34.000000000 +0200
+++ acinclude.m4 2010-10-24 16:12:08.873511475 +0200
@@ -228,8 +228,33 @@ AC_DEFUN([EC_RESOLVE_CHECK],
)
AM_CONDITIONAL(HAVE_DN_EXPAND, true) ac_ec_dns=yes
],
- [AM_CONDITIONAL(HAVE_DN_EXPAND, false) ac_ec_dns=no])
-
+ [
+ AC_SEARCH_LIBS(__dn_expand, resolv c,
+ [
+ AC_MSG_CHECKING(for additional -lresolv needed by dn_expand)
+ AC_TRY_LINK([
+ #include <sys/types.h>
+ #include <netinet/in.h>
+ #include <arpa/nameser.h>
+ #include <resolv.h>
+ ],
+ [
+ int main(int argc, char **argv)
+ {
+ char *q;
+ char p[NS_MAXDNAME];
+
+ dn_expand(q, q, q, p, sizeof(p));
+ }
+ ],
+ [AC_MSG_RESULT(not needed)],
+ [AC_MSG_RESULT(needed)
+ LIBS="$LIBS -lresolv"]
+ )
+ AM_CONDITIONAL(HAVE_DN_EXPAND, true) ac_ec_dns=yes
+ ],
+ [AM_CONDITIONAL(HAVE_DN_EXPAND, false) ac_ec_dns=no])
+ ])
])
dnl
--- ./aclocal.m4 2010-10-28 16:59:35.718177488 +0200
+++ ./aclocal.m4 2010-10-28 17:00:00.118180979 +0200
@@ -246,7 +246,7 @@ if test -z "$ltmain"; then
exit 1
fi
gentoo_lt_version="1.5.18"
-gentoo_ltmain_version=`grep '^[[:space:]]*VERSION=' $ltmain | sed -e 's|^[[:space:]]*VERSION=||'`
+gentoo_ltmain_version=`grep '^.*VERSION=' $ltmain | sed -e 's|^.*VERSION=||'`
if test "$gentoo_lt_version" != "$gentoo_ltmain_version"; then
AC_MSG_RESULT(no)
echo