From 12b6851d54553be5087a042471b9853eed9e30cd Mon Sep 17 00:00:00 2001 From: John Levon Date: Thu, 8 Jan 2009 20:42:01 +0000 Subject: [PATCH] Fixups after gnulib refresh --- ChangeLog | 7 +++++++ configure.in | 5 +++-- qemud/Makefile.am | 2 +- tests/Makefile.am | 1 + 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index f6c2653cf0..5f6dad2324 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu Jan 8 20:28:06 GMT 2009 John Levon + + 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 add missing flags argument diff --git a/configure.in b/configure.in index c333cc437f..8e24fd5071 100644 --- 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 8983416c08..793535f1be 100644 --- 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 d8b5e44fef..0486ee38b7 100644 --- 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 = \