Merge pull request #3 from haiwen/winserver-6.x

Winserver 6.x

configure.ac

@@ -208,19 +208,20 @@ AC_SUBST(LIBEVENT_LIBS)
 
 if test x${compile_python} = xyes; then
     AM_PATH_PYTHON([2.6])
-
-   if test "$bwin32" = true; then
+    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 # end for bwin32
-
+        fi
+    fi
 fi
 
 mysql="yes"
+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])
@@ -230,7 +231,6 @@ check_mysql_config()
             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
@@ -265,6 +265,14 @@ if test "xyes" = "x$mysql"; then
         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"

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