diff --git a/configure.ac b/configure.ac
index 5235d5f..7d599f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -207,68 +207,76 @@ AC_SUBST(LIBEVENT_CFLAGS)
 AC_SUBST(LIBEVENT_LIBS)
 
 if test x${compile_python} = xyes; then
-   AM_PATH_PYTHON([2.6])
-
-   if test "$bwin32" = true; then
-       # set pyexecdir to somewhere like /c/Python26/Lib/site-packages
-       pyexecdir=${PYTHON_DIR}/Lib/site-packages
-       pythondir=${pyexecdir}
-       pkgpyexecdir=${pyexecdir}/${PACKAGE}
-       pkgpythondir=${pythondir}/${PACKAGE}
-
-   fi # end for bwin32
-
+    AM_PATH_PYTHON([2.6])
+    if test "$bwin32" = "true"; then
+        if test x$PYTHON_DIR != x; then
+            # set pyexecdir to somewhere like /c/Python26/Lib/site-packages
+            pyexecdir=${PYTHON_DIR}/Lib/site-packages
+            pythondir=${pyexecdir}
+            pkgpyexecdir=${pyexecdir}/${PACKAGE}
+            pkgpythondir=${pythondir}/${PACKAGE}
+        fi
+    fi
 fi
 
 mysql="yes"
-check_mysql_config() 
-{
+if test "$bwin32" != "true"; then
+    AC_MSG_CHECKING(for mysql in unix)
+    check_mysql_config()
+    {
         AC_PATH_PROG([MYSQLCONFIG], [mysql_config], [no], [$PATH:/usr/local/bin:/usr/local/mysql/bin])
-        if test "x$MYSQLCONFIG" = "xno" 
+        if test "x$MYSQLCONFIG" = "xno"
         then
-                AC_MSG_WARN([mysql_config is required to build seafile server with mysql])
-                mysql="no"
+            AC_MSG_WARN([mysql_config is required to build seafile server with mysql])
+            mysql="no"
         fi
-}
-AC_MSG_CHECKING(for mysql)
-AC_ARG_WITH([mysql], 
-        AS_HELP_STRING([--with-mysql(=<path>)], 
-                [Path is optional and if given should specify the full path to the MySQL
-                 configure script, mysql_config. E.g. --with-mysql=/<path>/mysql_config]), 
-        [
-                if test "xno" = "x$with_mysql"; then
-                        AC_MSG_RESULT([no])
-                        mysql="no"
-                else
-                        AC_MSG_RESULT([yes])
-                        AC_CHECK_FILE([$with_mysql], [MYSQLCONFIG=$with_mysql], [check_mysql_config])        
-                fi
-        ],
-        [
-                AC_MSG_RESULT([yes])
-                check_mysql_config
-        ])
-if test "xyes" = "x$mysql"; then
+    }
+    AC_ARG_WITH([mysql],
+      AS_HELP_STRING([--with-mysql(=<path>)],
+          [Path is optional and if given should specify the full path to the MySQL
+          configure script, mysql_config. E.g. --with-mysql=/<path>/mysql_config]),
+      [
+          if test "xno" = "x$with_mysql"; then
+              AC_MSG_RESULT([no])
+              mysql="no"
+          else
+              AC_MSG_RESULT([yes])
+              AC_CHECK_FILE([$with_mysql], [MYSQLCONFIG=$with_mysql], [check_mysql_config])
+          fi
+      ],
+      [
+          AC_MSG_RESULT([yes])
+          check_mysql_config
+      ])
+    if test "xyes" = "x$mysql"; then
         tmp_CPPFLAGS=$CPPFLAGS
         tmp_LDFLAGS=$LDFLAGS
         CPPFLAGS="`$MYSQLCONFIG --include` $CPPFLAGS"
         LDFLAGS="`$MYSQLCONFIG --libs` $LDFLAGS"
         AC_CHECK_HEADERS([mysql.h], [], [mysql="no"])
         if test "xyes" = "x$mysql"; then
-	        echo "found mysql client library"
-		MYSQL_CFLAGS=`$MYSQLCONFIG --include`
-                MYSQL_LIBS=`$MYSQLCONFIG --libs`		
-		AC_SUBST(MYSQL_CFLAGS)
-		AC_SUBST(MYSQL_LIBS)
-		AC_DEFINE([HAVE_MYSQL], 1, [Define to 1 to enable mysql])
+            echo "found mysql client library"
+            MYSQL_CFLAGS=`$MYSQLCONFIG --include`
+            MYSQL_LIBS=`$MYSQLCONFIG --libs`
+            AC_SUBST(MYSQL_CFLAGS)
+            AC_SUBST(MYSQL_LIBS)
+            AC_DEFINE([HAVE_MYSQL], 1, [Define to 1 to enable mysql])
         fi
         CPPFLAGS=$tmp_CPPFLAGS
         LDFLAGS=$tmp_LDFLAGS
+    fi
+else
+    AC_MSG_CHECKING(for mysql in windows)
+    AC_CHECK_HEADERS([mysql.h], [], [mysql="no"])
+    if test "xyes" = "x$mysql"; then
+        AC_DEFINE([HAVE_MYSQL], 1, [Define to 1 to enable mysql])
+        LDFLAGS="$LDFLAGS -lmysql -lws2_32"
+    fi
 fi
 AM_CONDITIONAL([WITH_MYSQL], test "xyes" = "x$mysql")
 
 postgresql="yes"
-check_postgres_config() 
+check_postgres_config()
 {
         AC_PATH_PROG([PGCONFIG], [pg_config], [no], [$PATH:/usr/local/bin:/usr/local/pgsql/bin])
         if test "x$PGCONFIG" = "xno"
@@ -278,10 +286,10 @@ check_postgres_config()
         fi
 }
 AC_MSG_CHECKING(for postgresql)
-AC_ARG_WITH([postgresql], 
-        AS_HELP_STRING([--with-postgresql(=<path>)], 
+AC_ARG_WITH([postgresql],
+        AS_HELP_STRING([--with-postgresql(=<path>)],
                 [Path is optional and if given should specify the full path to the PostgreSQL
-                 configure script, pg_config. E.g. --with-postgresql=/<path>/pg_config]), 
+                 configure script, pg_config. E.g. --with-postgresql=/<path>/pg_config]),
         [
                 if test "xno" = "x$with_postgresql"; then
                         AC_MSG_RESULT([no])
diff --git a/net/server/user-mgr.c b/net/server/user-mgr.c
index 69ceabc..66597ec 100644
--- a/net/server/user-mgr.c
+++ b/net/server/user-mgr.c
@@ -25,6 +25,10 @@
     #include <ldap.h>
   #else
     #include <winldap.h>
+    #include <winber.h>
+    #ifndef LDAP_OPT_SUCCESS
+    #define LDAP_OPT_SUCCESS LDAP_SUCCESS
+    #endif
   #endif
 #endif
 
@@ -1557,7 +1561,7 @@ ccnet_user_manager_filter_emailusers_by_emails(CcnetUserManager *manager,
 
     g_free (copy);
     g_string_free (sql, TRUE);
-    
+
     return g_list_reverse (ret);
 }
 #endif