[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen master] configure: make the libaio test conditional on blktap{1, 2}
commit 5a88f7033e354314a5935c583aabd2ffbd4504a2 Author: Roger Pau Monne <roger.pau@xxxxxxxxxx> AuthorDate: Thu Jun 19 18:32:45 2014 +0200 Commit: Ian Campbell <ian.campbell@xxxxxxxxxx> CommitDate: Fri Jun 27 14:13:23 2014 +0100 configure: make the libaio test conditional on blktap{1, 2} libaio is only required for blktap{1,2}, so make the check conditional on whether the user has requested blktap{1,2} or not. Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx> Cc: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx> Cc: Ian Campbell <ian.campbell@xxxxxxxxxx> Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx> [ ijc -- reran autogen.sh ] --- tools/configure | 4 ++++ tools/configure.ac | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/configure b/tools/configure index d84d950..eebe745 100755 --- a/tools/configure +++ b/tools/configure @@ -7535,6 +7535,8 @@ fi +if test "x$enable_blktap1" = "xyes" || test "x$enable_blktap2" = "xyes"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for io_setup in -laio" >&5 $as_echo_n "checking for io_setup in -laio... " >&6; } if ${ac_cv_lib_aio_io_setup+:} false; then : @@ -7583,6 +7585,8 @@ else fi +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MD5 in -lcrypto" >&5 $as_echo_n "checking for MD5 in -lcrypto... " >&6; } if ${ac_cv_lib_crypto_MD5+:} false; then : diff --git a/tools/configure.ac b/tools/configure.ac index 836bbba..6d70f04 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -262,7 +262,9 @@ AC_CHECK_HEADER([lzo/lzo1x.h], [ AC_CHECK_LIB([lzo2], [lzo1x_decompress], [zlib="$zlib -DHAVE_LZO1X -llzo2"]) ]) AC_SUBST(zlib) +AS_IF([test "x$enable_blktap1" = "xyes" || test "x$enable_blktap2" = "xyes"], [ AC_CHECK_LIB([aio], [io_setup], [], [AC_MSG_ERROR([Could not find libaio])]) +]) AC_SUBST(system_aio) AC_CHECK_LIB([crypto], [MD5], [], [AC_MSG_ERROR([Could not find libcrypto])]) AX_CHECK_EXTFS -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxx http://lists.xensource.com/xen-changelog
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |