# HG changeset patch
# User john.levon@xxxxxxx
# Date 1231444798 28800
# Node ID bf47245a1fecebe59ef30371a4465d713d37af06
# Parent b0dbefc87cb8b0194ad2bd518c2e8261b6bb0a6c
Fix Solaris compile after gnulib refresh
As documented in NEWS, we now need to explicitly specify usage of
libsocket.
Signed-off-by: John Levon <john.levon@xxxxxxx>
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -79,9 +79,9 @@ AC_CHECK_HEADERS([pwd.h paths.h regex.h
dnl Where are the XDR functions?
dnl If portablexdr is installed, prefer that.
-dnl Otherwise try -lrpc (Cygwin) -lxdr (some MinGW) or none (most Unix)
+dnl Otherwise try -lrpc (Cygwin) -lxdr (some MinGW), nsl (Solaris) or none (most Unix)
AC_CHECK_LIB([portablexdr],[xdrmem_create],[],[
- AC_SEARCH_LIBS([xdrmem_create],[rpc xdr])
+ AC_SEARCH_LIBS([xdrmem_create],[rpc xdr nsl])
])
AC_CHECK_LIB([intl],[gettext],[])
diff --git a/qemud/Makefile.am b/qemud/Makefile.am
--- a/qemud/Makefile.am
+++ b/qemud/Makefile.am
@@ -248,7 +248,7 @@ endif # DBUS_INIT_SCRIPTS_RED_HAT
# This must be added last, since functions it provides/replaces
# are used by nearly every other library.
-libvirtd_LDADD += ../gnulib/lib/libgnu.la
+libvirtd_LDADD += ../gnulib/lib/libgnu.la $(LIBSOCKET)
endif # WITH_LIBVIRTD
diff --git a/tests/Makefile.am b/tests/Makefile.am
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -33,6 +33,7 @@ LDADDS = \
$(WARN_CFLAGS) \
../src/libvirt_test.la \
../gnulib/lib/libgnu.la \
+ $(LIBSOCKET) \
$(COVERAGE_LDFLAGS)
EXTRA_DIST = \
--
Libvir-list mailing list
Libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list