| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | xfsprogs: drop configure check for aio |
| 2 | |
| 3 | It's unused and breaks compilation with uclibc. |
| 4 | |
| 5 | Upstream-Status: Pending |
| 6 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 7 | --- |
| 8 | configure.ac | 6 +++--- |
| 9 | m4/Makefile | 1 - |
| 10 | m4/package_aiodev.m4 | 36 ------------------------------------ |
| 11 | 3 files changed, 3 insertions(+), 40 deletions(-) |
| 12 | |
| 13 | diff --git a/configure.ac b/configure.ac |
| 14 | index b968977..4e2a263 100644 |
| 15 | --- a/configure.ac |
| 16 | +++ b/configure.ac |
| 17 | @@ -47,6 +47,9 @@ AC_ARG_ENABLE(lib64, |
| 18 | enable_lib64=yes) |
| 19 | AC_SUBST(enable_lib64) |
| 20 | |
| 21 | +librt="-lrt" |
| 22 | +AC_SUBST(librt) |
| 23 | + |
| 24 | # |
| 25 | # If the user specified a libdir ending in lib64 do not append another |
| 26 | # 64 to the library names. |
| 27 | @@ -92,9 +95,6 @@ AC_PACKAGE_GLOBALS(xfsprogs) |
| 28 | AC_PACKAGE_UTILITIES(xfsprogs) |
| 29 | AC_MULTILIB($enable_lib64) |
| 30 | |
| 31 | -AC_PACKAGE_NEED_AIO_H |
| 32 | -AC_PACKAGE_NEED_LIO_LISTIO |
| 33 | - |
| 34 | AC_PACKAGE_NEED_UUID_H |
| 35 | AC_PACKAGE_NEED_UUIDCOMPARE |
| 36 | |
| 37 | diff --git a/m4/Makefile b/m4/Makefile |
| 38 | index 654a4fb..d282f0a 100644 |
| 39 | --- a/m4/Makefile |
| 40 | +++ b/m4/Makefile |
| 41 | @@ -14,7 +14,6 @@ CONFIGURE = \ |
| 42 | |
| 43 | LSRCFILES = \ |
| 44 | manual_format.m4 \ |
| 45 | - package_aiodev.m4 \ |
| 46 | package_blkid.m4 \ |
| 47 | package_globals.m4 \ |
| 48 | package_libcdev.m4 \ |
| 49 | diff --git a/m4/package_aiodev.m4 b/m4/package_aiodev.m4 |
| 50 | index 490d9c8..8b13789 100644 |
| 51 | --- a/m4/package_aiodev.m4 |
| 52 | +++ b/m4/package_aiodev.m4 |
| 53 | @@ -1,37 +1 @@ |
| 54 | -# |
| 55 | -# Check if we have a libaio.h installed |
| 56 | -# |
| 57 | -AC_DEFUN([AC_PACKAGE_WANT_AIO], |
| 58 | - [ AC_CHECK_HEADERS(libaio.h, [ have_aio=true ], [ have_aio=false ]) |
| 59 | - AC_SUBST(have_aio) |
| 60 | - ]) |
| 61 | - |
| 62 | -# |
| 63 | -# Check if we have an aio.h installed |
| 64 | -# |
| 65 | -AC_DEFUN([AC_PACKAGE_NEED_AIO_H], |
| 66 | - [ AC_CHECK_HEADERS(aio.h) |
| 67 | - if test $ac_cv_header_aio_h = no; then |
| 68 | - echo |
| 69 | - echo 'FATAL ERROR: could not find a valid <aio.h> header.' |
| 70 | - exit 1 |
| 71 | - fi |
| 72 | - ]) |
| 73 | - |
| 74 | -# |
| 75 | -# Check if we have the lio_listio routine in either libc/librt |
| 76 | -# |
| 77 | -AC_DEFUN([AC_PACKAGE_NEED_LIO_LISTIO], |
| 78 | - [ AC_CHECK_FUNCS(lio_listio) |
| 79 | - if test $ac_cv_func_lio_listio = yes; then |
| 80 | - librt="" |
| 81 | - else |
| 82 | - AC_CHECK_LIB(rt, lio_listio,, [ |
| 83 | - echo |
| 84 | - echo 'FATAL ERROR: could not find a library with lio_listio.' |
| 85 | - exit 1],[-lpthread]) |
| 86 | - librt="-lrt" |
| 87 | - fi |
| 88 | - AC_SUBST(librt) |
| 89 | - ]) |
| 90 | |
| 91 | -- |
| 92 | 1.8.1.2 |
| 93 | |