diff options
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | configure.ac | 21 |
2 files changed, 27 insertions, 3 deletions
@@ -1,4 +1,9 @@ | |||
1 | 20050502 | 1 | 20040513 |
2 | - (dtucker) [configure.ac] Bug #867: Additional tests for res_query in | ||
3 | libresolv, fixes problems detecting it on some platforms | ||
4 | (eg Linux/x86-64). From Kurt Roeckx via Debian, ok mouring@ | ||
5 | |||
6 | 20040502 | ||
2 | - (dtucker) OpenBSD CVS Sync | 7 | - (dtucker) OpenBSD CVS Sync |
3 | - djm@cvs.openbsd.org 2004/04/22 11:56:57 | 8 | - djm@cvs.openbsd.org 2004/04/22 11:56:57 |
4 | [moduli.c] | 9 | [moduli.c] |
@@ -1073,4 +1078,4 @@ | |||
1073 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 1078 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
1074 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 1079 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
1075 | 1080 | ||
1076 | $Id: ChangeLog,v 1.3341 2004/05/02 23:19:03 dtucker Exp $ | 1081 | $Id: ChangeLog,v 1.3342 2004/05/13 01:56:16 dtucker Exp $ |
diff --git a/configure.ac b/configure.ac index 053204d74..850205cc7 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.216 2004/04/23 08:53:10 dtucker Exp $ | 1 | # $Id: configure.ac,v 1.217 2004/05/13 01:56:17 dtucker Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 1999-2004 Damien Miller | 3 | # Copyright (c) 1999-2004 Damien Miller |
4 | # | 4 | # |
@@ -2156,6 +2156,25 @@ AC_SEARCH_LIBS(getrrsetbyname, resolv, | |||
2156 | # Needed by our getrrsetbyname() | 2156 | # Needed by our getrrsetbyname() |
2157 | AC_SEARCH_LIBS(res_query, resolv) | 2157 | AC_SEARCH_LIBS(res_query, resolv) |
2158 | AC_SEARCH_LIBS(dn_expand, resolv) | 2158 | AC_SEARCH_LIBS(dn_expand, resolv) |
2159 | AC_MSG_CHECKING(if res_query will link) | ||
2160 | AC_TRY_LINK_FUNC(res_query, AC_MSG_RESULT(yes), | ||
2161 | [AC_MSG_RESULT(no) | ||
2162 | saved_LIBS="$LIBS" | ||
2163 | LIBS="$LIBS -lresolv" | ||
2164 | AC_MSG_CHECKING(for res_query in -lresolv) | ||
2165 | AC_LINK_IFELSE([ | ||
2166 | #include <resolv.h> | ||
2167 | int main() | ||
2168 | { | ||
2169 | res_query (0, 0, 0, 0, 0); | ||
2170 | return 0; | ||
2171 | } | ||
2172 | ], | ||
2173 | [LIBS="$LIBS -lresolv" | ||
2174 | AC_MSG_RESULT(yes)], | ||
2175 | [LIBS="$saved_LIBS" | ||
2176 | AC_MSG_RESULT(no)]) | ||
2177 | ]) | ||
2159 | AC_CHECK_FUNCS(_getshort _getlong) | 2178 | AC_CHECK_FUNCS(_getshort _getlong) |
2160 | AC_CHECK_MEMBER(HEADER.ad, | 2179 | AC_CHECK_MEMBER(HEADER.ad, |
2161 | [AC_DEFINE(HAVE_HEADER_AD)],, | 2180 | [AC_DEFINE(HAVE_HEADER_AD)],, |