haiwen/ccnet-server
1
0
Fork 0
mirror of https://github.com/haiwen/ccnet-server.git synced 2025-08-31 20:36:52 +00:00
Code Issues Releases Wiki Activity

Fix configure error when --with-mysql is specified.

Browse Source
This commit is contained in:
Jonathan Xu
2019-07-25 13:35:48 +08:00
parent 9a1858aea5
commit fcb2508b04
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
configure.ac
View File

@@ -129,22 +129,6 @@ if test "$bwin32" = "true"; then
fi fi
AC_SUBST(CONSOLE) AC_SUBST(CONSOLE)
if test "x${MYSQL_CONFIG}" = "xdefault_mysql_config"; then
PKG_CHECK_MODULES(MYSQL, [mysqlclient], [have_mysql="yes"], [have_mysql="no"])
if test "x${have_mysql}" = "xyes"; then
AC_SUBST(MYSQL_CFLAGS)
AC_SUBST(MYSQL_LIBS)
AC_DEFINE([HAVE_MYSQL], 1, [Define to 1 if MySQL support is enabled])
fi
else
AC_MSG_CHECKING([for MySQL])
MYSQL_CFLAGS=`${MYSQL_CONFIG} --include`
MYSQL_LIBS=`${MYSQL_CONFIG} --libs`
AC_MSG_RESULT([${MYSQL_CFLAGS}])
AC_SUBST(MYSQL_CFLAGS)
AC_SUBST(MYSQL_LIBS)
fi
if test "$bwin32" = true; then if test "$bwin32" = true; then
LIB_WS32=-lws2_32 LIB_WS32=-lws2_32
LIB_GDI32=-lgdi32 LIB_GDI32=-lgdi32
@@ -227,6 +211,22 @@ PKG_CHECK_MODULES(LIBEVENT, [libevent >= $LIBEVENT_REQUIRED])
AC_SUBST(LIBEVENT_CFLAGS) AC_SUBST(LIBEVENT_CFLAGS)
AC_SUBST(LIBEVENT_LIBS) AC_SUBST(LIBEVENT_LIBS)
if test "x${MYSQL_CONFIG}" = "xdefault_mysql_config"; then
PKG_CHECK_MODULES(MYSQL, [mysqlclient], [have_mysql="yes"], [have_mysql="no"])
if test "x${have_mysql}" = "xyes"; then
AC_SUBST(MYSQL_CFLAGS)
AC_SUBST(MYSQL_LIBS)
AC_DEFINE([HAVE_MYSQL], 1, [Define to 1 if MySQL support is enabled])
fi
else
AC_MSG_CHECKING([for MySQL])
MYSQL_CFLAGS=`${MYSQL_CONFIG} --include`
MYSQL_LIBS=`${MYSQL_CONFIG} --libs`
AC_MSG_RESULT([${MYSQL_CFLAGS}])
AC_SUBST(MYSQL_CFLAGS)
AC_SUBST(MYSQL_LIBS)
fi
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