haiwen/ccnet-server
1
0
Fork 0
mirror of https://github.com/haiwen/ccnet-server.git synced 2025-09-01 04:47:00 +00:00
Code Issues Releases Wiki Activity

Enabled msyql on windows.

Browse Source
This commit is contained in:
Shuai Lin
2016-12-27 15:04:37 +08:00
parent d0f0ce7125
commit 1e979d70eb
1 changed files with 45 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
configure.ac
View File

@@ -208,7 +208,7 @@ 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 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
@@ -220,6 +220,8 @@ if test x${compile_python} = xyes; then
fi fi
mysql="yes" mysql="yes"
if test "$bwin32" != "true"; then
AC_MSG_CHECKING(for mysql in unix)
check_mysql_config() 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])
@@ -229,7 +231,6 @@ check_mysql_config()
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
@@ -264,6 +265,14 @@ if test "xyes" = "x$mysql"; then
CPPFLAGS=$tmp_CPPFLAGS CPPFLAGS=$tmp_CPPFLAGS
LDFLAGS=$tmp_LDFLAGS LDFLAGS=$tmp_LDFLAGS
fi 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") AM_CONDITIONAL([WITH_MYSQL], test "xyes" = "x$mysql")
postgresql="yes" postgresql="yes"