1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
|
Upstream-Status: Pending
From a38bf800a655ea32cbddd6504e15c2f18597fd13 Mon Sep 17 00:00:00 2001
From: Andreas Oberritter <obi@opendreambox.org>
Date: Wed, 13 Mar 2013 14:40:13 +0100
Subject: [PATCH] xfsprogs: drop configure check for aio
It's unused and breaks compilation with uclibc.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
configure.in | 6 +++---
m4/Makefile | 1 -
m4/package_aiodev.m4 | 37 -------------------------------------
3 files changed, 3 insertions(+), 41 deletions(-)
delete mode 100644 m4/package_aiodev.m4
diff --git a/configure.in b/configure.in
index 664c0e9..f7d35f1 100644
--- a/configure.in
+++ b/configure.in
@@ -46,6 +46,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.
@@ -91,9 +94,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 654a4fb..d282f0a 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
deleted file mode 100644
index 490d9c8..0000000
--- a/m4/package_aiodev.m4
+++ /dev/null
@@ -1,37 +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 <aio.h> 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)
- ])
-
--
1.7.10.4
|
