diff --git a/ChangeLog b/ChangeLog
index eca88e4f..39611945 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-07  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Fixed configure error with --disable-epoll
+	* configure.ac
+	
 2009-02-07  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Fixed compile error when HAVE_EPOLL is not defined.
diff --git a/configure b/configure
index 010bfeab..a23bdb21 100755
--- a/configure
+++ b/configure
@@ -20981,7 +20981,8 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
   fi
-   if test "x$have_epoll" = "xyes"; then
+fi
+ if test "x$have_epoll" = "xyes"; then
   HAVE_EPOLL_TRUE=
   HAVE_EPOLL_FALSE='#'
 else
@@ -20989,7 +20990,6 @@ else
   HAVE_EPOLL_FALSE=
 fi
 
-fi
 
 
 for ac_func in asctime_r
diff --git a/configure.ac b/configure.ac
index eb9268ed..6f4ed2d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -289,8 +289,8 @@ if test "x$enable_epoll" = "xyes"; then
   if test "x$have_epoll" = "xyes"; then
     AC_DEFINE([HAVE_EPOLL], [1], [Define to 1 if epoll is available.])
   fi
-  AM_CONDITIONAL([HAVE_EPOLL], [test "x$have_epoll" = "xyes"])
 fi
+AM_CONDITIONAL([HAVE_EPOLL], [test "x$have_epoll" = "xyes"])
 
 AC_CHECK_FUNCS([asctime_r],
 	[AM_CONDITIONAL([HAVE_ASCTIME_R], true)],