haiwen/ccnet-server
1
0
Fork 0
mirror of https://github.com/haiwen/ccnet-server.git synced 2025-09-03 05:44:19 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
Winserver 6.x
This commit is contained in:
Jiaqiang Xu
2016-12-29 14:12:13 +08:00
committed by GitHub
parent 55cbd806ae 1e979d70eb
commit 77d685d2a5
2 changed files with 59 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
configure.ac
View File

@@ -207,68 +207,76 @@ AC_SUBST(LIBEVENT_CFLAGS)
AC_SUBST(LIBEVENT_LIBS) AC_SUBST(LIBEVENT_LIBS)
if test x${compile_python} = xyes; then if test x${compile_python} = xyes; then
AM_PATH_PYTHON([2.6]) 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 # set pyexecdir to somewhere like /c/Python26/Lib/site-packages
pyexecdir=${PYTHON_DIR}/Lib/site-packages pyexecdir=${PYTHON_DIR}/Lib/site-packages
pythondir=${pyexecdir} pythondir=${pyexecdir}
pkgpyexecdir=${pyexecdir}/${PACKAGE} pkgpyexecdir=${pyexecdir}/${PACKAGE}
pkgpythondir=${pythondir}/${PACKAGE} pkgpythondir=${pythondir}/${PACKAGE}
fi
fi # end for bwin32 fi
fi fi
mysql="yes" 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]) 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 then
AC_MSG_WARN([mysql_config is required to build seafile server with mysql]) AC_MSG_WARN([mysql_config is required to build seafile server with mysql])
mysql="no" mysql="no"
fi fi
} }
AC_MSG_CHECKING(for mysql) AC_ARG_WITH([mysql],
AC_ARG_WITH([mysql], AS_HELP_STRING([--with-mysql(=<path>)],
AS_HELP_STRING([--with-mysql(=<path>)], [Path is optional and if given should specify the full path to the MySQL
[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]),
configure script, mysql_config. E.g. --with-mysql=/<path>/mysql_config]), [
[ if test "xno" = "x$with_mysql"; then
if test "xno" = "x$with_mysql"; then AC_MSG_RESULT([no])
AC_MSG_RESULT([no]) mysql="no"
mysql="no" else
else AC_MSG_RESULT([yes])
AC_MSG_RESULT([yes]) AC_CHECK_FILE([$with_mysql], [MYSQLCONFIG=$with_mysql], [check_mysql_config])
AC_CHECK_FILE([$with_mysql], [MYSQLCONFIG=$with_mysql], [check_mysql_config]) fi
fi ],
], [
[ AC_MSG_RESULT([yes])
AC_MSG_RESULT([yes]) check_mysql_config
check_mysql_config ])
]) if test "xyes" = "x$mysql"; then
if test "xyes" = "x$mysql"; then
tmp_CPPFLAGS=$CPPFLAGS tmp_CPPFLAGS=$CPPFLAGS
tmp_LDFLAGS=$LDFLAGS tmp_LDFLAGS=$LDFLAGS
CPPFLAGS="`$MYSQLCONFIG --include` $CPPFLAGS" CPPFLAGS="`$MYSQLCONFIG --include` $CPPFLAGS"
LDFLAGS="`$MYSQLCONFIG --libs` $LDFLAGS" LDFLAGS="`$MYSQLCONFIG --libs` $LDFLAGS"
AC_CHECK_HEADERS([mysql.h], [], [mysql="no"]) AC_CHECK_HEADERS([mysql.h], [], [mysql="no"])
if test "xyes" = "x$mysql"; then if test "xyes" = "x$mysql"; then
echo "found mysql client library" echo "found mysql client library"
MYSQL_CFLAGS=`$MYSQLCONFIG --include` MYSQL_CFLAGS=`$MYSQLCONFIG --include`
MYSQL_LIBS=`$MYSQLCONFIG --libs` MYSQL_LIBS=`$MYSQLCONFIG --libs`
AC_SUBST(MYSQL_CFLAGS) AC_SUBST(MYSQL_CFLAGS)
AC_SUBST(MYSQL_LIBS) AC_SUBST(MYSQL_LIBS)
AC_DEFINE([HAVE_MYSQL], 1, [Define to 1 to enable mysql]) AC_DEFINE([HAVE_MYSQL], 1, [Define to 1 to enable mysql])
fi fi
CPPFLAGS=$tmp_CPPFLAGS CPPFLAGS=$tmp_CPPFLAGS
LDFLAGS=$tmp_LDFLAGS 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 fi
AM_CONDITIONAL([WITH_MYSQL], test "xyes" = "x$mysql") AM_CONDITIONAL([WITH_MYSQL], test "xyes" = "x$mysql")
postgresql="yes" postgresql="yes"
check_postgres_config() check_postgres_config()
{ {
AC_PATH_PROG([PGCONFIG], [pg_config], [no], [$PATH:/usr/local/bin:/usr/local/pgsql/bin]) AC_PATH_PROG([PGCONFIG], [pg_config], [no], [$PATH:/usr/local/bin:/usr/local/pgsql/bin])
if test "x$PGCONFIG" = "xno" if test "x$PGCONFIG" = "xno"
@@ -278,10 +286,10 @@ check_postgres_config()
fi fi
} }
AC_MSG_CHECKING(for postgresql) AC_MSG_CHECKING(for postgresql)
AC_ARG_WITH([postgresql], AC_ARG_WITH([postgresql],
AS_HELP_STRING([--with-postgresql(=<path>)], AS_HELP_STRING([--with-postgresql(=<path>)],
[Path is optional and if given should specify the full path to the PostgreSQL [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 if test "xno" = "x$with_postgresql"; then
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])

6
net/server/user-mgr.c
View File

@@ -25,6 +25,10 @@
#include <ldap.h> #include <ldap.h>
#else #else
#include <winldap.h> #include <winldap.h>
#include <winber.h>
#ifndef LDAP_OPT_SUCCESS
#define LDAP_OPT_SUCCESS LDAP_SUCCESS
#endif
#endif #endif
#endif #endif
@@ -1557,7 +1561,7 @@ ccnet_user_manager_filter_emailusers_by_emails(CcnetUserManager *manager,
g_free (copy); g_free (copy);
g_string_free (sql, TRUE); g_string_free (sql, TRUE);
return g_list_reverse (ret); return g_list_reverse (ret);
} }
#endif #endif