solaris-libraries.patch revision 1124
207N/AFrom ef06be83bcbd285f49d53e9145f4537fbd299f68 Mon Sep 17 00:00:00 2001
207N/AFrom: Alan Coopersmith <alan.coopersmith@sun.com>
207N/ADate: Fri, 30 Oct 2009 22:19:51 -0700
207N/ASubject: [PATCH] Fix detection of network libraries & functions on Solaris/OpenSolaris
207N/A
207N/A---
207N/A common/network/Makefile.am | 1 +
207N/A configure.ac | 13 ++++++++++++-
207N/A 2 files changed, 13 insertions(+), 1 deletions(-)
207N/A
207N/Adiff --git a/common/network/Makefile.am b/common/network/Makefile.am
207N/Aindex 3db5536..c5139bf 100644
207N/A--- a/common/network/Makefile.am
207N/A+++ b/common/network/Makefile.am
207N/A@@ -6,4 +6,6 @@ libnetwork_la_SOURCES = $(HDRS) TcpSocket.cxx
207N/A
207N/A libnetwork_la_CPPFLAGS = -I$(top_srcdir)/common
207N/A
207N/A+libnetwork_la_LIBADD = $(SOCKET_LIB) $(INET_LIB)
207N/A+
207N/A EXTRA_DIST = CMakeLists.txt
207N/A
207N/Adiff --git a/configure.ac b/configure.ac
207N/Aindex 66b9b34..857000a 100644
207N/A--- a/configure.ac
207N/A+++ b/configure.ac
207N/A@@ -114,16 +114,24 @@ AC_SUBST(READDISPLAY_DEFINE)
207N/A
207N/A dnl Under Lynx/OS 2.3, we have to link with -lbsd to resolve
207N/A dnl gethostbyname, inet_addr, htons etc. Check if it's necessary.
207N/A+dnl Under Solaris and other SVR4 OS'es, those require -lnsl and
207N/A+dnl the socket functions require -lsocket
207N/A dnl NOTE: Did not want to use AC_SEARCH_LIBS which would add
282N/A dnl -lbsd to LIBS. We set INET_LIB instead.
207N/A AC_LANG_SAVE
261N/A AC_LANG_C
207N/A AC_CHECK_FUNC(gethostbyname,INET_LIB_REQ=,INET_LIB_REQ=yes)
207N/A if test "$INET_LIB_REQ" = yes; then
207N/A- AC_CHECK_LIB(bsd,gethostbyname,INET_LIB=-lbsd,INET_LIB=)
207N/A+ AC_CHECK_LIB(bsd,gethostbyname,INET_LIB=-lbsd,
207N/A+ AC_CHECK_LIB(nsl,gethostbyname,INET_LIB=-lnsl,INET_LIB=))
207N/A+fi
207N/A+AC_CHECK_FUNC(connect,SOCKET_LIB_REQ=,SOCKET_LIB_REQ=yes)
207N/A+if test "$SOCKET_LIB_REQ" = yes; then
207N/A+ AC_CHECK_LIB(socket,connect,SOCKET_LIB=-lsocket,SOCKET_LIB=,$INET_LIB)
207N/A fi
207N/A AC_LANG_RESTORE
207N/A AC_SUBST(INET_LIB)
207N/A+AC_SUBST(SOCKET_LIB)
207N/A
207N/A dnl Check for zlib library
207N/A INCLUDED_ZLIB=no
207N/A@@ -159,7 +167,10 @@ AC_SEARCH_LIBS([inet_aton], [resolv])
207N/A AC_CHECK_FUNCS([inet_aton])
207N/A
207N/A # IPv6 related functions
207N/A+save_LIBS="$LIBS"
207N/A+LIBS="$LIBS $SOCKET_LIB $INET_LIB"
207N/A AC_CHECK_FUNCS([inet_ntop getaddrinfo])
207N/A+LIBS="$save_LIBS"
207N/A
207N/A AC_CHECK_TYPES([socklen_t], [], [], [[#include <sys/socket.h>]])
207N/A
207N/A--
207N/A1.7.3.2
207N/A
207N/A