From 0caa2baedad037bcec1f468c4a35f210c6a1e7fc Mon Sep 17 00:00:00 2001 From: Joshua Kinard Date: Fri, 5 Feb 2016 08:35:37 +1100 Subject: [PATCH] configure: remove aio.h check MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Remove the configure check for aio.h, which is not provided by uClibc, and which does not appear to be used by xfsprogs. Refer to Gentoo Bug #477758: https://bugs.gentoo.org/show_bug.cgi?id=477758 Signed-off-by: Joshua Kinard Reported-by: El Goretto Suggested-by: René Rhéaume Reviewed-by: Christoph Hellwig Signed-off-by: Dave Chinner --- configure.ac | 6 +++--- m4/Makefile | 1 - m4/package_aiodev.m4 | 36 ------------------------------------ 3 files changed, 3 insertions(+), 40 deletions(-) diff --git a/configure.ac b/configure.ac index feee50a0e..b96a81d20 100644 --- a/configure.ac +++ b/configure.ac @@ -56,6 +56,9 @@ AC_ARG_ENABLE(lib64, enable_lib64=yes) AC_SUBST(enable_lib64) +librt="-lrt" +AC_SUBST(librt) + # # If the user specified a libdir ending in lib64 do not append another # 64 to the library names. @@ -101,9 +104,6 @@ AC_PACKAGE_GLOBALS(xfsprogs) AC_PACKAGE_UTILITIES(xfsprogs) AC_MULTILIB($enable_lib64) -AC_PACKAGE_NEED_AIO_H -AC_PACKAGE_NEED_LIO_LISTIO - AC_PACKAGE_NEED_UUID_H AC_PACKAGE_NEED_UUIDCOMPARE diff --git a/m4/Makefile b/m4/Makefile index 654a4fb8c..d282f0afc 100644 --- a/m4/Makefile +++ b/m4/Makefile @@ -14,7 +14,6 @@ CONFIGURE = \ LSRCFILES = \ manual_format.m4 \ - package_aiodev.m4 \ package_blkid.m4 \ package_globals.m4 \ package_libcdev.m4 \ diff --git a/m4/package_aiodev.m4 b/m4/package_aiodev.m4 index 5510d1538..e69de29bb 100644 --- a/m4/package_aiodev.m4 +++ b/m4/package_aiodev.m4 @@ -1,36 +0,0 @@ -# -# Check if we have a libaio.h installed -# -AC_DEFUN([AC_PACKAGE_WANT_AIO], - [ AC_CHECK_HEADERS(libaio.h, [ have_aio=true ], [ have_aio=false ]) - AC_SUBST(have_aio) - ]) - -# -# Check if we have an aio.h installed -# -AC_DEFUN([AC_PACKAGE_NEED_AIO_H], - [ AC_CHECK_HEADERS(aio.h) - if test $ac_cv_header_aio_h = no; then - echo - echo 'FATAL ERROR: could not find a valid header.' - exit 1 - fi - ]) - -# -# Check if we have the lio_listio routine in either libc/librt -# -AC_DEFUN([AC_PACKAGE_NEED_LIO_LISTIO], - [ AC_CHECK_FUNCS(lio_listio) - if test $ac_cv_func_lio_listio = yes; then - librt="" - else - AC_CHECK_LIB(rt, lio_listio,, [ - echo - echo 'FATAL ERROR: could not find a library with lio_listio.' - exit 1],[-lpthread]) - librt="-lrt" - fi - AC_SUBST(librt) - ]) -- 2.39.5