37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
Author: David Barbion <davidb@230ruedubac.fr>
|
|
Description: Use shared object for libevhtp
|
|
Forwarded: https://github.com/haiwen/seafile-server/pull/12
|
|
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -224,6 +224,10 @@ PKG_CHECK_MODULES(LIBEVENT, [libevent_op
|
|
AC_SUBST(LIBEVENT_CFLAGS)
|
|
AC_SUBST(LIBEVENT_LIBS)
|
|
|
|
+PKG_CHECK_MODULES(LIBEVHTP, [evhtp])
|
|
+AC_SUBST(LIBEVHTP_CFLAGS)
|
|
+AC_SUBST(LIBEVHTP_LIBS)
|
|
+
|
|
PKG_CHECK_MODULES(ZLIB, [zlib >= $ZLIB_REQUIRED])
|
|
AC_SUBST(ZLIB_CFLAGS)
|
|
AC_SUBST(ZLIB_LIBS)
|
|
--- a/server/Makefile.am
|
|
+++ b/server/Makefile.am
|
|
@@ -13,6 +13,7 @@ AM_CFLAGS = -DPKGDATADIR=\"$(pkgdatadir)
|
|
@GLIB2_CFLAGS@ \
|
|
@MSVC_CFLAGS@ \
|
|
@LIBARCHIVE_CFLAGS@ \
|
|
+ @LIBEVHTP_CFLAGS@ \
|
|
@MYSQL_CFLAGS@ \
|
|
-Wall
|
|
|
|
@@ -73,7 +74,7 @@ seaf_server_SOURCES = \
|
|
|
|
seaf_server_LDADD = @CCNET_LIBS@ \
|
|
$(top_builddir)/lib/libseafile_common.la \
|
|
- @GLIB2_LIBS@ @GOBJECT_LIBS@ @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ -lsqlite3 @LIBEVENT_LIBS@ -levhtp \
|
|
+ -lonig @GLIB2_LIBS@ @GOBJECT_LIBS@ @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ -lsqlite3 @LIBEVENT_LIBS@ @LIBEVHTP_LIBS@ \
|
|
$(top_builddir)/common/cdc/libcdc.la \
|
|
@SEARPC_LIBS@ @JANSSON_LIBS@ ${LIB_WS32} @ZLIB_LIBS@ \
|
|
@LIBARCHIVE_LIBS@ @LIB_ICONV@ \
|