Page MenuHomeFreeBSD
Differential D3947 Diff 9521 net-mgmt/seafile/files/patch-configure.ac

Changeset View

Standalone View

View Options

net-mgmt/seafile/files/patch-configure.ac

--- configure.ac.orig 2015-01-21 22:45:28.000000000 -0500 --- configure.ac.orig 2015-09-21 03:42:11 UTC
+++ configure.ac 2015-01-28 14:01:20.000000000 -0500 +++ configure.ac
@@ -50,8 +50,16 @@ @@ -50,8 +50,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
+ AC_MSG_RESULT(compile in BSD) + AC_MSG_RESULT(compile in BSD)
+else +else
+ AC_MSG_RESULT(no) + AC_MSG_RESULT(no)
+fi +fi
+ +
AC_MSG_CHECKING(for Linux) AC_MSG_CHECKING(for Linux)
-if test "$bmac" != "true" -a "$bwin32" != "true"; then -if test "$bmac" != "true" -a "$bwin32" != "true"; then
+if test "$bmac" != "true" -a "$bwin32" != "true" -a "$bbsd" != "true"; then +if test "$bmac" != "true" -a "$bwin32" != "true" -a "$bbsd" != "true"; then
blinux=true blinux=true
AC_MSG_RESULT(compile in linux) AC_MSG_RESULT(compile in linux)
else else
@@ -93,6 +101,11 @@ @@ -93,6 +101,11 @@ if test "$bwin32" != true; then
[compile_fuse=$enableval],[compile_fuse="yes"]) [compile_fuse=$enableval],[compile_fuse="yes"])
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(client, AC_HELP_STRING([--enable-client], [enable client]), AC_ARG_ENABLE(client, AC_HELP_STRING([--enable-client], [enable client]),
[compile_client=$enableval],[compile_client="yes"]) [compile_client=$enableval],[compile_client="yes"])
@@ -148,6 +161,7 @@ @@ -148,6 +161,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"])
@@ -192,6 +206,9 @@ @@ -193,6 +207,9 @@ if test "$bwin32" = true; then
LIB_PSAPI=-lpsapi
LIB_MAC= LIB_MAC=
MSVC_CFLAGS="-D__MSVCRT__ -D__MSVCRT_VERSION__=0x0601" MSVC_CFLAGS="-D__MSVCRT__ -D__MSVCRT_VERSION__=0x0601"
LIB_CRYPT32=-lcrypt32
+ ZLIB_LIBS= + ZLIB_LIBS=
+ LIB_INOTIFY= + LIB_INOTIFY=
+ LIB_KVM= + LIB_KVM=
elif test "$bmac" = true ; then elif test "$bmac" = true ; then
LIB_WS32= LIB_WS32=
LIB_GDI32= LIB_GDI32=
@@ -204,6 +221,24 @@ @@ -206,6 +223,25 @@ elif test "$bmac" = true ; then
LIB_PSAPI=
MSVC_CFLAGS= MSVC_CFLAGS=
LIB_MAC="-framework CoreServices" LIB_MAC="-framework CoreServices"
LIB_CRYPT32=
+ 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=
+ LIB_GDI32= + LIB_GDI32=
+ LIB_RT= + LIB_RT=
+ LIB_INTL= + LIB_INTL=
koobsUnsubmitted
Not Done
Inline Actions

Unnecessary whitespace changes?

koobs: Unnecessary whitespace changes?
miwiUnsubmitted
Not Done
Inline Actions

no it needed to regenerated.

miwi: no it needed to regenerated.
+ LIB_RESOLV= + LIB_RESOLV=
+ LIB_UUID=-luuid + LIB_UUID=-luuid
+ LIB_IPHLPAPI= + LIB_IPHLPAPI=
+ LIB_SHELL32= + LIB_SHELL32=
+ LIB_PSAPI= + LIB_PSAPI=
+ LIB_MAC= + LIB_MAC=
+ MSVC_CFLAGS= + MSVC_CFLAGS=
+ LIB_CRYPT32=
+ 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=
@@ -216,6 +251,9 @@ @@ -219,6 +255,9 @@ else
LIB_PSAPI=
LIB_MAC= LIB_MAC=
MSVC_CFLAGS= MSVC_CFLAGS=
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)
@@ -228,6 +266,9 @@ @@ -231,6 +270,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)
@@ -244,7 +286,9 @@ ZDB_REQUIRED=2.10
@@ -240,7 +281,9 @@
#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)
@@ -270,9 +313,11 @@ @@ -274,9 +318,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])