diff options
| author | Russell Bryant <russell@russellbryant.com> | 2010-09-06 20:10:58 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2010-09-06 20:10:58 +0000 |
| commit | 7f2a98a0876bb0169df9bffdac6b9a46a8fea584 (patch) | |
| tree | c8d86f4f20035b18e3f564b6365070deefa774d2 /configure.ac | |
| parent | b24f89548092a264bc4d34994cec71eaa9a49f66 (diff) | |
Merged revisions 285161-285162 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r285161 | russell | 2010-09-06 15:10:03 -0500 (Mon, 06 Sep 2010) | 4 lines
Fix libsrtp -fPIC check for when non-standard prefix is used.
Thanks to loompek in #asterisk for reporting the issue and testing this patch.
........
r285162 | russell | 2010-09-06 15:10:24 -0500 (Mon, 06 Sep 2010) | 1 line
regenerate configure script.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@285163 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 59efab72b..7706e8e22 100644 --- a/configure.ac +++ b/configure.ac @@ -1857,8 +1857,10 @@ if test "$PBX_SRTP" = "1"; then saved_libs="${LIBS}" saved_ldflags="${LDFLAGS}" - LIBS="${LIBS} -lsrtp" + saved_cflags="${CFLAGS}" + LIBS="${LIBS} ${SRTP_LIB}" LDFLAGS="${LDFLAGS} -shared -fPIC" + CFLAGS="${CFLAGS} ${SRTP_INCLUDE}" AC_MSG_CHECKING(for the ability of -lsrtp to be linked in a shared object) AC_LINK_IFELSE( [ @@ -1883,6 +1885,7 @@ then ) LIBS="${saved_libs}" LDFLAGS="${saved_ldflags}" + CFLAGS="${saved_cflags}" fi AST_EXT_TOOL_CHECK([GMIME], [gmime-config], [], [], [#include <gmime/gmime.h>], [gboolean q = g_mime_check_version(0,0,0);]) |