--- libaitsched/configure	2014/05/19 22:13:51	1.34.2.2
+++ libaitsched/configure	2014/05/19 23:14:08	1.34.2.5
@@ -708,9 +708,9 @@ ac_user_opts='
 enable_option_checking
 enable_debug
 enable_aio
+enable_epoll
 enable_kqueue
 with_kq_events
-enable_epoll
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1349,8 +1349,8 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-debug          Build library with debug information and additional messages
   --enable-aio            Build scheduler library with AIO operations
-  --disable-kqueue        Disable kqueue support
   --enable-epoll          Enable epoll support (only under Linux)
+  --disable-kqueue        Disable kqueue support
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -3178,7 +3178,7 @@ $as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_MKDEP" = x; then
-    MKDEP="no"
+    MKDEP="../mkdep"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
@@ -4714,7 +4714,54 @@ fi
 { $as_echo "$as_me:$LINENO: result: $AIO" >&5
 $as_echo "$AIO" >&6; }
 
-KQSUP=yes
+
+cat >>confdefs.h <<\_ACEOF
+#define NO_SUPPORT 0
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define KQ_SUPPORT 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define EP_SUPPORT 2
+_ACEOF
+
+
+
+cat >>confdefs.h <<\_ACEOF
+#define SUP_ENABLE KQ_SUPPORT
+_ACEOF
+
+
+EPSUP=no
+{ $as_echo "$as_me:$LINENO: checking epoll support" >&5
+$as_echo_n "checking epoll support... " >&6; }
+# Check whether --enable-epoll was given.
+if test "${enable_epoll+set}" = set; then
+  enableval=$enable_epoll;  EPSUP=$enableval
+		case "$enableval" in
+			yes)
+
+cat >>confdefs.h <<\_ACEOF
+#define SUP_ENABLE EP_SUPPORT
+_ACEOF
+
+				KQSUP=no
+				;;
+			*)
+				KQSUP=yes
+				;;
+	 	esac
+else
+   KQSUP=yes
+fi
+
+{ $as_echo "$as_me:$LINENO: result: $EPSUP" >&5
+$as_echo "$EPSUP" >&6; }
+
 { $as_echo "$as_me:$LINENO: checking kqueue support" >&5
 $as_echo_n "checking kqueue support... " >&6; }
 # Check whether --enable-kqueue was given.
@@ -4724,7 +4771,7 @@ if test "${enable_kqueue+set}" = set; then
 			no)
 
 cat >>confdefs.h <<\_ACEOF
-#define KQ_DISABLE /**/
+#define SUP_ENABLE NO_SUPPORT
 _ACEOF
 
 				;;
@@ -4754,28 +4801,6 @@ _ACEOF
 
 { $as_echo "$as_me:$LINENO: result: $KQ_EVENTS" >&5
 $as_echo "$KQ_EVENTS" >&6; }
-
-EPSUP=no
-{ $as_echo "$as_me:$LINENO: checking epoll support" >&5
-$as_echo_n "checking epoll support... " >&6; }
-# Check whether --enable-epoll was given.
-if test "${enable_epoll+set}" = set; then
-  enableval=$enable_epoll;  EPSUP=$enableval
-		case "$enableval" in
-			no)
-
-cat >>confdefs.h <<\_ACEOF
-#define EP_ENABLE /**/
-_ACEOF
-
-				;;
-			*)
-				;;
-	 	esac
-fi
-
-{ $as_echo "$as_me:$LINENO: result: $EPSUP" >&5
-$as_echo "$EPSUP" >&6; }
 
 ac_config_files="$ac_config_files Makefile inc/Makefile lib/Makefile src/Makefile"