|
Lines 1-4
Link Here
|
| 1 |
--- configure.ac.orig 2016-10-09 09:30:49 UTC |
1 |
--- configure.ac.orig 2016-12-27 07:02:58 UTC |
| 2 |
+++ configure.ac |
2 |
+++ configure.ac |
| 3 |
@@ -51,8 +51,16 @@ else |
3 |
@@ -51,8 +51,16 @@ else |
| 4 |
AC_MSG_RESULT(no) |
4 |
AC_MSG_RESULT(no) |
|
Lines 28-34
Link Here
|
| 28 |
+fi |
28 |
+fi |
| 29 |
+ |
29 |
+ |
| 30 |
AC_ARG_ENABLE(python, |
30 |
AC_ARG_ENABLE(python, |
| 31 |
AC_HELP_STRING([--enable-python],[build ccnet python binding]), |
31 |
AC_HELP_STRING([--enable-python],[build seafile python binding]), |
| 32 |
[compile_python=$enableval], |
32 |
[compile_python=$enableval], |
| 33 |
@@ -89,6 +102,7 @@ AM_CONDITIONAL([COMPILE_FUSE], [test "${ |
33 |
@@ -89,6 +102,7 @@ AM_CONDITIONAL([COMPILE_FUSE], [test "${ |
| 34 |
|
34 |
|
|
Lines 45-54
Link Here
|
| 45 |
+ ZLIB_LIBS= |
45 |
+ ZLIB_LIBS= |
| 46 |
+ LIB_INOTIFY= |
46 |
+ LIB_INOTIFY= |
| 47 |
+ LIB_KVM= |
47 |
+ LIB_KVM= |
|
|
48 |
LIB_ICONV=-liconv |
| 48 |
elif test "$bmac" = true ; then |
49 |
elif test "$bmac" = true ; then |
| 49 |
LIB_WS32= |
50 |
LIB_WS32= |
| 50 |
LIB_GDI32= |
51 |
@@ -149,6 +166,26 @@ elif test "$bmac" = true ; then |
| 51 |
@@ -148,6 +165,26 @@ elif test "$bmac" = true ; then |
|
|
| 52 |
LIB_MAC="-framework CoreServices" |
52 |
LIB_MAC="-framework CoreServices" |
| 53 |
LIB_CRYPT32= |
53 |
LIB_CRYPT32= |
| 54 |
LIB_ICONV=-liconv |
54 |
LIB_ICONV=-liconv |
|
Lines 75-81
Link Here
|
| 75 |
else |
75 |
else |
| 76 |
LIB_WS32= |
76 |
LIB_WS32= |
| 77 |
LIB_GDI32= |
77 |
LIB_GDI32= |
| 78 |
@@ -161,6 +198,9 @@ else |
78 |
@@ -162,6 +199,9 @@ else |
| 79 |
LIB_MAC= |
79 |
LIB_MAC= |
| 80 |
MSVC_CFLAGS= |
80 |
MSVC_CFLAGS= |
| 81 |
LIB_CRYPT32= |
81 |
LIB_CRYPT32= |
|
Lines 85-91
Link Here
|
| 85 |
fi |
85 |
fi |
| 86 |
|
86 |
|
| 87 |
AC_SUBST(LIB_WS32) |
87 |
AC_SUBST(LIB_WS32) |
| 88 |
@@ -173,6 +213,9 @@ AC_SUBST(LIB_IPHLPAPI) |
88 |
@@ -174,6 +214,9 @@ AC_SUBST(LIB_IPHLPAPI) |
| 89 |
AC_SUBST(LIB_SHELL32) |
89 |
AC_SUBST(LIB_SHELL32) |
| 90 |
AC_SUBST(LIB_PSAPI) |
90 |
AC_SUBST(LIB_PSAPI) |
| 91 |
AC_SUBST(LIB_MAC) |
91 |
AC_SUBST(LIB_MAC) |
|
Lines 95-101
Link Here
|
| 95 |
AC_SUBST(MSVC_CFLAGS) |
95 |
AC_SUBST(MSVC_CFLAGS) |
| 96 |
AC_SUBST(LIB_CRYPT32) |
96 |
AC_SUBST(LIB_CRYPT32) |
| 97 |
AC_SUBST(LIB_ICONV) |
97 |
AC_SUBST(LIB_ICONV) |
| 98 |
@@ -187,7 +230,9 @@ ZDB_REQUIRED=2.10 |
98 |
@@ -188,7 +231,9 @@ ZDB_REQUIRED=2.10 |
| 99 |
#LIBNAUTILUS_EXTENSION_REQUIRED=2.30.1 |
99 |
#LIBNAUTILUS_EXTENSION_REQUIRED=2.30.1 |
| 100 |
CURL_REQUIRED=7.17 |
100 |
CURL_REQUIRED=7.17 |
| 101 |
FUSE_REQUIRED=2.7.3 |
101 |
FUSE_REQUIRED=2.7.3 |
|
Lines 105-111
Link Here
|
| 105 |
|
105 |
|
| 106 |
PKG_CHECK_MODULES(SSL, [openssl]) |
106 |
PKG_CHECK_MODULES(SSL, [openssl]) |
| 107 |
AC_SUBST(SSL_CFLAGS) |
107 |
AC_SUBST(SSL_CFLAGS) |
| 108 |
@@ -217,9 +262,11 @@ PKG_CHECK_MODULES(LIBEVENT, [libevent >= |
108 |
@@ -218,9 +263,11 @@ PKG_CHECK_MODULES(LIBEVENT, [libevent >= |
| 109 |
AC_SUBST(LIBEVENT_CFLAGS) |
109 |
AC_SUBST(LIBEVENT_CFLAGS) |
| 110 |
AC_SUBST(LIBEVENT_LIBS) |
110 |
AC_SUBST(LIBEVENT_LIBS) |
| 111 |
|
111 |
|
|
Lines 116-119
Link Here
|
| 116 |
+fi |
116 |
+fi |
| 117 |
|
117 |
|
| 118 |
if test x${compile_python} = xyes; then |
118 |
if test x${compile_python} = xyes; then |
| 119 |
AM_PATH_PYTHON([2.6]) |
119 |
AM_PATH_PYTHON([2.6]) |