From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Mon, 10 May 2010 18:16:59 +0000 (+0200)
Subject: librt depends on libpthread. libxfs needs librt
X-Git-Tag: v3.1.3~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=717e6142b509aa871f9a20b3273120e4fefad85d;p=thirdparty%2Fxfsprogs-dev.git

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 2c5b51c82..93d1e673d 100644
--- 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 8f80cdc0f..5088b5513 100644
--- 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 5620a04c1..490d9c82a 100644
--- 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)