Permalink
Browse files

Remove hardcoded -lresolv, -lnsl and -lsocket

We already check for the functions we need in libnsl
and libsocket, and I assume we don't need libresolv
  • Loading branch information...
1 parent 19c52d4 commit 9322aee188dae2a576ac69ef85ac7f124485381f @rubenk rubenk committed with pieterlexis Dec 24, 2014
Showing with 3 additions and 15 deletions.
  1. +3 −15 configure.ac
View
@@ -164,21 +164,20 @@ AM_CONDITIONAL([OS_MACOSX], false)
case "$host_os" in
solaris2.10)
AC_DEFINE(HAVE_IPV6,1,[If the host operating system understands IPv6])
- 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])
AC_DEFINE(HAVE_IPV6,1,[If the host operating system understands IPv6])
- LIBS="-lposix4 -lresolv -lnsl -lsocket -lpthread $LIBS"
+ LIBS="-lposix4 -lpthread $LIBS"
CXXFLAGS="-D_REENTRANT $CXXFLAGS"
;;
solaris2.6 | solaris2.7)
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*)
@@ -332,17 +331,6 @@ for a in $modules; do
if test ${a} = "gpgsql"; then
LIBS="$LIBS $LIBCRYPT"
-
- case "$host_os" in
- freebsd*)
- ;;
- darwin*)
- modulelibs="$modulelibs -lresolv"
- ;;
- *)
- modulelibs="$modulelibs -lresolv -lnsl"
- ;;
- esac
fi
done

0 comments on commit 9322aee

Please sign in to comment.