blob: 87135c45c40a56506bad0fd60348601e1c581046 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
diff -Nurd libzrtpcpp-1.5.3/configure.ac libzrtpcpp-1.5.3/configure.ac
--- libzrtpcpp-1.5.3/configure.ac 2010-12-06 19:03:03.000000000 +0100
+++ libzrtpcpp-1.5.3/configure.ac 2011-01-13 21:33:29.000000000 +0100
@@ -151,14 +151,12 @@
if test "x$with_ccrtp" != xno; then
PKG_CHECK_MODULES(RTPSTACK, libccrtp1 >= 1.5.0, [
- RTPSTACK_LIBPATH=`pkg-config --variable=libdir libccrtp1`
- LIBS="-L$RTPSTACK_LIBPATH $RTPSTACK_LIBS $LIBS"
+ LIBS="$RTPSTACK_LIBS $LIBS"
CCXX_FLAGS="$CXXFLAGS $RTPSTACK_CFLAGS"
])
PKG_CHECK_MODULES(COMMON, libccgnu2 >= $REQUIRES)
CXXFLAGS="$CXXFLAGS $COMMON_CFLAGS"
- COMMON_LIBPATH=`pkg-config --variable=libdir libccgnu2`
- LIBS="-L$COMMON_LIBPATH $COMMON_LIBS $LIBS"
+ LIBS="$COMMON_LIBS $LIBS"
CRYPTOBACKEND="$CRYPTOBACKEND libccrtp1 >= 1.5.0"
fi
AM_CONDITIONAL(CCRTP_SUPPORT, test "${with_ccrtp}" = "yes")
diff -Nurd libzrtpcpp-1.5.3/src/libzrtpcpp/Makefile.am libzrtpcpp-1.5.3/src/libzrtpcpp/Makefile.am
--- libzrtpcpp-1.5.3/src/libzrtpcpp/Makefile.am 2010-12-05 19:17:43.000000000 +0100
+++ libzrtpcpp-1.5.3/src/libzrtpcpp/Makefile.am 2011-01-13 21:33:29.000000000 +0100
@@ -13,7 +13,7 @@
if CCRTP_SUPPORT
ccrtp_noinst =
-ccrtp_inst = ZrtpQueue.h ZrtpUserCallback.h zrtpccrtp.h TimeoutProvider.h
+ccrtp_inst = ZrtpQueue.h zrtpccrtp.h TimeoutProvider.h
endif
zrtpinclude_HEADERS = ZrtpCodes.h ZrtpCallback.h ZrtpUserCallback.h ZrtpConfigure.h ZrtpCWrapper.h $(ccrtp_inst)
|
