Fixups after gnulib refresh

diff --git a/ChangeLog b/ChangeLog
index f6c2653cf07384c0c0f1db48d04c26d4d8cd04f2..5f6dad2324b682c5e645e36fb3f9f70ea0a50d22 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Jan  8 20:28:06 GMT 2009  John Levon  <levon@movementarian.org>
+
+       Fixups after gnulib refresh
+       * configure.in: search -lnsl for xdr functions
+       * qemud/Makefile.am: link in $(LIBSOCKET)
+       * tests/Makefile.am: link in $(LIBSOCKET)
+
 Thu Jan  8 20:47:26 CET 2009 Guido Günther <agx@sigxcpu.org>
 
        add missing flags argument

diff --git a/configure.in b/configure.in
index c333cc437ff505a22f352d69054bb34fd5213439..8e24fd5071c270663d97bb37f9c639a6c2d3aa76 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -79,9 +79,10 @@ AC_CHECK_HEADERS([pwd.h paths.h regex.h sys/syslimits.h sys/utsname.h sys/wait.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), -lnsl (Solaris)
+dnl 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
index 8983416c08d5a8f0caeeaf091c80b0bb60dfb59b..793535f1be30e0a7ca56405f966ae2cac4a313a4 100644 (file)
--- a/qemud/Makefile.am
+++ b/qemud/Makefile.am
@@ -250,7 +250,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
index d8b5e44fef132d544fbf51cf96fb23a839d846bd..0486ee38b7e22011aaa9a3f42819044f2dc0fb68 100644 (file)
--- 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 =           \