mirror of
https://github.com/libguestfs/libguestfs.git
synced 2026-03-22 07:03:38 +00:00
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 <olaf@aepfle.de>
This commit is contained in:
committed by
Richard W.M. Jones
parent
684efb3706
commit
044c5b26d7
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user