FS-3182: fix mod_dingaling/iksemel/gnutls link error when using newer autotools

diff --git a/acinclude.m4 b/acinclude.m4
index 705b9458b57d363cc7966588a8e16dc97a585a43..aeba17b5c32f54c13dca2d0b15a3475897911c0c 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -12,4 +12,5 @@ m4_include([build/config/sched_setaffinity.m4])
 m4_include([libs/apr/build/apr_common.m4])
 m4_include([libs/sofia-sip/m4/sac-pkg-config.m4])
 m4_include([libs/sofia-sip/m4/sac-openssl.m4])
+m4_include([libs/iksemel/build/libgnutls.m4])
 m4_include([build/config/libcurl.m4])

diff --git a/build/modmake.rules.in b/build/modmake.rules.in
index f1b30c8a188e725f312176d46724cdcc8a280c9d..51923ec3dd7377e31ae7d07073a3443e5f69cf1a 100644 (file)
--- a/build/modmake.rules.in
+++ b/build/modmake.rules.in
@@ -27,6 +27,7 @@ INSTALL=@INSTALL@
 GETLIB=@GETLIB@
 LIBTOOL=@LIBTOOL@
 AR=@AR@
+LIBGNUTLS_LIBS=@LIBGNUTLS_LIBS@
 LTINSTALL=$(LIBTOOL) --quiet --mode=install $(INSTALL) 
 LTUNINSTALL=$(LIBTOOL) --mode=uninstall rm -f 
 CCLD = $(CC)

diff --git a/configure.in b/configure.in
index d56116a9a6bf42ec41b6db7304501f5a2459f0ed..4ae6dc7b59b722c0e76e1e5d645e67dbc12641b8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -144,6 +144,8 @@ if test "${enable_optimizer}" = "yes" ; then
         AX_CC_MAXOPT
 fi
 
+AX_PATH_LIBGNUTLS()
+
 # set defaults for use on all platforms
 SWITCH_AM_CFLAGS="-I${switch_srcdir}/src/include -I${switch_builddir}/src/include -I${switch_srcdir}/libs/libteletone/src"
 SWITCH_AM_CXXFLAGS="-I${switch_srcdir}/src/include -I${switch_builddir}/src/include -I${switch_srcdir}/libs/libteletone/src"

diff --git a/src/mod/endpoints/mod_dingaling/Makefile b/src/mod/endpoints/mod_dingaling/Makefile
index d23c3b200c12090748054652ff134f90cba9c903..f2ac13bb7a8b295d601b8a4b0d7202b415c599dc 100644 (file)
--- a/src/mod/endpoints/mod_dingaling/Makefile
+++ b/src/mod/endpoints/mod_dingaling/Makefile
@@ -10,8 +10,10 @@ DING_DIR=$(BASE)/libs/libdingaling
 LOCAL_CFLAGS += -I$(DING_DIR)/src -I$(BASE)/libs/iksemel/include
 LOCAL_OBJS=$(DING_DIR)/src/libdingaling.o $(DING_DIR)/src/sha1.o $(IKS_LA)
 LOCAL_SOURCES=$(DING_DIR)/src/libdingaling.c $(DING_DIR)/src/sha1.c
+LOCAL_LDFLAGS=$(LIBGNUTLS_LIBS)
 include $(BASE)/build/modmake.rules
 
+
 $(IKS_LA): $(IKS_DIR) $(IKS_DIR)/.update
        @cd $(IKS_DIR) && $(MAKE)
        @$(TOUCH_TARGET)