fixup! aio: Add asynchronous IO infrastructure.

Author: anarazel

.cirrus.yml

@@ -219,7 +219,7 @@ task:
       meson setup \
         --buildtype=debug \
         -Dcassert=true -Dssl=openssl -Duuid=bsd -Dtcl_version=tcl86 -Ddtrace=auto \
-        -Dposix_aio=true \
+        -Dposix_aio=enabled \
         -DPG_TEST_EXTRA="$PG_TEST_EXTRA" \
         -Dextra_lib_dirs=/usr/local/lib -Dextra_include_dirs=/usr/local/include/ \
         build
@@ -370,7 +370,7 @@ task:
             --buildtype=debug \
             -Dcassert=true \
             ${LINUX_MESON_FEATURES} \
-            -Dposix_aio=true \
+            -Dposix_aio=enabled \
             -DPG_TEST_EXTRA="$PG_TEST_EXTRA" \
             build
         EOF
@@ -546,7 +546,7 @@ task:
       -Dextra_lib_dirs=${brewpath}/lib \
       -Dcassert=true \
       -Dssl=openssl -Duuid=e2fs -Ddtrace=auto \
-      -Dposix_aio=true \
+      -Dposix_aio=enabled \
       -DPG_TEST_EXTRA="$PG_TEST_EXTRA" \
       build
 

meson.build

@@ -818,14 +818,16 @@ endif
 ###############################################################
 
 posix_aio_opt = get_option('posix_aio')
-posix_aio = cc.find_library('rt',
-  has_headers: 'aio.h',
-  header_include_directories: postgres_inc,
-  dirs: test_lib_d,
-  required: posix_aio_opt)
+posix_aio = not_found_dep
+if not posix_aio_opt.disabled()
+  rt_dep = cc.find_library('rt', required: false)
 
-if posix_aio.found()
-  cdata.set('USE_POSIX_AIO', 1)
+  if cc.has_header_symbol('aio.h', 'aio_read',
+      required: posix_aio_opt,
+      args: test_c_args, include_directories: postgres_inc)
+    posix_aio = declare_dependency()
+    cdata.set('USE_POSIX_AIO', 1)
+  endif
 endif