* remove libuv option

Author: EdmondDantes

config.m4

@@ -3,10 +3,6 @@ PHP_ARG_ENABLE([async],
   [AS_HELP_STRING([--enable-async],
     [Enable True Async])])
 
-PHP_ARG_WITH([async_libuv],
-  [for True Async LibUV support],
-  [AS_HELP_STRING([--with-async-libuv],
-    [Build True Async with LibUv support])], yes)
 
 if test "$PHP_ASYNC" = "yes"; then
   dnl Define a symbol for C code.
@@ -24,10 +20,6 @@ if test "$PHP_ASYNC" = "yes"; then
   PHP_INSTALL_HEADERS([ext/async],
     [php_async.h coroutine.h scope.h scheduler.h exceptions.h iterator.h async_API.h context.h])
 
-  if test "$PHP_ASYNC_LIBUV" = "yes"; then
-    if test "$PHP_ASYNC" != "yes"; then
-      AC_MSG_ERROR([libuv requires True Async API. Use --enable-async.])
-    fi
 
     AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 
@@ -85,5 +77,4 @@ if test "$PHP_ASYNC" = "yes"; then
     dnl Add libuv-specific reactor code.
     PHP_ADD_SOURCES([ext/async], [libuv_reactor.c])
     PHP_INSTALL_HEADERS([ext/async], [libuv_reactor.h])
-  fi
 fi

config.w32

@@ -1,7 +1,6 @@
 // vim:ft=javascript
 
 ARG_ENABLE('async', 'Enable True Async', 'no');
-ARG_WITH('async_libuv', 'Build True Async with libuv support', 'yes');
 
 if (PHP_ASYNC == "yes") {
 
@@ -10,7 +9,7 @@ if (PHP_ASYNC == "yes") {
     }
 
     if (!PHP_ASYNC_API || PHP_ASYNC_API != "yes") {
-        ERROR("PHP TRUE ASYNC API is required. Please configure PHP with --enable-experimental-async-api.");
+        ERROR("PHP TRUE ASYNC API is required. Please configure PHP with --with-async-api.");
     }
 
     EXTENSION("async", "async.c coroutine.c scope.c scheduler.c exceptions.c iterator.c async_API.c");
@@ -27,25 +26,19 @@ if (PHP_ASYNC == "yes") {
     PHP_INSTALL_HEADERS("ext/async", "iterator.h");
     PHP_INSTALL_HEADERS("ext/async", "async_API.h");
     PHP_INSTALL_HEADERS("ext/async", "context.h");
-}
 
-if (PHP_ASYNC_LIBUV == "yes") {
-    if (PHP_ASYNC != "yes") {
-        ERROR("libuv requires True Async API to be enabled. Use --enable-async");
+    if (CHECK_HEADER_ADD_INCLUDE("libuv/uv.h", "CFLAGS_UV", PHP_PHP_BUILD + "\\include")
+        && CHECK_LIB("libuv.lib", "libuv")) {
+
+        PHP_INSTALL_HEADERS("ext/async", "libuv_reactor.h");
+
+        ADD_SOURCES("ext/async", "libuv_reactor.c");
+        ADD_FLAG("CFLAGS", "/D PHP_ASYNC_LIBUV");
+        ADD_FLAG("LIBS", "libuv.lib Dbghelp.lib Userenv.lib");
     } else {
-        if (CHECK_HEADER_ADD_INCLUDE("libuv/uv.h", "CFLAGS_UV", PHP_PHP_BUILD + "\\include")
-            && CHECK_LIB("libuv.lib", "libuv")) {
-
-            PHP_INSTALL_HEADERS("ext/async", "libuv_reactor.h");
-
-            ADD_SOURCES("ext/async", "libuv_reactor.c");
-            ADD_FLAG("CFLAGS", "/D PHP_ASYNC_LIBUV");
-            ADD_FLAG("LIBS", "libuv.lib Dbghelp.lib Userenv.lib");
-        } else {
-            ERROR("Libuv components are not found. The search was performed in the directory: '" + PHP_PHP_BUILD +
-                  "'.\nTo compile PHP TRUE ASYNC with LibUV:\n" +
-                  "1. Copy files from 'libuv\\include' to '" + PHP_PHP_BUILD + "\\include\\libuv\\'\n" +
-                  "2. Build libuv.lib and copy it to '" + PHP_PHP_BUILD + "\\lib\\'");
-        }
+        ERROR("Libuv components are not found. The search was performed in the directory: '" + PHP_PHP_BUILD +
+              "'.\nTo compile PHP TRUE ASYNC with LibUV:\n" +
+              "1. Copy files from 'libuv\\include' to '" + PHP_PHP_BUILD + "\\include\\libuv\\'\n" +
+              "2. Build libuv.lib and copy it to '" + PHP_PHP_BUILD + "\\lib\\'");
     }
 }