Merge branch 'master' of git://github.com/ezrapedersen/fio
authorJens Axboe <axboe@fb.com>
Thu, 7 Jan 2016 22:01:09 +0000 (15:01 -0700)
committerJens Axboe <axboe@fb.com>
Thu, 7 Jan 2016 22:01:09 +0000 (15:01 -0700)
configure

index 5176682..cbd4d30 100755 (executable)
--- a/configure
+++ b/configure
@@ -489,7 +489,8 @@ echo "zlib                          $zlib"
 ##########################################
 # linux-aio probe
 libaio="no"
-cat > $TMPC <<EOF
+if test "$esx" != "yes" ; then
+  cat > $TMPC <<EOF
 #include <libaio.h>
 #include <stddef.h>
 int main(void)
@@ -498,14 +499,15 @@ int main(void)
   return 0;
 }
 EOF
-if compile_prog "" "-laio" "libaio" ; then
-  libaio=yes
-  LIBS="-laio $LIBS"
-else
-  if test "$libaio" = "yes" ; then
-    feature_not_found "linux AIO" "libaio-dev or libaio-devel"
+  if compile_prog "" "-laio" "libaio" ; then
+    libaio=yes
+    LIBS="-laio $LIBS"
+  else
+    if test "$libaio" = "yes" ; then
+      feature_not_found "linux AIO" "libaio-dev or libaio-devel"
+    fi
+    libaio=no
   fi
-  libaio=no
 fi
 echo "Linux AIO support             $libaio"