From e5a1b54e9e55284bd81414bfc00d642ad38f1d5d Mon Sep 17 00:00:00 2001
From: Travis Cross <tc@traviscross.com>
Date: Sun, 10 Feb 2013 23:47:38 +0000
Subject: [PATCH] Adjust build for libzrtp changes
libzrtp now builds from its root directory rather from projects/gnu.
---
Makefile.am | 8 ++++----
bootstrap.sh | 2 +-
configure.in | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index ab668b7082..c792e0caf4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 += -isystem $(switch_srcdir)/libs/libzrtp/include
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
libfreeswitch_la_LDFLAGS += $(ZRTP_LDFLAGS)
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
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:
cd libs/libedit && $(MAKE)
-libs/libzrtp/projects/gnu/build/libzrtp.a:
- cd libs/libzrtp/projects/gnu && $(MAKE)
+libs/libzrtp/libzrtp.a:
+ cd libs/libzrtp && $(MAKE)
libs/sofia-sip/Makefile:
cd libs/sofia-sip && sh ./configure.gnu --prefix=$(prefix)
diff --git a/bootstrap.sh b/bootstrap.sh
index f6d4cfd05a..cdf0711a7b 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -347,7 +347,7 @@ bootstrap_apr() {
}
bootstrap_libzrtp() {
- (cd ${LIBDIR}/libzrtp/projects/gnu && ./bootstrap.sh)
+ (cd ${LIBDIR}/libzrtp && ./bootstrap.sh)
}
# Libs automake automation function
diff --git a/configure.in b/configure.in
index dadc6aaafb..0c83d77d1d 100644
--- a/configure.in
+++ b/configure.in
@@ -1181,7 +1181,7 @@ AC_CONFIG_SUBDIRS([libs/libg722_1])
AC_CONFIG_SUBDIRS([libs/silk])
AC_CONFIG_SUBDIRS([libs/libcodec2])
if test "x${enable_zrtp}" = "xyes"; then
- AC_CONFIG_SUBDIRS([libs/libzrtp/projects/gnu])
+ AC_CONFIG_SUBDIRS([libs/libzrtp])
fi
AC_CONFIG_SUBDIRS([libs/libwebsockets])