kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Michael Jerris 2011-03-25 12:17:13 -05:00 committed by Brian West
parent e0eb284ef4
commit 294b077977
4 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
acinclude.m4
View File

@ -12,4 +12,5 @@ m4_include([build/config/sched_setaffinity.m4])
m4_include([libs/apr/build/apr_common.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-pkg-config.m4])
m4_include([libs/sofia-sip/m4/sac-openssl.m4]) m4_include([libs/sofia-sip/m4/sac-openssl.m4])
m4_include([libs/iksemel/build/libgnutls.m4])
m4_include([build/config/libcurl.m4]) m4_include([build/config/libcurl.m4])

1
build/modmake.rules.in
View File

@ -27,6 +27,7 @@ INSTALL=@INSTALL@
GETLIB=@GETLIB@ GETLIB=@GETLIB@
LIBTOOL=@LIBTOOL@ LIBTOOL=@LIBTOOL@
AR=@AR@ AR=@AR@
LIBGNUTLS_LIBS=@LIBGNUTLS_LIBS@
LTINSTALL=$(LIBTOOL) --quiet --mode=install $(INSTALL) LTINSTALL=$(LIBTOOL) --quiet --mode=install $(INSTALL)
LTUNINSTALL=$(LIBTOOL) --mode=uninstall rm -f LTUNINSTALL=$(LIBTOOL) --mode=uninstall rm -f
CCLD = $(CC) CCLD = $(CC)

2
configure.in
View File

@ -144,6 +144,8 @@ if test "${enable_optimizer}" = "yes" ; then
AX_CC_MAXOPT AX_CC_MAXOPT
fi fi
AX_PATH_LIBGNUTLS()
# set defaults for use on all platforms # 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_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" SWITCH_AM_CXXFLAGS="-I${switch_srcdir}/src/include -I${switch_builddir}/src/include -I${switch_srcdir}/libs/libteletone/src"

2
src/mod/endpoints/mod_dingaling/Makefile
View File

@ -10,8 +10,10 @@ DING_DIR=$(BASE)/libs/libdingaling
LOCAL_CFLAGS += -I$(DING_DIR)/src -I$(BASE)/libs/iksemel/include 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_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_SOURCES=$(DING_DIR)/src/libdingaling.c $(DING_DIR)/src/sha1.c
LOCAL_LDFLAGS=$(LIBGNUTLS_LIBS)
include $(BASE)/build/modmake.rules include $(BASE)/build/modmake.rules
$(IKS_LA): $(IKS_DIR) $(IKS_DIR)/.update $(IKS_LA): $(IKS_DIR) $(IKS_DIR)/.update
@cd $(IKS_DIR) && $(MAKE) @cd $(IKS_DIR) && $(MAKE)
@$(TOUCH_TARGET) @$(TOUCH_TARGET)