Changeset View
Changeset View
Standalone View
Standalone View
head/net-mgmt/seafile-server/files/patch-configure.ac
--- configure.ac.orig 2016-10-09 09:30:49 UTC | --- configure.ac.orig 2016-12-27 07:02:58 UTC | ||||
+++ configure.ac | +++ configure.ac | ||||
@@ -51,8 +51,16 @@ else | @@ -51,8 +51,16 @@ else | ||||
AC_MSG_RESULT(no) | AC_MSG_RESULT(no) | ||||
fi | fi | ||||
+AC_MSG_CHECKING(for BSD) | +AC_MSG_CHECKING(for BSD) | ||||
+if test `uname | grep -e BSD -e DragonFly | wc -l` = "1"; then | +if test `uname | grep -e BSD -e DragonFly | wc -l` = "1"; then | ||||
+ bbsd=true | + bbsd=true | ||||
Show All 13 Lines | |||||
fi | fi | ||||
+if test "$bbsd" = true; then | +if test "$bbsd" = true; then | ||||
+ AC_ARG_ENABLE(fuse, AC_HELP_STRING([--enable-fuse], [enable fuse virtual file system]), | + AC_ARG_ENABLE(fuse, AC_HELP_STRING([--enable-fuse], [enable fuse virtual file system]), | ||||
+ [compile_fuse=$enableval],[compile_fuse="no"]) | + [compile_fuse=$enableval],[compile_fuse="no"]) | ||||
+fi | +fi | ||||
+ | + | ||||
AC_ARG_ENABLE(python, | AC_ARG_ENABLE(python, | ||||
AC_HELP_STRING([--enable-python],[build ccnet python binding]), | AC_HELP_STRING([--enable-python],[build seafile python binding]), | ||||
[compile_python=$enableval], | [compile_python=$enableval], | ||||
@@ -89,6 +102,7 @@ AM_CONDITIONAL([COMPILE_FUSE], [test "${ | @@ -89,6 +102,7 @@ AM_CONDITIONAL([COMPILE_FUSE], [test "${ | ||||
AM_CONDITIONAL([WIN32], [test "$bwin32" = "true"]) | AM_CONDITIONAL([WIN32], [test "$bwin32" = "true"]) | ||||
AM_CONDITIONAL([MACOS], [test "$bmac" = "true"]) | AM_CONDITIONAL([MACOS], [test "$bmac" = "true"]) | ||||
+AM_CONDITIONAL([BSD], [test "$bbsd" = "true"]) | +AM_CONDITIONAL([BSD], [test "$bbsd" = "true"]) | ||||
AM_CONDITIONAL([LINUX], [test "$blinux" = "true"]) | AM_CONDITIONAL([LINUX], [test "$blinux" = "true"]) | ||||
@@ -134,6 +148,9 @@ if test "$bwin32" = true; then | @@ -134,6 +148,9 @@ if test "$bwin32" = true; then | ||||
LIB_MAC= | LIB_MAC= | ||||
MSVC_CFLAGS="-D__MSVCRT__ -D__MSVCRT_VERSION__=0x0601" | MSVC_CFLAGS="-D__MSVCRT__ -D__MSVCRT_VERSION__=0x0601" | ||||
LIB_CRYPT32=-lcrypt32 | LIB_CRYPT32=-lcrypt32 | ||||
+ ZLIB_LIBS= | + ZLIB_LIBS= | ||||
+ LIB_INOTIFY= | + LIB_INOTIFY= | ||||
+ LIB_KVM= | + LIB_KVM= | ||||
LIB_ICONV=-liconv | |||||
elif test "$bmac" = true ; then | elif test "$bmac" = true ; then | ||||
LIB_WS32= | LIB_WS32= | ||||
LIB_GDI32= | @@ -149,6 +166,26 @@ elif test "$bmac" = true ; then | ||||
@@ -148,6 +165,26 @@ elif test "$bmac" = true ; then | |||||
LIB_MAC="-framework CoreServices" | LIB_MAC="-framework CoreServices" | ||||
LIB_CRYPT32= | LIB_CRYPT32= | ||||
LIB_ICONV=-liconv | LIB_ICONV=-liconv | ||||
+ ZLIB_LIBS= | + ZLIB_LIBS= | ||||
+ LIB_INOTIFY= | + LIB_INOTIFY= | ||||
+ LIB_KVM= | + LIB_KVM= | ||||
+elif test "$bbsd" = true ; then | +elif test "$bbsd" = true ; then | ||||
+ LIB_WS32= | + LIB_WS32= | ||||
Show All 10 Lines | |||||
+ LIB_CRYPT32= | + LIB_CRYPT32= | ||||
+ LIB_ICONV=-liconv | + LIB_ICONV=-liconv | ||||
+ ZLIB_LIBS=-lz | + ZLIB_LIBS=-lz | ||||
+ LIB_INOTIFY=-linotify | + LIB_INOTIFY=-linotify | ||||
+ LIB_KVM=-lkvm | + LIB_KVM=-lkvm | ||||
else | else | ||||
LIB_WS32= | LIB_WS32= | ||||
LIB_GDI32= | LIB_GDI32= | ||||
@@ -161,6 +198,9 @@ else | @@ -162,6 +199,9 @@ else | ||||
LIB_MAC= | LIB_MAC= | ||||
MSVC_CFLAGS= | MSVC_CFLAGS= | ||||
LIB_CRYPT32= | LIB_CRYPT32= | ||||
+ ZLIB_LIBS=-lz | + ZLIB_LIBS=-lz | ||||
+ LIB_INOTIFY=-linotify | + LIB_INOTIFY=-linotify | ||||
+ LIB_KVM= | + LIB_KVM= | ||||
fi | fi | ||||
AC_SUBST(LIB_WS32) | AC_SUBST(LIB_WS32) | ||||
@@ -173,6 +213,9 @@ AC_SUBST(LIB_IPHLPAPI) | @@ -174,6 +214,9 @@ AC_SUBST(LIB_IPHLPAPI) | ||||
AC_SUBST(LIB_SHELL32) | AC_SUBST(LIB_SHELL32) | ||||
AC_SUBST(LIB_PSAPI) | AC_SUBST(LIB_PSAPI) | ||||
AC_SUBST(LIB_MAC) | AC_SUBST(LIB_MAC) | ||||
+AC_SUBST(ZLIB_LIBS) | +AC_SUBST(ZLIB_LIBS) | ||||
+AC_SUBST(LIB_INOTIFY) | +AC_SUBST(LIB_INOTIFY) | ||||
+AC_SUBST(LIB_KVM) | +AC_SUBST(LIB_KVM) | ||||
AC_SUBST(MSVC_CFLAGS) | AC_SUBST(MSVC_CFLAGS) | ||||
AC_SUBST(LIB_CRYPT32) | AC_SUBST(LIB_CRYPT32) | ||||
AC_SUBST(LIB_ICONV) | AC_SUBST(LIB_ICONV) | ||||
@@ -187,7 +230,9 @@ ZDB_REQUIRED=2.10 | @@ -188,7 +231,9 @@ ZDB_REQUIRED=2.10 | ||||
#LIBNAUTILUS_EXTENSION_REQUIRED=2.30.1 | #LIBNAUTILUS_EXTENSION_REQUIRED=2.30.1 | ||||
CURL_REQUIRED=7.17 | CURL_REQUIRED=7.17 | ||||
FUSE_REQUIRED=2.7.3 | FUSE_REQUIRED=2.7.3 | ||||
+if test "$blinux" = true ; then | +if test "$blinux" = true ; then | ||||
ZLIB_REQUIRED=1.2.0 | ZLIB_REQUIRED=1.2.0 | ||||
+fi | +fi | ||||
PKG_CHECK_MODULES(SSL, [openssl]) | PKG_CHECK_MODULES(SSL, [openssl]) | ||||
AC_SUBST(SSL_CFLAGS) | AC_SUBST(SSL_CFLAGS) | ||||
@@ -217,9 +262,11 @@ PKG_CHECK_MODULES(LIBEVENT, [libevent >= | @@ -218,9 +263,11 @@ PKG_CHECK_MODULES(LIBEVENT, [libevent >= | ||||
AC_SUBST(LIBEVENT_CFLAGS) | AC_SUBST(LIBEVENT_CFLAGS) | ||||
AC_SUBST(LIBEVENT_LIBS) | AC_SUBST(LIBEVENT_LIBS) | ||||
+if test "$blinux" = true ; then | +if test "$blinux" = true ; then | ||||
PKG_CHECK_MODULES(ZLIB, [zlib >= $ZLIB_REQUIRED]) | PKG_CHECK_MODULES(ZLIB, [zlib >= $ZLIB_REQUIRED]) | ||||
AC_SUBST(ZLIB_CFLAGS) | AC_SUBST(ZLIB_CFLAGS) | ||||
AC_SUBST(ZLIB_LIBS) | AC_SUBST(ZLIB_LIBS) | ||||
+fi | +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]) |