FS-6293: unimrcp start of srcdir build

diff --git a/libs/unimrcp/build/acmacros/sofia-sip.m4 b/libs/unimrcp/build/acmacros/sofia-sip.m4
index b2456dea474e10aa29f60e75f7a64318221fe1c2..95d6f5026215937a7357c5cdb1a328d1396c1b7b 100644 (file)
--- a/libs/unimrcp/build/acmacros/sofia-sip.m4
+++ b/libs/unimrcp/build/acmacros/sofia-sip.m4
@@ -17,6 +17,7 @@ AC_DEFUN([UNIMRCP_CHECK_SOFIA],
     sofiasrcdir="libsofia-sip-ua"
     for dir in $sofia_path ; do
         cd $dir && sofiadir=`pwd` && cd - > /dev/null
+       sofiadirsrc=`(cd $srcdir/$dir && pwd)`
         if test -f "$dir/$sofiaconfig"; then
             found_sofia="yes"
             UNIMRCP_SOFIA_INCLUDES="`pkg-config --cflags $dir/$sofiaconfig`"
@@ -26,7 +27,7 @@ AC_DEFUN([UNIMRCP_CHECK_SOFIA],
         fi
         if test -d "$dir/$sofiasrcdir"; then
             found_sofia="yes"
-            UNIMRCP_SOFIA_INCLUDES="-I$sofiadir/$sofiasrcdir -I$sofiadir/$sofiasrcdir/bnf -I$sofiadir/$sofiasrcdir/features -I$sofiadir/$sofiasrcdir/http -I$sofiadir/$sofiasrcdir/ipt -I$sofiadir/$sofiasrcdir/iptsec -I$sofiadir/$sofiasrcdir/msg -I$sofiadir/$sofiasrcdir/nea -I$sofiadir/$sofiasrcdir/nta -I$sofiadir/$sofiasrcdir/nth -I$sofiadir/$sofiasrcdir/nua -I$sofiadir/$sofiasrcdir/sdp -I$sofiadir/$sofiasrcdir/sip -I$sofiadir/$sofiasrcdir/soa -I$sofiadir/$sofiasrcdir/sresolv -I$sofiadir/$sofiasrcdir/stun -I$sofiadir/$sofiasrcdir/su -I$sofiadir/$sofiasrcdir/tport -I$sofiadir/$sofiasrcdir/url"
+            UNIMRCP_SOFIA_INCLUDES="-I$sofiadir/$sofiasrcdir -I$sofiadir/$sofiasrcdir/bnf -I$sofiadir/$sofiasrcdir/features -I$sofiadir/$sofiasrcdir/http -I$sofiadir/$sofiasrcdir/ipt -I$sofiadir/$sofiasrcdir/iptsec -I$sofiadir/$sofiasrcdir/msg -I$sofiadir/$sofiasrcdir/nea -I$sofiadir/$sofiasrcdir/nta -I$sofiadir/$sofiasrcdir/nth -I$sofiadir/$sofiasrcdir/nua -I$sofiadir/$sofiasrcdir/sdp -I$sofiadir/$sofiasrcdir/sip -I$sofiadir/$sofiasrcdir/soa -I$sofiadir/$sofiasrcdir/sresolv -I$sofiadir/$sofiasrcdir/stun -I$sofiadir/$sofiasrcdir/su -I$sofiadir/$sofiasrcdir/tport -I$sofiadir/$sofiasrcdir/url -I$sofiadirsrc/$sofiasrcdir -I$sofiadirsrc/$sofiasrcdir/bnf -I$sofiadirsrc/$sofiasrcdir/features -I$sofiadirsrc/$sofiasrcdir/http -I$sofiadirsrc/$sofiasrcdir/ipt -I$sofiadirsrc/$sofiasrcdir/iptsec -I$sofiadirsrc/$sofiasrcdir/msg -I$sofiadirsrc/$sofiasrcdir/nea -I$sofiadirsrc/$sofiasrcdir/nta -I$sofiadirsrc/$sofiasrcdir/nth -I$sofiadirsrc/$sofiasrcdir/nua -I$sofiadirsrc/$sofiasrcdir/sdp -I$sofiadirsrc/$sofiasrcdir/sip -I$sofiadirsrc/$sofiasrcdir/soa -I$sofiadirsrc/$sofiasrcdir/sresolv -I$sofiadirsrc/$sofiasrcdir/stun -I$sofiadirsrc/$sofiasrcdir/su -I$sofiadirsrc/$sofiasrcdir/tport -I$sofiadirsrc/$sofiasrcdir/url"
             UNIMRCP_SOFIA_LIBS="$sofiadir/$sofiasrcdir/libsofia-sip-ua.la"
            sofia_version="`pkg-config --modversion $sofiadir/packages/sofia-sip-ua.pc`"
             break

diff --git a/libs/unimrcp/configure.ac b/libs/unimrcp/configure.ac
index f0fa56f73749d8544602d20c9c3f5aa249cc6b41..4f112af0340a66b71fde07cb6dac57c56ce738aa 100644 (file)
--- a/libs/unimrcp/configure.ac
+++ b/libs/unimrcp/configure.ac
@@ -40,6 +40,12 @@ AC_SUBST(UNI_DOTTED_VERSION)
 AC_SUBST(UNI_LT_VERSION)
 AC_SUBST(PLUGIN_LT_VERSION)
 
+# Absolute source/build directory
+unimrcp_srcdir=`(cd $srcdir && pwd)`
+unimrcp_builddir=`pwd`
+AC_SUBST(unimrcp_srcdir)
+AC_SUBST(unimrcp_builddir)
+
 echo "UniMRCP Version: ${UNI_DOTTED_VERSION}"
 
 # Check APR

diff --git a/libs/unimrcp/modules/mrcp-sofiasip/Makefile.am b/libs/unimrcp/modules/mrcp-sofiasip/Makefile.am
index 841a220971d764f47806b4738937d872540dedff..ec0862f54d1f989f17d399fa524a44ed7ee110a4 100644 (file)
--- a/libs/unimrcp/modules/mrcp-sofiasip/Makefile.am
+++ b/libs/unimrcp/modules/mrcp-sofiasip/Makefile.am
@@ -1,6 +1,7 @@
 MAINTAINERCLEANFILES      = Makefile.in
 
 AM_CPPFLAGS                = -Iinclude \
+                             -I$(unimrcp_srcdir)/modules/mrcp-sofiasip/include \
                              -I$(top_srcdir)/libs/mrcpv2-transport/include \
                              -I$(top_srcdir)/libs/mrcp-signaling/include \
                              -I$(top_srcdir)/libs/mrcp/include \

diff --git a/libs/unimrcp/modules/mrcp-unirtsp/Makefile.am b/libs/unimrcp/modules/mrcp-unirtsp/Makefile.am
index 3879890d2fa9efc0a7e8877b6dacdbaf30b3602a..029233e4a4c5912f9cf38a6f11dc12f0ac97dd52 100644 (file)
--- a/libs/unimrcp/modules/mrcp-unirtsp/Makefile.am
+++ b/libs/unimrcp/modules/mrcp-unirtsp/Makefile.am
@@ -1,6 +1,7 @@
 MAINTAINERCLEANFILES      = Makefile.in
 
 AM_CPPFLAGS                = -Iinclude \
+                             -I$(unimrcp_srcdir)/modules/mrcp-unirtsp/include \
                              -I$(top_srcdir)/libs/mrcp-signaling/include \
                              -I$(top_srcdir)/libs/mrcp/include \
                              -I$(top_srcdir)/libs/mrcp/message/include \

diff --git a/libs/unimrcp/platforms/libunimrcp-client/Makefile.am b/libs/unimrcp/platforms/libunimrcp-client/Makefile.am
index a30db7b112d846431153575dd042d6895e932181..d6e73e49194e93fed6f23b0f0feac35051b09a9a 100644 (file)
--- a/libs/unimrcp/platforms/libunimrcp-client/Makefile.am
+++ b/libs/unimrcp/platforms/libunimrcp-client/Makefile.am
@@ -1,7 +1,7 @@
 MAINTAINERCLEANFILES       = Makefile.in
 
 AM_CPPFLAGS                 = -I$(top_srcdir)/platforms/libunimrcp-client/include \
-                              -I$(top_srcdir)/modules/mrcp-sofiasip/include \
+                              -I$(unimrcp_srcdir)/modules/mrcp-sofiasip/include \
                               -I$(top_srcdir)/modules/mrcp-unirtsp/include \
                               -I$(top_srcdir)/libs/mrcp-client/include \
                               -I$(top_srcdir)/libs/mrcp-signaling/include \

diff --git a/libs/unimrcp/platforms/libunimrcp-server/Makefile.am b/libs/unimrcp/platforms/libunimrcp-server/Makefile.am
index 4c8d91e20507cb997c4f4f949ea59f5e57d7e4cd..98ae5e53203d580fd3cddeffacff75608a07eb47 100644 (file)
--- a/libs/unimrcp/platforms/libunimrcp-server/Makefile.am
+++ b/libs/unimrcp/platforms/libunimrcp-server/Makefile.am
@@ -1,7 +1,7 @@
 MAINTAINERCLEANFILES       = Makefile.in
 
 AM_CPPFLAGS                 = -I$(top_srcdir)/platforms/libunimrcp-server/include \
-                              -I$(top_srcdir)/modules/mrcp-sofiasip/include \
+                              -I$(unimrcp_srcdir)/modules/mrcp-sofiasip/include \
                               -I$(top_srcdir)/modules/mrcp-unirtsp/include \
                               -I$(top_srcdir)/libs/mrcp-server/include \
                               -I$(top_srcdir)/libs/mrcp-engine/include \