librt depends on libpthread. libxfs needs librt

Fix linking of libxfs. Fix librt detection (needs pthread).

Signed-off-by: Arkadiusz Miśkiewicz <arekm@maven.pl>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/include/builddefs.in b/include/builddefs.in
index 2c5b51c8277ad828ecea95fa680c8ea5a8915bed..93d1e673d3c983f2a4a90737ca6ca705333b901f 100644 (file)
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -24,6 +24,7 @@ DEBUG = @debug_build@
 OPTIMIZER = @opt_build@
 MALLOCLIB = @malloc_lib@
 LOADERFLAGS = @LDFLAGS@
+LTLDFLAGS = @LDFLAGS@
 
 LIBRT = @librt@
 LIBUUID = @libuuid@

diff --git a/libxfs/Makefile b/libxfs/Makefile
index 8f80cdc0f9812c88e371801fb2ebad93d4f7d93b..5088b5513154fcfc88308271de63564d827828c7 100644 (file)
--- a/libxfs/Makefile
+++ b/libxfs/Makefile
@@ -33,6 +33,8 @@ LSRCFILES = $(shell echo $(PCFILES) | sed -e "s/$(PKG_PLATFORM).c//g")
 
 FCFLAGS = -I.
 
+LTLIBS = $(LIBPTHREAD) $(LIBRT)
+
 # don't try linking xfs_repair with a debug libxfs.
 DEBUG = -DNDEBUG
 

diff --git a/m4/package_aiodev.m4 b/m4/package_aiodev.m4
index 5620a04c19bcd5044ad7a416ae68380f20f2aa28..490d9c82a3fa1d0a81599ee84f32b941b4c52479 100644 (file)
--- a/m4/package_aiodev.m4
+++ b/m4/package_aiodev.m4
@@ -29,7 +29,7 @@ AC_DEFUN([AC_PACKAGE_NEED_LIO_LISTIO],
        AC_CHECK_LIB(rt, lio_listio,, [
            echo
            echo 'FATAL ERROR: could not find a library with lio_listio.'
-           exit 1])
+           exit 1],[-lpthread])
        librt="-lrt"
     fi
     AC_SUBST(librt)