You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

40 lines
1.4 KiB

  1. Author: David Barbion <davidb@230ruedubac.fr>
  2. Description: Use shared object for libevhtp
  3. Forwarded: https://github.com/haiwen/seafile-server/pull/12
  4. Index: seafile-server/configure.ac
  5. ===================================================================
  6. --- seafile-server.orig/configure.ac
  7. +++ seafile-server/configure.ac
  8. @@ -218,6 +218,10 @@ PKG_CHECK_MODULES(LIBEVENT, [libevent >=
  9. AC_SUBST(LIBEVENT_CFLAGS)
  10. AC_SUBST(LIBEVENT_LIBS)
  11. +PKG_CHECK_MODULES(LIBEVHTP, [evhtp])
  12. +AC_SUBST(LIBEVHTP_CFLAGS)
  13. +AC_SUBST(LIBEVHTP_LIBS)
  14. +
  15. PKG_CHECK_MODULES(ZLIB, [zlib >= $ZLIB_REQUIRED])
  16. AC_SUBST(ZLIB_CFLAGS)
  17. AC_SUBST(ZLIB_LIBS)
  18. Index: seafile-server/server/Makefile.am
  19. ===================================================================
  20. --- seafile-server.orig/server/Makefile.am
  21. +++ seafile-server/server/Makefile.am
  22. @@ -13,6 +13,7 @@ AM_CFLAGS = -DPKGDATADIR=\"$(pkgdatadir)
  23. @GLIB2_CFLAGS@ \
  24. @MSVC_CFLAGS@ \
  25. @LIBARCHIVE_CFLAGS@ \
  26. + @LIBEVHTP_CFLAGS@ \
  27. -Wall
  28. bin_PROGRAMS = seaf-server
  29. @@ -114,7 +115,7 @@ seaf_server_SOURCES = \
  30. seaf_server_LDADD = @CCNET_LIBS@ \
  31. $(top_builddir)/lib/libseafile_common.la \
  32. - @GLIB2_LIBS@ @GOBJECT_LIBS@ @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ -lsqlite3 @LIBEVENT_LIBS@ -levhtp \
  33. + -lonig @GLIB2_LIBS@ @GOBJECT_LIBS@ @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ -lsqlite3 @LIBEVENT_LIBS@ @LIBEVHTP_LIBS@ \
  34. $(top_builddir)/common/cdc/libcdc.la \
  35. $(top_builddir)/common/db-wrapper/libdbwrapper.la \
  36. @SEARPC_LIBS@ @JANSSON_LIBS@ ${LIB_WS32} @ZLIB_LIBS@ \