[svn-commits] seanbright: trunk r419077 - in /trunk: configure configure.ac

[SVN commits to the Digium repositories]

Author: seanbright
Date: Mon Jul 21 09:49:43 2014
New Revision: 419077

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=419077
Log:
Fix build when pjproject is installed in a non-standard location.

When configuring Asterisk to build against a version of pjproject installed
in a non-standard location, the checks for "PJSIP Transaction Group Lock
Support" and "PJSIP Media Stream Replacement Support" fail.  This is
because these secondary checks are not taking the CFLAGS and LIBS returned
by the pkg-config check into account.

Review: https://reviewboard.asterisk.org/r/3830

Modified:
    trunk/configure
    trunk/configure.ac

Modified: trunk/configure.ac
URL: http://svnview.digium.com/svn/asterisk/trunk/configure.ac?view=diff&rev=419077&r1=419076&r2=419077
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Mon Jul 21 09:49:43 2014
@@ -2041,9 +2041,15 @@
 
 AST_PKG_CONFIG_CHECK([PJPROJECT], [libpjproject])
 
-AST_EXT_LIB_CHECK([PJ_TRANSACTION_GRP_LOCK], [pjsip], [pjsip_tsx_create_uac2], [pjsip.h])
-
+AST_EXT_LIB_CHECK([PJ_TRANSACTION_GRP_LOCK], [pjsip], [pjsip_tsx_create_uac2], [pjsip.h], [$PJPROJECT_LIBS], [$PJPROJECT_CFLAGS])
+
+saved_cppflags="${CPPFLAGS}"
+saved_libs="${LIBS}"
+CPPFLAGS="${CPPFLAGS} ${PJPROJECT_CFLAGS}"
+LIBS="${LIBS} ${PJPROJECT_LIBS}"
 AST_C_COMPILE_CHECK([PJSIP_REPLACE_MEDIA_STREAM], [pjmedia_mod_offer_flag flag = PJMEDIA_SDP_NEG_ALLOW_MEDIA_CHANGE], [pjmedia.h])
+LIBS="${saved_libs}"
+CPPFLAGS="${saved_cppflags}"
 
 AST_EXT_LIB_CHECK([POPT], [popt], [poptStrerror], [popt.h])