| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758 |
- diff --git a/configure.ac b/configure.ac
- index d7ebba9..3c1be4b 100644
- --- a/configure.ac
- +++ b/configure.ac
- @@ -241,6 +241,7 @@ APPINDICATOR_REQUIRED=0.0.7
- GLIB_REQUIRED=2.16.0
- GTK_REQUIRED=2.16.0
- SEARPC_REQUIRED=1.0
- +JANSSON_REQUIRED=2.2.1
- ZDB_REQUIRED=2.10
- LIBNAUTILUS_EXTENSION_REQUIRED=2.30.1
- SEARPC_REQUIRED=1.0
- @@ -262,6 +263,10 @@ PKG_CHECK_MODULES(SEARPC, [libsearpc >= $SEARPC_REQUIRED])
- AC_SUBST(SEARPC_CFLAGS)
- AC_SUBST(SEARPC_LIBS)
-
- +PKG_CHECK_MODULES(JANSSON, [jansson >= $JANSSON_REQUIRED])
- +AC_SUBST(JANSSON_CFLAGS)
- +AC_SUBST(JANSSON_LIBS)
- +
- PKG_CHECK_MODULES(LIBEVENT, [libevent >= $LIBEVENT_REQUIRED])
- AC_SUBST(LIBEVENT_CFLAGS)
- AC_SUBST(LIBEVENT_LIBS)
- diff --git a/net/daemon/Makefile.am b/net/daemon/Makefile.am
- index b8e745f..1321dfc 100644
- --- a/net/daemon/Makefile.am
- +++ b/net/daemon/Makefile.am
- @@ -95,7 +95,7 @@ ccnet_SOURCES = ccnet-daemon.c \
-
- ccnet_LDADD = @LIBEVENT_LIBS@ $(top_builddir)/lib/libccnetd.la \
- @GLIB2_LIBS@ @GOBJECT_LIBS@ @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ -lsqlite3 \
- - @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@
- + @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@ @JANSSON_LIBS@
-
-
- ccnet_LDFLAGS = @STATIC_COMPILE@ @CONSOLE@ @SERVER_PKG_RPATH@ -no-undefined
- @@ -106,7 +106,7 @@ ccnet_test_SOURCES = ccnet-test.c daemon-session.c $(common_srcs)
-
- ccnet_test_LDADD = @LIBEVENT_LIBS@ $(top_builddir)/lib/libccnetd.la \
- @GLIB2_LIBS@ @GOBJECT_LIBS@ @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ -lsqlite3 \
- - @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@
- + @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@ @JANSSON_LIBS@
-
- ccnet_test_LDFLAGS = @STATIC_COMPILE@ -no-undefined @CONSOLE@
-
- diff --git a/net/server/Makefile.am b/net/server/Makefile.am
- index da98420..867a1ff 100644
- --- a/net/server/Makefile.am
- +++ b/net/server/Makefile.am
- @@ -103,7 +103,7 @@ ccnet_server_LDADD = @LIBEVENT_LIBS@ $(top_builddir)/lib/libccnetd.la \
- @GLIB2_LIBS@ @GOBJECT_LIBS@ @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ -lsqlite3 \
- -lpthread \
- @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@ @ZDB_LIBS@ \
- - @LDAP_LIBS@
- + @LDAP_LIBS@ @JANSSON_LIBS@
-
-
- ccnet_server_LDFLAGS = @STATIC_COMPILE@ @CONSOLE@ @SERVER_PKG_RPATH@ -no-undefined
|
