Skip to content

Commit b7b7f7b

Browse files
author
Sunil Mushran
committed
configure: Detect libaio
Detect presence of libaio and fail if the lib/header is not found. Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
1 parent db4aef6 commit b7b7f7b

File tree

15 files changed

+39
-29
lines changed

15 files changed

+39
-29
lines changed

‎Config.make.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ VENDOR = @VENDOR@
5656
COM_ERR_CFLAGS = @COM_ERR_CFLAGS@
5757
COM_ERR_LIBS = @COM_ERR_LIBS@
5858
UUID_LIBS = @UUID_LIBS@
59+
AIO_LIBS = @AIO_LIBS@
5960
READLINE_LIBS = @READLINE_LIBS@
6061
NCURSES_LIBS = @NCURSES_LIBS@
6162

‎configure.in

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,15 @@ AC_CHECK_HEADER(uuid/uuid.h, :,
114114
AC_MSG_ERROR([Unable to find uuid headers]))
115115
AC_SUBST(UUID_LIBS)
116116

117+
AIO_LIBS=
118+
AC_CHECK_LIB(aio, io_setup, AIO_LIBS=-laio)
119+
if test "x$AIO_LIBS" = "x"; then
120+
AC_MSG_ERROR([Unable to find libaio library])
121+
fi
122+
AC_CHECK_HEADER(libaio.h, :,
123+
AC_MSG_ERROR([Unable to find /usr/include/libaio.h]))
124+
AC_SUBST(AIO_LIBS)
125+
117126
NCURSES_LIBS=
118127
AC_CHECK_LIB(ncurses, tgetstr, NCURSES_LIBS=-lncurses)
119128
if test "x$NCURSES_LIBS" = "x"; then

‎debugfs.ocfs2/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ HFILES = \
3131

3232
OBJS = $(subst .c,.o,$(CFILES))
3333

34-
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2 -laio
34+
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
3535
LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb
3636

3737
MANS = debugfs.ocfs2.8
@@ -44,6 +44,6 @@ dist-subdircreate:
4444
$(TOPDIR)/mkinstalldirs $(DIST_DIR)/include
4545

4646
debugfs.ocfs2: $(OBJS)
47-
$(LINK) $(GLIB_LIBS) $(LIBOCFS2_LIBS) $(LIBO2CB_LIBS) $(COM_ERR_LIBS) $(READLINE_LIBS) $(NCURSES_LIBS)
47+
$(LINK) $(GLIB_LIBS) $(LIBOCFS2_LIBS) $(LIBO2CB_LIBS) $(COM_ERR_LIBS) $(READLINE_LIBS) $(NCURSES_LIBS) $(AIO_LIBS)
4848

4949
include $(TOPDIR)/Postamble.make

‎extras/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ CHECK_METAECC_OBJS = $(subst .c,.o,$(CHECK_METAECC_CFILES))
3333
RESIZE_SLOTMAP_OBJS = $(subst .c,.o,$(RESIZE_SLOTMAP_CFILES))
3434

3535
LIBOCFS2 = ../libocfs2/libocfs2.a
36-
EXTRAS_LIBS = $(LIBOCFS2) $(COM_ERR_LIBS) -laio
36+
EXTRAS_LIBS = $(LIBOCFS2) $(COM_ERR_LIBS) $(AIO_LIBS)
3737

3838
find_hardlinks: $(FIND_HARDLINKS_OBJS) $(LIBOCFS2)
3939
$(LINK) $(EXTRAS_LIBS)

‎fsck.ocfs2/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ SBIN_PROGRAMS = fsck.ocfs2
88
DEFINES += -DVERSION=\"$(VERSION)\"
99

1010
INCLUDES = -I$(TOPDIR)/include -Iinclude
11-
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2 -laio
11+
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
1212
LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
1313
LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm $(DL_LIBS)
1414
LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a
@@ -72,7 +72,7 @@ dist-subdircreate:
7272
$(TOPDIR)/mkinstalldirs $(DIST_DIR)/include
7373

7474
fsck.ocfs2: $(OBJS) $(LIBOCFS2_DEPS) $(LIBO2DLM_DEPS) $(LIBO2CB_DEPS) $(LIBTOOLS_INTERNAL_DEPS)
75-
$(LINK) $(LIBOCFS2_LIBS) $(LIBO2DLM_LIBS) $(LIBO2CB_LIBS) $(LIBTOOLS_INTERNAL_LIBS) $(COM_ERR_LIBS)
75+
$(LINK) $(LIBOCFS2_LIBS) $(LIBO2DLM_LIBS) $(LIBO2CB_LIBS) $(LIBTOOLS_INTERNAL_LIBS) $(COM_ERR_LIBS) $(AIO_LIBS)
7676

7777
$(OBJS): prompt-codes.h
7878

‎fswreck/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ DIST_RULES = dist-subdircreate
3535

3636
OBJS = $(subst .c,.o,$(CFILES))
3737

38-
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2 -laio
38+
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
3939
LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
4040

4141
LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm $(DL_LIBS)
@@ -48,6 +48,6 @@ dist-subdircreate:
4848
$(TOPDIR)/mkinstalldirs $(DIST_DIR)/include
4949

5050
fswreck: $(OBJS) $(LIBOCFS2_DEPS) $(LIBO2DLM_DEPS) $(LIBO2CB_DEPS)
51-
$(LINK) $(LIBOCFS2_LIBS) $(LIBO2DLM_LIBS) $(LIBO2CB_LIBS) $(GLIB_LIBS) $(COM_ERR_LIBS)
51+
$(LINK) $(LIBOCFS2_LIBS) $(LIBO2DLM_LIBS) $(LIBO2CB_LIBS) $(GLIB_LIBS) $(COM_ERR_LIBS) $(AIO_LIBS)
5252

5353
include $(TOPDIR)/Postamble.make

‎listuuid/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ include $(TOPDIR)/Preamble.make
44

55
INCLUDES = -I$(TOPDIR)/include
66

7-
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2 -laio
7+
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
88
LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
99

1010
LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm $(DL_LIBS)
@@ -22,6 +22,6 @@ OBJS = $(subst .c,.o,$(CFILES))
2222
DIST_FILES = $(CFILES)
2323

2424
listuuid: $(OBJS) $(LIBOCFS2_DEPS) $(LIBO2DLM_DEPS) $(LIBO2CB_DEPS)
25-
$(LINK) $(LIBOCFS2_LIBS) $(LIBO2DLM_LIBS) $(COM_ERR_LIBS) $(UUID_LIBS)
25+
$(LINK) $(LIBOCFS2_LIBS) $(LIBO2DLM_LIBS) $(COM_ERR_LIBS) $(UUID_LIBS) $(AIO_LIBS)
2626

2727
include $(TOPDIR)/Postamble.make

‎mkfs.ocfs2/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ include $(TOPDIR)/Preamble.make
55
sbindir = $(root_sbindir)
66
SBIN_PROGRAMS = mkfs.ocfs2
77

8-
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2 -laio
8+
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
99
LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
1010

1111
LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb
@@ -27,6 +27,6 @@ MANS = mkfs.ocfs2.8
2727
DIST_FILES = $(CFILES) $(HFILES) mkfs.ocfs2.8.in
2828

2929
mkfs.ocfs2: $(OBJS) $(LIBOCFS2_DEPS) $(LIBO2DLM_DEPS) $(LIBO2CB_DEPS)
30-
$(LINK) $(LIBOCFS2_LIBS) $(LIBO2DLM_LIBS) $(LIBO2CB_LIBS) $(COM_ERR_LIBS) $(UUID_LIBS)
30+
$(LINK) $(LIBOCFS2_LIBS) $(LIBO2DLM_LIBS) $(LIBO2CB_LIBS) $(COM_ERR_LIBS) $(UUID_LIBS) $(AIO_LIBS)
3131

3232
include $(TOPDIR)/Postamble.make

‎mount.ocfs2/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ sbindir = $(root_sbindir)
66
SBIN_PROGRAMS = mount.ocfs2
77

88
INCLUDES = -I$(TOPDIR)/include
9-
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2 -laio
9+
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
1010
LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
1111
LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm $(DL_LIBS)
1212
LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a
@@ -28,6 +28,6 @@ DIST_FILES = $(CORE_CFILES) $(MOUNT_CFILES) \
2828
$(HFILES) $(addsuffix .in,$(MANS))
2929

3030
mount.ocfs2: $(MOUNT_OBJS) $(LIBOCFS2_DEPS) $(LIBO2DLM_DEPS) $(LIBO2CB_DEPS)
31-
$(LINK) $(LIBOCFS2_LIBS) $(LIBO2DLM_LIBS) $(LIBO2CB_LIBS) $(COM_ERR_LIBS)
31+
$(LINK) $(LIBOCFS2_LIBS) $(LIBO2DLM_LIBS) $(LIBO2CB_LIBS) $(COM_ERR_LIBS) $(AIO_LIBS)
3232

3333
include $(TOPDIR)/Postamble.make

‎mounted.ocfs2/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ TOPDIR = ..
22

33
include $(TOPDIR)/Preamble.make
44

5-
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2 -laio
5+
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
66
LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
77

88
LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm $(DL_LIBS)
@@ -27,6 +27,6 @@ MANS = mounted.ocfs2.8
2727
DIST_FILES = $(CFILES) mounted.ocfs2.8.in
2828

2929
mounted.ocfs2: $(OBJS) $(LIBOCFS2_DEPS) $(LIBO2DLM_DEPS) $(LIBO2CB_DEPS) ${LIBTOOLS_INTERNAL_DEPS}
30-
$(LINK) $(LIBOCFS2_LIBS) $(LIBO2DLM_LIBS) $(LIBO2CB_LIBS) ${LIBTOOLS_INTERNAL_DEPS} $(COM_ERR_LIBS) $(UUID_LIBS)
30+
$(LINK) $(LIBOCFS2_LIBS) $(LIBO2DLM_LIBS) $(LIBO2CB_LIBS) ${LIBTOOLS_INTERNAL_DEPS} $(COM_ERR_LIBS) $(UUID_LIBS) $(AIO_LIBS)
3131

3232
include $(TOPDIR)/Postamble.make

0 commit comments

Comments
 (0)