WindyMadman/seafile
1
0
Fork 0
mirror of https://github.com/haiwen/seafile.git synced 2025-01-08 11:57:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove mysql related code as we use libzdb

Browse Source
This commit is contained in:
poetwang 2013-07-24 01:42:56 +08:00
parent 65e77a3c71
commit d312b0cb27
8 changed files with 8 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -10,11 +10,12 @@ if COMPILE_GUI
MAKE_PO = po
endif
MAKE_CONTROLLER = controller
if WIN32
MAKE_data =
MAKE_CONTROLLER =
else
MAKE_CONTROLLER = controller
endif
if COMPILE_SERVER

49
configure.ac
View File

@ -102,13 +102,6 @@ AC_ARG_ENABLE(gui, AC_HELP_STRING([--enable-gui], [enable gui]),
AC_ARG_ENABLE(server, AC_HELP_STRING([--enable-server], [enable server]),
[compile_server=$enableval],[compile_server="no"])
# default compile mysql, but only check it for server.
AC_ARG_ENABLE(mysql, AC_HELP_STRING([--enable-mysql], [enable mysql]),
[compile_mysql=$enableval],[compile_mysql="yes"])
AC_ARG_ENABLE(pgsql, AC_HELP_STRING([--enable-pgsql], [enable postgresql]),
[compile_pgsql=$enableval],[compile_pgsql="no"])
AC_ARG_ENABLE(python,
AC_HELP_STRING([--enable-python],[build ccnet python binding]),
[compile_python=$enableval],
@ -156,8 +149,6 @@ AM_CONDITIONAL([COMPILE_SERVER], [test "${compile_server}" = "yes"])
#AM_CONDITIONAL([COMPILE_SEABLOCK], [test "${compile_seablock}" = "yes"])
AM_CONDITIONAL([COMPILE_RIAK], [test "${compile_riak}" = "yes"])
AM_CONDITIONAL([COMPILE_CEPH], [test "${compile_ceph}" = "yes"])
AM_CONDITIONAL([COMPILE_MYSQL], [test "${compile_mysql}" = "yes"])
AM_CONDITIONAL([COMPILE_PGSQL], [test "${compile_pgsql}" = "yes"])
AM_CONDITIONAL([WIN32], [test "$bwin32" = "true"])
AM_CONDITIONAL([MACOS], [test "$bmac" = "true"])
@ -354,46 +345,6 @@ if test "${compile_server}" = "yes"; then
AC_SUBST(ZDB_CFLAGS)
AC_SUBST(ZDB_LIBS)
if test "$compile_mysql" = "yes"; then
MYSQL_CFLAGS=$(mysql_config --include)
MYSQL_LIBS=$(mysql_config --libs_r)
# On CentOS, libmysqlclient is in /usr/lib64/mysql/, not /usr/lib, so we
# need to adjust CPPFLAGS and LDFLAGS before check it
saved_CPPFLAGS=$CPPFLAGS
saved_LDFLAGS=$LDFLAGS
CPPFLAGS="$MYSQL_CFLAGS $CPPFLAGS"
LDFLAGS="$MYSQL_LIBS $LDFLAGS"
AC_CHECK_LIB(mysqlclient, mysql_init, [echo "found library mysqlclient"],
AC_MSG_ERROR([*** Unable to find mysql client library]), )
CPPFLAGS=$saved_CPPFLAGS
LDFLAGS=$saved_LDFLAGS
AC_SUBST(MYSQL_LIBS)
AC_SUBST(MYSQL_CFLAGS)
fi
# check postgresql if compile_pgsql is set
if test "${compile_pgsql}" = "yes"; then
saved_CPPFLAGS=$CPPFLAGS
saved_LDFLAGS=$LDFLAGS
PGSQL_CFLAGS="-I`pg_config --includedir` $CPPFLAGS"
PGSQL_LIBS="-L`pg_config --libdir` $LDFLAGS"
CPPFLAGS="$PGSQL_CFLAGS $CPPFLAGS"
LDFLAGS="$PGSQL_LIBS $LDFLAGS"
AC_CHECK_HEADERS([libpq-fe.h], [], [compile_pgsql="no"])
CPPFLAGS=$saved_CPPFLAGS
LDFLAGS=$saved_LDFLAGS
AC_SUBST(PGSQL_LIBS)
AC_SUBST(PGSQL_CFLAGS)
fi
fi
if test x${compile_server} = xyes; then

2
controller/Makefile.am
View File

@ -8,8 +8,6 @@ AM_CFLAGS = \
@CCNET_CFLAGS@ \
@SEARPC_CFLAGS@ \
@GLIB2_CFLAGS@ \
@MYSQL_CFLAGS@ \
@PGSQL_CFLAGS@ \
@ZDB_CFLAGS@ \
-Wall

4
httpserver/Makefile.am
View File

@ -10,8 +10,6 @@ AM_CFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" \
@CCNET_CFLAGS@ \
@SEARPC_CFLAGS@ \
@GLIB2_CFLAGS@ \
@MYSQL_CFLAGS@ \
@PGSQL_CFLAGS@ \
@ZDB_CFLAGS@ \
@CURL_CFLAGS@ \
@LIBARCHIVE_CFLAGS@ \
@ -55,7 +53,7 @@ httpserver_LDADD = -levent -levhtp -lssl -levent_openssl \
@CCNET_LIBS@ \
$(top_builddir)/lib/libseafile.la \
$(top_builddir)/common/cdc/libcdc.la \
@MYSQL_LIBS@ @PGSQL_LIBS@ @SEARPC_LIBS@ @ZDB_LIBS@ @RADOS_LIBS@ @CURL_LIBS@ \
@SEARPC_LIBS@ @ZDB_LIBS@ @RADOS_LIBS@ @CURL_LIBS@ \
@LIBARCHIVE_LIBS@ ${LIB_WS32}
httpserver_LDFLAGS = @STATIC_COMPILE@

4
monitor/Makefile.am
View File

@ -9,8 +9,6 @@ AM_CFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" \
@CCNET_CFLAGS@ \
@SEARPC_CFLAGS@ \
@GLIB2_CFLAGS@ \
@MYSQL_CFLAGS@ \
@PGSQL_CFLAGS@ \
@ZDB_CFLAGS@ \
@MSVC_CFLAGS@ \
@CURL_CFLAGS@ \
@ -52,6 +50,6 @@ seaf_mon_LDADD = @CCNET_LIBS@ \
$(top_builddir)/common/cdc/libcdc.la \
$(top_builddir)/lib/libseafile_common.la \
@GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 -levent \
@MYSQL_LIBS@ @PGSQL_LIBS@ @SEARPC_LIBS@ @ZDB_LIBS@ @RADOS_LIBS@ @CURL_LIBS@ ${LIB_WS32}
@SEARPC_LIBS@ @ZDB_LIBS@ @RADOS_LIBS@ @CURL_LIBS@ ${LIB_WS32}
seaf_mon_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@

4
server/Makefile.am
View File

@ -11,8 +11,6 @@ AM_CFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" \
@CCNET_CFLAGS@ \
@SEARPC_CFLAGS@ \
@GLIB2_CFLAGS@ \
@MYSQL_CFLAGS@ \
@PGSQL_CFLAGS@ \
@ZDB_CFLAGS@ \
@MSVC_CFLAGS@ \
@CURL_CFLAGS@ \
@ -96,6 +94,6 @@ seaf_server_LDADD = @CCNET_LIBS@ \
$(top_builddir)/common/index/libindex.la \
@GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 -levent \
$(top_builddir)/common/cdc/libcdc.la \
@MYSQL_LIBS@ @PGSQL_LIBS@ @SEARPC_LIBS@ @ZDB_LIBS@ @RADOS_LIBS@ @CURL_LIBS@ ${LIB_WS32}
@SEARPC_LIBS@ @ZDB_LIBS@ @RADOS_LIBS@ @CURL_LIBS@ ${LIB_WS32}
seaf_server_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@

3
server/gc/Makefile.am
View File

@ -9,7 +9,6 @@ AM_CFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" \
@CCNET_CFLAGS@ \
@SEARPC_CFLAGS@ \
@GLIB2_CFLAGS@ \
@MYSQL_CFLAGS@ \
@ZDB_CFLAGS@ \
@MSVC_CFLAGS@ \
@CURL_CFLAGS@ \
@ -50,6 +49,6 @@ seafserv_gc_LDADD = @CCNET_LIBS@ \
$(top_builddir)/common/cdc/libcdc.la \
$(top_builddir)/lib/libseafile_common.la \
@GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 -levent \
@MYSQL_LIBS@ @SEARPC_LIBS@ @ZDB_LIBS@ @RADOS_LIBS@ @CURL_LIBS@ ${LIB_WS32}
@SEARPC_LIBS@ @ZDB_LIBS@ @RADOS_LIBS@ @CURL_LIBS@ ${LIB_WS32}
seafserv_gc_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@

4
tools/Makefile.am
View File

@ -5,10 +5,10 @@ bin_PROGRAMS = seaf-server-init
seaf_server_init_SOURCES = seaf-server-init.c ../common/seaf-db.c
seaf_server_init_LDADD = @GLIB2_LIBS@ @MYSQL_LIBS@ @PGSQL_LIBS@ @ZDB_LIBS@
seaf_server_init_LDADD = @GLIB2_LIBS@ @ZDB_LIBS@
seaf_server_init_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@
seaf_server_init_CPPFLAGS = @GLIB2_CFLAGS@ @MYSQL_CFLAGS@ @PGSQL_LIBS@ @ZDB_CFLAGS@ @MSVC_CFLAGS@
seaf_server_init_CPPFLAGS = @GLIB2_CFLAGS@ @ZDB_CFLAGS@ @MSVC_CFLAGS@
EXTRA_DIST = seafile-admin