From: Fabian Groffen <grobian@gentoo.org>
Date: Mon, 17 Jan 2011 20:14:54 +0000 (+0100)
Subject: build-sys: link with socketlibs when necessary
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60cc9f9404dde852cc00fa05ff03108ac6ec31d8;p=util-linux

build-sys: link with socketlibs when necessary

To link an object which references socket functions, you need to link
with -lsocket -lnsl on Solaris.

Signed-off-by: Fabian Groffen <grobian@gentoo.org>
---

diff --git a/configure.ac b/configure.ac
index 5b491f8e..c38cca43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -211,6 +211,17 @@ AC_CHECK_MEMBER(struct sockaddr.sa_len,
 	[#include <sys/types.h>
 	 #include <sys/socket.h>])
 
+SOCKET_LIBS=
+AC_SEARCH_LIBS([gethostbyname], [nsl],
+	[if test x"$ac_cv_search_gethostbyname" != x"none required"; then
+		SOCKET_LIBS="$SOCKET_LIBS -lnsl";
+	 fi])
+AC_SEARCH_LIBS([socket], [socket],
+	[if test x"$ac_cv_search_socket" != x"none required"; then
+		SOCKET_LIBS="$SOCKET_LIBS -lsocket";
+	fi])
+AC_SUBST([SOCKET_LIBS])
+
 dnl Static compilation
 m4_define([UTIL_STATIC_PROGRAMS], [losetup, mount, umount, fdisk, sfdisk, blkid])
 
diff --git a/shlibs/uuid/src/Makefile.am b/shlibs/uuid/src/Makefile.am
index 9af1979e..31cb9a2e 100644
--- a/shlibs/uuid/src/Makefile.am
+++ b/shlibs/uuid/src/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/config/include-Makefile.am
 AM_CPPFLAGS += -I$(ul_libuuid_srcdir)
 
 noinst_PROGRAMS = tst_uuid
-tst_uuid_LDADD = libuuid.la #$(ul_libuuid_la)
+tst_uuid_LDADD = libuuid.la $(SOCKET_LIBS) #$(ul_libuuid_la)
 
 # includes
 uuidincdir = $(includedir)/uuid
@@ -16,6 +16,8 @@ libuuid_la_SOURCES = clear.c compare.c copy.c gen_uuid.c \
 
 libuuid_la_DEPENDENCIES = uuid.sym
 
+libuuid_la_LIBADD = $(SOCKET_LIBS)
+
 libuuid_la_LDFLAGS = -Wl,--version-script=$(ul_libuuid_srcdir)/uuid.sym \
                      -version-info $(LIBUUID_VERSION_INFO)