[Bug 1628] Clean up -lxnet/-lsocket usage for (open)solaris

bk: 4c9193d4jnL6iqKA9pV73449iiHElQ

diff --git a/ChangeLog b/ChangeLog
index 4f5194f47ae4cc036b47645fb9c38e499ffdbee5..581d58cc69cf3b466bb8a66e7e5bf4c3fe02b2d6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 1628] Clean up -lxnet/-lsocket usage for (open)solaris.
 (4.2.7p49) 2010/09/13 Released by Harlan Stenn <stenn@ntp.org>
 * Documentation updates from Dave Mills.
 (4.2.7p48) 2010/09/12 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/configure.ac b/configure.ac
index 3ece55db5ab689de5e4041f037193495f357e91e..f4dc9ac65005daaae6749aa6b19828d8a0faa108 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -403,15 +403,18 @@ case "$host" in
     ;;
 esac
 
-AC_SEARCH_LIBS([setsockopt], [socket xnet])
-AC_SEARCH_LIBS([res_init], [resolv], , , [-lsocket -lnsl])
+_libs=$LIBS
+LIBS="$LIBS $libxnet"
+AC_SEARCH_LIBS([setsockopt], [socket])
+LIBS=$_libs
+AC_SEARCH_LIBS([res_init], [resolv], , , [$libxnet -lsocket -lnsl])
 case "$host" in
  *-*-darwin*)
     AC_CHECK_LIB([resolv],[res_9_init])
     ;;
 esac
 AC_HEADER_RESOLV
-AC_CHECK_FUNCS([res_init __res_init])
+AC_CHECK_FUNCS([res_init], , AC_CHECK_FUNCS([__res_init]))
 
 AC_HEADER_STDC
 AC_CHECK_HEADERS(bstring.h)
@@ -1318,7 +1321,7 @@ case $ac_cv_have_if_nametoindex in
        ;;
 esac
 
-AC_SEARCH_LIBS([inet_ntop], [resolv], , , [-lsocket -lnsl])
+AC_SEARCH_LIBS([inet_ntop], [resolv], , , [$libxnet -lsocket -lnsl])
 AC_CHECK_FUNC(inet_ntop, [], [AC_DEFINE(ISC_PLATFORM_NEEDNTOP, 1, [ISC: provide inet_ntop()])])
 AC_CHECK_FUNC(inet_pton, [], [AC_DEFINE(ISC_PLATFORM_NEEDPTON, 1, [ISC: provide inet_pton()])])
 case "$ac_cv_header_kvm_h" in