ac3636371b
This minor version update no longer supports python 2.7. The way mysql support is detected upstream has changed. Instead of patching the configure.ac script, I used a couple hacks for this to be detected for custom configurations. Didn't detect any issues with this method but I'm open to change this in the future. Added a SeaHub upgrade message to smooth out upgrading. For upgrading from 7.0.x, if one does not clear the cache, http 500 will be returned. The seafile_datadir no longer points to the seahub.ini, this has been changed upstream and may cause upgrading issues if not using the default. This can easily be changed by setting it in rc.conf. Changes: https://download.seafile.com/published/seafile-manual/changelog/changelog-for-seafile-professional-server.md
116 lines
2.9 KiB
Text
116 lines
2.9 KiB
Text
--- configure.ac.orig 2019-12-23 10:30:49 UTC
|
|
+++ configure.ac
|
|
@@ -51,8 +51,16 @@ else
|
|
AC_MSG_RESULT(no)
|
|
fi
|
|
|
|
+AC_MSG_CHECKING(for BSD)
|
|
+if test `uname | grep -e BSD -e DragonFly | wc -l` = "1"; then
|
|
+ bbsd=true
|
|
+ AC_MSG_RESULT(compile in BSD)
|
|
+else
|
|
+ AC_MSG_RESULT(no)
|
|
+fi
|
|
+
|
|
AC_MSG_CHECKING(for Linux)
|
|
-if test "$bmac" != "true" -a "$bwin32" != "true"; then
|
|
+if test "$bmac" != "true" -a "$bwin32" != "true" -a "$bbsd" != "true"; then
|
|
blinux=true
|
|
AC_MSG_RESULT(compile in linux)
|
|
else
|
|
@@ -78,6 +86,11 @@ if test "$bwin32" != true; then
|
|
[compile_fuse=$enableval],[compile_fuse="yes"])
|
|
fi
|
|
|
|
+if test "$bbsd" = true; then
|
|
+ AC_ARG_ENABLE(fuse, AC_HELP_STRING([--enable-fuse], [enable fuse virtual file system]),
|
|
+ [compile_fuse=$enableval],[compile_fuse="no"])
|
|
+fi
|
|
+
|
|
AC_ARG_ENABLE(python,
|
|
AC_HELP_STRING([--enable-python],[build seafile python binding]),
|
|
[compile_python=$enableval],
|
|
@@ -94,6 +107,7 @@ AM_CONDITIONAL([COMPILE_FUSE], [test "${compile_fuse}"
|
|
|
|
AM_CONDITIONAL([WIN32], [test "$bwin32" = "true"])
|
|
AM_CONDITIONAL([MACOS], [test "$bmac" = "true"])
|
|
+AM_CONDITIONAL([BSD], [test "$bbsd" = "true"])
|
|
AM_CONDITIONAL([LINUX], [test "$blinux" = "true"])
|
|
|
|
|
|
@@ -139,6 +153,8 @@ if test "$bwin32" = true; then
|
|
LIB_MAC=
|
|
MSVC_CFLAGS="-D__MSVCRT__ -D__MSVCRT_VERSION__=0x0601"
|
|
LIB_CRYPT32=-lcrypt32
|
|
+ LIB_INOTIFY=
|
|
+ LIB_KVM=
|
|
LIB_ICONV=-liconv
|
|
elif test "$bmac" = true ; then
|
|
LIB_WS32=
|
|
@@ -154,6 +170,24 @@ elif test "$bmac" = true ; then
|
|
LIB_MAC="-framework CoreServices"
|
|
LIB_CRYPT32=
|
|
LIB_ICONV=-liconv
|
|
+ LIB_INOTIFY=
|
|
+ LIB_KVM=
|
|
+elif test "$bbsd" = true ; then
|
|
+ LIB_WS32=
|
|
+ LIB_GDI32=
|
|
+ LIB_RT=
|
|
+ LIB_INTL=
|
|
+ LIB_RESOLV=
|
|
+ LIB_UUID=-luuid
|
|
+ LIB_IPHLPAPI=
|
|
+ LIB_SHELL32=
|
|
+ LIB_PSAPI=
|
|
+ LIB_MAC=
|
|
+ MSVC_CFLAGS=
|
|
+ LIB_CRYPT32=
|
|
+ LIB_ICONV=-liconv
|
|
+ LIB_INOTIFY=-linotify
|
|
+ LIB_KVM=-lkvm
|
|
else
|
|
LIB_WS32=
|
|
LIB_GDI32=
|
|
@@ -167,6 +201,8 @@ else
|
|
LIB_MAC=
|
|
MSVC_CFLAGS=
|
|
LIB_CRYPT32=
|
|
+ LIB_INOTIFY=-linotify
|
|
+ LIB_KVM=
|
|
fi
|
|
|
|
AC_SUBST(LIB_WS32)
|
|
@@ -179,6 +215,8 @@ AC_SUBST(LIB_IPHLPAPI)
|
|
AC_SUBST(LIB_SHELL32)
|
|
AC_SUBST(LIB_PSAPI)
|
|
AC_SUBST(LIB_MAC)
|
|
+AC_SUBST(LIB_INOTIFY)
|
|
+AC_SUBST(LIB_KVM)
|
|
AC_SUBST(MSVC_CFLAGS)
|
|
AC_SUBST(LIB_CRYPT32)
|
|
AC_SUBST(LIB_ICONV)
|
|
@@ -194,6 +232,8 @@ ZDB_REQUIRED=2.10
|
|
CURL_REQUIRED=7.17
|
|
FUSE_REQUIRED=2.7.3
|
|
ZLIB_REQUIRED=1.2.0
|
|
+LIBEVHTP_REQUIRED=1.2.10
|
|
+ONIGURUMA_REQUIRED=5.9.2
|
|
|
|
PKG_CHECK_MODULES(SSL, [openssl])
|
|
AC_SUBST(SSL_CFLAGS)
|
|
@@ -226,6 +266,14 @@ AC_SUBST(LIBEVENT_LIBS)
|
|
PKG_CHECK_MODULES(ZLIB, [zlib >= $ZLIB_REQUIRED])
|
|
AC_SUBST(ZLIB_CFLAGS)
|
|
AC_SUBST(ZLIB_LIBS)
|
|
+
|
|
+PKG_CHECK_MODULES(LIBEVHTP, [evhtp >= $LIBEVHTP_REQUIRED])
|
|
+AC_SUBST(LIBEVHTP_CFLAGS)
|
|
+AC_SUBST(LIBEVHTP_LIBS)
|
|
+
|
|
+PKG_CHECK_MODULES(ONIGURUMA, [oniguruma >= $ONIGURUMA_REQUIRED])
|
|
+AC_SUBST(ONIGURUMA_CFLAGS)
|
|
+AC_SUBST(ONIGURUMA_LIBS)
|
|
|
|
if test "x${MYSQL_CONFIG}" = "xdefault_mysql_config"; then
|
|
PKG_CHECK_MODULES(MYSQL, [mysqlclient], [have_mysql="yes"], [have_mysql="no"])
|