Inicio Explorar Ayuda
Iniciar sesión
aur
/
ccnet
Seguir 2
Destacar 0
Fork 0
Archivos Incidencias 0 Pull Requests 0 Wiki
Árbol: b7f2c2ab72
Ramas Etiquetas
ccnet
/
autoconfiguration-for-libjansson.patch

autoconfiguration-for-libjansson.patch 2.2 KB
Histórico Raw

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758 
  1. diff --git a/configure.ac b/configure.ac
    2. 

  2. index d7ebba9..3c1be4b 100644
    3. 

  3. --- a/configure.ac
    4. 

  4. +++ b/configure.ac
    5. 

  5. @@ -241,6 +241,7 @@ APPINDICATOR_REQUIRED=0.0.7
    6. 

  6.  GLIB_REQUIRED=2.16.0
    7. 

  7.  GTK_REQUIRED=2.16.0
    8. 

  8.  SEARPC_REQUIRED=1.0
    9. 

  9. +JANSSON_REQUIRED=2.2.1
    10. 

  10.  ZDB_REQUIRED=2.10
    11. 

  11.  LIBNAUTILUS_EXTENSION_REQUIRED=2.30.1
    12. 

  12.  SEARPC_REQUIRED=1.0
    13. 

  13. @@ -262,6 +263,10 @@ PKG_CHECK_MODULES(SEARPC, [libsearpc >= $SEARPC_REQUIRED])
    14. 

  14.  AC_SUBST(SEARPC_CFLAGS)
    15. 

  15.  AC_SUBST(SEARPC_LIBS)
    16. 

  16.  
    17. 

  17. +PKG_CHECK_MODULES(JANSSON, [jansson >= $JANSSON_REQUIRED])
    18. 

  18. +AC_SUBST(JANSSON_CFLAGS)
    19. 

  19. +AC_SUBST(JANSSON_LIBS)
    20. 

  20. +
    21. 

  21.  PKG_CHECK_MODULES(LIBEVENT, [libevent >= $LIBEVENT_REQUIRED])
    22. 

  22.  AC_SUBST(LIBEVENT_CFLAGS)
    23. 

  23.  AC_SUBST(LIBEVENT_LIBS)
    24. 

  24. diff --git a/net/daemon/Makefile.am b/net/daemon/Makefile.am
    25. 

  25. index b8e745f..1321dfc 100644
    26. 

  26. --- a/net/daemon/Makefile.am
    27. 

  27. +++ b/net/daemon/Makefile.am
    28. 

  28. @@ -95,7 +95,7 @@ ccnet_SOURCES = ccnet-daemon.c \
    29. 

  29.  
    30. 

  30.  ccnet_LDADD = @LIBEVENT_LIBS@ $(top_builddir)/lib/libccnetd.la \
    31. 

  31.             @GLIB2_LIBS@ @GOBJECT_LIBS@ @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ -lsqlite3 \
    32. 

  32. -           @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@
    33. 

  33. +           @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@ @JANSSON_LIBS@
    34. 

  34.  
    35. 

  35.  
    36. 

  36.  ccnet_LDFLAGS = @STATIC_COMPILE@ @CONSOLE@ @SERVER_PKG_RPATH@ -no-undefined
    37. 

  37. @@ -106,7 +106,7 @@ ccnet_test_SOURCES = ccnet-test.c daemon-session.c $(common_srcs)
    38. 

  38.  
    39. 

  39.  ccnet_test_LDADD = @LIBEVENT_LIBS@ $(top_builddir)/lib/libccnetd.la \
    40. 

  40.  	@GLIB2_LIBS@ @GOBJECT_LIBS@ @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ -lsqlite3 \
    41. 

  41. -	@LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@
    42. 

  42. +	@LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@ @JANSSON_LIBS@
    43. 

  43.  
    44. 

  44.  ccnet_test_LDFLAGS = @STATIC_COMPILE@ -no-undefined @CONSOLE@
    45. 

  45.  
    46. 

  46. diff --git a/net/server/Makefile.am b/net/server/Makefile.am
    47. 

  47. index da98420..867a1ff 100644
    48. 

  48. --- a/net/server/Makefile.am
    49. 

  49. +++ b/net/server/Makefile.am
    50. 

  50. @@ -103,7 +103,7 @@ ccnet_server_LDADD = @LIBEVENT_LIBS@ $(top_builddir)/lib/libccnetd.la \
    51. 

  51.             @GLIB2_LIBS@ @GOBJECT_LIBS@ @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ -lsqlite3 \
    52. 

  52.  	       -lpthread \
    53. 

  53.             @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@ @ZDB_LIBS@ \
    54. 

  54. -	  	   @LDAP_LIBS@
    55. 

  55. +	  	   @LDAP_LIBS@ @JANSSON_LIBS@
    56. 

  56.  
    57. 

  57.  
    58. 

  58.  ccnet_server_LDFLAGS = @STATIC_COMPILE@ @CONSOLE@ @SERVER_PKG_RPATH@ -no-undefined
    59.