From 044c5b26d7ed1bde70cbeacb0ffa3f8bcb932092 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 29 Aug 2012 15:15:12 +0200 Subject: [PATCH] remove ulockmgr from fuse LDFLAGS libguestfs fails to build with --enable-fuse on openSuSE 11.4 and earlier because the included fuse version does not include libulockmgr.so. configure already used pkgconfig to retrieve the correct CFLAGS, so there is no need to hardcode -lulockmgr. With this change the build succeeds again. Signed-off-by: Olaf Hering --- examples/Makefile.am | 2 +- fuse/Makefile.am | 2 +- src/Makefile.am | 2 +- tests/mount-local/Makefile.am | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/Makefile.am b/examples/Makefile.am index 35bf76540..4bfa85dd2 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -86,7 +86,7 @@ mount_local_CFLAGS = \ $(FUSE_CFLAGS) \ $(WARN_CFLAGS) $(WERROR_CFLAGS) mount_local_LDADD = \ - $(FUSE_LIBS) -lulockmgr \ + $(FUSE_LIBS) \ $(top_builddir)/src/libguestfs.la endif diff --git a/fuse/Makefile.am b/fuse/Makefile.am index 079755b64..129529872 100644 --- a/fuse/Makefile.am +++ b/fuse/Makefile.am @@ -51,7 +51,7 @@ guestmount_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) guestmount_LDADD = \ - $(FUSE_LIBS) -lulockmgr \ + $(FUSE_LIBS) \ $(LIBCONFIG_LIBS) \ $(top_builddir)/src/libguestfs.la \ ../gnulib/lib/libgnu.la diff --git a/src/Makefile.am b/src/Makefile.am index 4d8574750..97905bf9d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -177,7 +177,7 @@ libguestfs_la_CPPFLAGS = -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib if HAVE_FUSE # XXX Unfortunately FUSE_CFLAGS defines _FILE_OFFSET_BITS=64. libguestfs_la_CFLAGS += $(FUSE_CFLAGS) -libguestfs_la_LIBADD += $(FUSE_LIBS) -lulockmgr +libguestfs_la_LIBADD += $(FUSE_LIBS) endif if HAVE_RPCGEN diff --git a/tests/mount-local/Makefile.am b/tests/mount-local/Makefile.am index 384eb2def..d0c1cf85c 100644 --- a/tests/mount-local/Makefile.am +++ b/tests/mount-local/Makefile.am @@ -34,7 +34,7 @@ test_parallel_mount_local_CFLAGS = \ $(FUSE_CFLAGS) \ $(WARN_CFLAGS) $(WERROR_CFLAGS) test_parallel_mount_local_LDADD = \ - $(FUSE_LIBS) -lulockmgr \ + $(FUSE_LIBS) \ $(top_builddir)/src/libguestfs.la endif