diff options
| author | David Teigland <teigland@redhat.com> | 2017-08-16 14:44:36 -0500 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2017-10-18 14:09:12 -0500 |
| commit | 2fdedafa318cf066458c9d690b674577d7481b2f (patch) | |
| tree | f4e09fec4ce9a17f4041eef1a47eefab0eec3c6a | |
| parent | 086e6349239769dd3be2640295e9ba16c79c6120 (diff) | |
| download | lvm2-2fdedafa318cf066458c9d690b674577d7481b2f.tar.gz | |
configure: improve libaio check
| -rw-r--r-- | configure.in | 8 | ||||
| -rw-r--r-- | daemons/clvmd/Makefile.in | 2 | ||||
| -rw-r--r-- | liblvm/Makefile.in | 2 | ||||
| -rw-r--r-- | make.tmpl.in | 1 | ||||
| -rw-r--r-- | scripts/Makefile.in | 2 | ||||
| -rw-r--r-- | tools/Makefile.in | 2 |
6 files changed, 12 insertions, 5 deletions
diff --git a/configure.in b/configure.in index a673ced29..eb182fa74 100644 --- a/configure.in +++ b/configure.in @@ -1127,7 +1127,12 @@ AC_ARG_ENABLE(aio, AC_MSG_RESULT($AIO) if test "$AIO" = yes; then - AC_DEFINE([AIO_SUPPORT], 1, [Define to 1 to enable async i/o.]) + AC_CHECK_LIB(aio, io_setup, + [AC_DEFINE([AIO_SUPPORT], 1, [Define to 1 if aio is available.]) + AIO_LIBS="-laio" + AIO_SUPPORT=yes], + [AIO_LIBS= + AIO_SUPPORT=no ]) fi ################################################################################ @@ -2075,6 +2080,7 @@ AC_SUBST(AIO) AC_SUBST(DLM_CFLAGS) AC_SUBST(DLM_LIBS) AC_SUBST(DL_LIBS) +AC_SUBST(AIO_LIBS) AC_SUBST(DMEVENTD_PATH) AC_SUBST(DM_LIB_PATCHLEVEL) AC_SUBST(ELDFLAGS) diff --git a/daemons/clvmd/Makefile.in b/daemons/clvmd/Makefile.in index c8513c4a6..397592115 100644 --- a/daemons/clvmd/Makefile.in +++ b/daemons/clvmd/Makefile.in @@ -78,7 +78,7 @@ LIBS += $(LVMINTERNAL_LIBS) -ldevmapper $(PTHREAD_LIBS) CFLAGS += -fno-strict-aliasing $(EXTRA_EXEC_CFLAGS) ifeq ("@AIO@", "yes") - LIBS += -laio + LIBS += $(AIO_LIBS) endif INSTALL_TARGETS = \ diff --git a/liblvm/Makefile.in b/liblvm/Makefile.in index a9afb4d8d..1d1498bbc 100644 --- a/liblvm/Makefile.in +++ b/liblvm/Makefile.in @@ -46,7 +46,7 @@ LDFLAGS += -L$(top_builddir)/lib -L$(top_builddir)/daemons/dmeventd LIBS += $(LVMINTERNAL_LIBS) -ldevmapper ifeq ("@AIO@", "yes") - LIBS += -laio + LIBS += $(AIO_LIBS) endif .PHONY: install_dynamic install_static install_include install_pkgconfig diff --git a/make.tmpl.in b/make.tmpl.in index 65362d87c..1040b6358 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -64,6 +64,7 @@ LDDEPS += @LDDEPS@ LIB_SUFFIX = @LIB_SUFFIX@ LVMINTERNAL_LIBS = -llvm-internal $(DMEVENT_LIBS) $(DAEMON_LIBS) $(SYSTEMD_LIBS) $(UDEV_LIBS) $(DL_LIBS) $(BLKID_LIBS) DL_LIBS = @DL_LIBS@ +AIO_LIBS = @AIO_LIBS@ RT_LIBS = @RT_LIBS@ M_LIBS = @M_LIBS@ PTHREAD_LIBS = @PTHREAD_LIBS@ diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 2472f1c57..767b89bca 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -32,7 +32,7 @@ endif endif ifeq ("@AIO@", "yes") - LVMLIBS += -laio + LVMLIBS += $(AIO_LIBS) endif LVM_SCRIPTS = lvmdump.sh lvmconf.sh diff --git a/tools/Makefile.in b/tools/Makefile.in index 42c18413e..adf9294e0 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -110,7 +110,7 @@ ifeq ("@CMDLIB@", "yes") endif ifeq ("@AIO@", "yes") - LVMLIBS += -laio + LVMLIBS += $(AIO_LIBS) endif EXPORTED_HEADER = $(srcdir)/lvm2cmd.h |