Merge pull request #1990 from rubenk/remove-hardcoded-libs

Remove hardcoded -lresolv, -lnsl and -lsocket

diff --combined configure.ac
index 6f6830b64d02c8539b306ffa78030a4aad3c8a0f,606b5092d03b9ea307f0d6d88073054a8cdfe0d9..232c823eac8db8ad381c01d96ade27ebb6f91104
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -39,13 -39,9 +39,9 @@@ AC_CC_STACK_PROTECTO
  AC_CC_PARAM_SSP_BUFFER_SIZE([4])
  AC_CC_D_FORTIFY_SOURCE
  
- AC_CHECK_FUNC([socket], [], [
-  AC_CHECK_LIB([socket], [socket], [LIBS="-lsocket $LIBS"])
- ])
- 
- AC_CHECK_FUNC([gethostent], [], [
-  AC_CHECK_LIB([nsl], [gethostent], [LIBS="-lnsl $LIBS"])
- ])
+ AC_SEARCH_LIBS([socket], [socket])
+ AC_SEARCH_LIBS([gethostent], [nsl])
+ AC_SEARCH_LIBS([inet_aton], [resolv])
  
  m4_ifndef([LT_INIT],[
  AC_PROG_LIBTOOL([disable-static])
@@@ -88,7 -84,18 +84,7 @@@ BOOST_SERIALIZATION([mt]
  
  PDNS_ENABLE_UNIT_TESTS
  
 -dnl Allow user to require SQLite3
 -AC_MSG_CHECKING([whether user requires sqlite3])
 -AC_ARG_WITH([sqlite3],
 -  [AS_HELP_STRING([--with-sqlite3],[include sqlite3 driver @<:@default=no@:>@])],
 -  [with_sqlite3=$withval],
 -  [with_sqlite3=no]
 -)
 -AC_MSG_RESULT([$with_sqlite3])
 -
 -AS_IF([test "x$with_sqlite3" != "xno"], [
 -  needsqlite3=yes
 -])
 +PDNS_WITH_SQLITE3
  
  PDNS_CHECK_PANDOC
  PDNS_CHECK_MKDOCS
@@@ -134,13 -141,13 +130,13 @@@ THREADFLAGS="
  
  case "$host_os" in
  solaris2.10)
-   LIBS="-lposix4 -lresolv -lnsl -lsocket -lpthread -lrt $LIBS"
+   LIBS="-lposix4 -lpthread -lrt $LIBS"
    CXXFLAGS="-D_REENTRANT $CXXFLAGS"
    ;;
  solaris2.8 | solaris2.9 )
    AC_DEFINE(NEED_POSIX_TYPEDEF,,[If POSIX typedefs need to be defined])
    AC_DEFINE(NEED_INET_NTOP_PROTO,,[If your OS is so broken that it needs an additional prototype])
-   LIBS="-lposix4 -lresolv -lnsl -lsocket -lpthread $LIBS"
+   LIBS="-lposix4 -lpthread $LIBS"
    CXXFLAGS="-D_REENTRANT $CXXFLAGS"
    ;;
  linux*)
@@@ -163,7 -170,6 +159,7 @@@ PDNS_WITH_SYSTEM_POLARSS
  PDNS_ENABLE_BOTAN
  PDNS_ENABLE_PKCS11
  PDNS_WITH_CRYPTOPP
 +PDNS_ENABLE_ED25519
  PDNS_ENABLE_REMOTEBACKEND_ZEROMQ
  
  AC_MSG_CHECKING([whether we will be building static binaries])
@@@ -272,8 -278,13 +268,8 @@@ AM_CONDITIONAL([ORACLE],[test "x$needor
  
  AM_CONDITIONAL([LMDB],[test "x$needlmdb" = "xyes"])
  
 +PDNS_CHECK_SQLITE3
  AM_CONDITIONAL([SQLITE3], [test "x$needsqlite3" = "xyes"])
 -AS_IF([test "x$needsqlite3" = "xyes"], [
 -  PKG_CHECK_MODULES([SQLITE3], [sqlite3],
 -    [AC_DEFINE([HAVE_SQLITE3], [1], [Define to 1 if you have sqlite3])],
 -    [AC_MSG_ERROR([Could not find libsqlite3])]
 -  )
 -])
  
  for a in $modules; do
    moduledirs="$moduledirs ${a}backend"
@@@ -285,17 -296,6 +281,6 @@@
  
    if test ${a} = "gpgsql"; then
      LIBS="$LIBS $LIBCRYPT"
- 
-     case "$host_os" in
-       freebsd*)
-         ;;
-       darwin*)
-         modulelibs="$modulelibs -lresolv"
-         ;;
-       *)
-         modulelibs="$modulelibs -lresolv -lnsl"
-         ;;
-     esac
    fi
  done
  
@@@ -326,7 -326,6 +311,7 @@@ AC_CONFIG_FILES(
    docs/Makefile
    pdns/pdns.init
    pdns/ext/Makefile
 +  pdns/ext/ed25519/Makefile
    pdns/ext/yahttp/Makefile
    pdns/ext/yahttp/yahttp/Makefile
    pdns/ext/polarssl/Makefile