philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use AC_LANG_SOURCE() around argument to AC_LINK_IFELSE(), this means that we

Browse Source 
get confdefs.h included in the test.

This should fix the resolver linking issue on OS X.


git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@195 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Kevin Easton
2012-05-27 04:26:36 +00:00
parent 6947c0492d
commit 82f7a2ccf2
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
configure.in
View File

@@ -125,7 +125,7 @@ bx_cv_lib_resolver="not found"
for reslib in '' '-lresolv' '-lbind' '-lsocket' for reslib in '' '-lresolv' '-lbind' '-lsocket'
do do
LIBS="$reslib $OLDLIBS" LIBS="$reslib $OLDLIBS"
AC_LINK_IFELSE([ AC_LINK_IFELSE([AC_LANG_SOURCE([
#if defined( __APPLE__ ) && !defined( BIND_8_COMPAT ) #if defined( __APPLE__ ) && !defined( BIND_8_COMPAT )
#define BIND_8_COMPAT #define BIND_8_COMPAT
#endif #endif
@@ -146,7 +146,7 @@ do
int main() int main()
{ {
return res_mkquery(0, 0, 0, 0, 0, 0, 0, 0, 0); return res_mkquery(0, 0, 0, 0, 0, 0, 0, 0, 0);
}], [ }])], [
if test x"$reslib" != x; then if test x"$reslib" != x; then
bx_cv_lib_resolver="$reslib" bx_cv_lib_resolver="$reslib"
else else
@@ -780,7 +780,7 @@ AC_ARG_ENABLE(ipv6,
[ --enable-ipv6 Enable IPv6 support (Linux only)], [ --enable-ipv6 Enable IPv6 support (Linux only)],
[ case "$enableval" in [ case "$enableval" in
yes) yes)
AC_LINK_IFELSE([[ AC_LINK_IFELSE([AC_LANG_SOURCE([[
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
@@ -793,7 +793,7 @@ AC_ARG_ENABLE(ipv6,
sin6.sin6_addr = in6addr_any; sin6.sin6_addr = in6addr_any;
return sin6.sin6_addr.s6_addr[0]; return sin6.sin6_addr.s6_addr[0];
}]], [ ac_cv_ipv6_type="native" ], [ }]])], [ ac_cv_ipv6_type="native" ], [
if test -d "/usr/inet6/include"; then if test -d "/usr/inet6/include"; then
CFLAGS="$CFLAGS -I/usr/inet6/include" CFLAGS="$CFLAGS -I/usr/inet6/include"
LIBS="-L/usr/inet6/lib -linet6 $LIBS" LIBS="-L/usr/inet6/lib -linet6 $LIBS"