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

Adjust build for libzrtp changes 

libzrtp now builds from its root directory rather from projects/gnu.
This commit is contained in:
Travis Cross 2013-02-10 23:47:38 +00:00
parent b03636f0cf
commit e5a1b54e9e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.am
View File

@ -159,11 +159,11 @@ CORE_CFLAGS += -I$(switch_srcdir)/libs/libzrtp/third_party/bgaes
CORE_CFLAGS += -I$(switch_srcdir)/libs/libzrtp/third_party/bnlib CORE_CFLAGS += -I$(switch_srcdir)/libs/libzrtp/third_party/bnlib
CORE_CFLAGS += -isystem $(switch_srcdir)/libs/libzrtp/include CORE_CFLAGS += -isystem $(switch_srcdir)/libs/libzrtp/include
ZRTP_LDFLAGS = -L$(switch_srcdir)/libs/libzrtp/third_party/bnlib ZRTP_LDFLAGS = -L$(switch_srcdir)/libs/libzrtp/third_party/bnlib
ZRTP_LDFLAGS += -L$(switch_srcdir)/libs/libzrtp/projects/gnu/build ZRTP_LDFLAGS += -L$(switch_srcdir)/libs/libzrtp
ZRTP_LIBS = -lbn -lzrtp ZRTP_LIBS = -lbn -lzrtp
libfreeswitch_la_LDFLAGS += $(ZRTP_LDFLAGS) libfreeswitch_la_LDFLAGS += $(ZRTP_LDFLAGS)
libfreeswitch_la_LIBADD += $(ZRTP_LIBS) libfreeswitch_la_LIBADD += $(ZRTP_LIBS)
CORE_LIBS += libs/libzrtp/projects/gnu/build/libzrtp.a CORE_LIBS += libs/libzrtp/libzrtp.a
LIBS += libs/libzrtp/third_party/bnlib/libbn.a LIBS += libs/libzrtp/third_party/bnlib/libbn.a
endif endif
@ -441,8 +441,8 @@ src/include/switch_version.h: src/include/switch_version.h.in Makefile build/pri
libs/libedit/src/.libs/libedit.a: libs/libedit/src/.libs/libedit.a:
cd libs/libedit && $(MAKE) cd libs/libedit && $(MAKE)
libs/libzrtp/projects/gnu/build/libzrtp.a: libs/libzrtp/libzrtp.a:
cd libs/libzrtp/projects/gnu && $(MAKE) cd libs/libzrtp && $(MAKE)
libs/sofia-sip/Makefile: libs/sofia-sip/Makefile:
cd libs/sofia-sip && sh ./configure.gnu --prefix=$(prefix) cd libs/sofia-sip && sh ./configure.gnu --prefix=$(prefix)

2
bootstrap.sh
View File

@ -347,7 +347,7 @@ bootstrap_apr() {
} }
bootstrap_libzrtp() { bootstrap_libzrtp() {
(cd ${LIBDIR}/libzrtp/projects/gnu && ./bootstrap.sh) (cd ${LIBDIR}/libzrtp && ./bootstrap.sh)
} }
# Libs automake automation function # Libs automake automation function

2
configure.in
View File

@ -1181,7 +1181,7 @@ AC_CONFIG_SUBDIRS([libs/libg722_1])
AC_CONFIG_SUBDIRS([libs/silk]) AC_CONFIG_SUBDIRS([libs/silk])
AC_CONFIG_SUBDIRS([libs/libcodec2]) AC_CONFIG_SUBDIRS([libs/libcodec2])
if test "x${enable_zrtp}" = "xyes"; then if test "x${enable_zrtp}" = "xyes"; then
AC_CONFIG_SUBDIRS([libs/libzrtp/projects/gnu]) AC_CONFIG_SUBDIRS([libs/libzrtp])
fi fi
AC_CONFIG_SUBDIRS([libs/libwebsockets]) AC_CONFIG_SUBDIRS([libs/libwebsockets])