FS-6293: unimrcp srcdir build working

diff --git a/libs/unimrcp/configure.ac b/libs/unimrcp/configure.ac
index 4f112af0340a66b71fde07cb6dac57c56ce738aa..e59de1e3c89dc897b2125f2e3dc4004667fd4da7 100644 (file)
--- a/libs/unimrcp/configure.ac
+++ b/libs/unimrcp/configure.ac
@@ -29,9 +29,9 @@ m4_defun([AC_PROG_F77],[])
 AC_PROG_LIBTOOL
 
 # Get version information
-get_version="build/get-version.sh"
-version_hdr="build/uni_version.h"
-plugin_version_hdr="libs/mrcp-engine/include/mrcp_engine_plugin.h"
+get_version="$srcdir/build/get-version.sh"
+version_hdr="$srcdir/build/uni_version.h"
+plugin_version_hdr="$srcdir/libs/mrcp-engine/include/mrcp_engine_plugin.h"
 UNI_DOTTED_VERSION="`$get_version all $version_hdr UNI`"
 UNI_LT_VERSION="-version-info `$get_version libtool $version_hdr UNI`"
 PLUGIN_LT_VERSION="-version-info `$get_version libtool $plugin_version_hdr PLUGIN`"
@@ -40,14 +40,14 @@ AC_SUBST(UNI_DOTTED_VERSION)
 AC_SUBST(UNI_LT_VERSION)
 AC_SUBST(PLUGIN_LT_VERSION)
 
+echo "UniMRCP Version: ${UNI_DOTTED_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
 UNIMRCP_CHECK_APR
 UNIMRCP_CHECK_APU

diff --git a/libs/unimrcp/platforms/libasr-client/Makefile.am b/libs/unimrcp/platforms/libasr-client/Makefile.am
index cf89280e353996b808aae02d23cb5361345fcbb5..58bde0f625b1a81a9e9b7b58cdcd9b417fc1c13c 100644 (file)
--- a/libs/unimrcp/platforms/libasr-client/Makefile.am
+++ b/libs/unimrcp/platforms/libasr-client/Makefile.am
@@ -1,6 +1,7 @@
 MAINTAINERCLEANFILES       = Makefile.in
 
 AM_CPPFLAGS                 = -Iinclude \
+                              -I$(unimrcp_srcdir)/platforms/libasr-client/include \
                               -I$(top_srcdir)/platforms/libunimrcp-client/include \
                               -I$(top_srcdir)/libs/mrcp-client/include \
                               -I$(top_srcdir)/libs/mrcp-signaling/include \

diff --git a/libs/unimrcp/platforms/umc/Makefile.am b/libs/unimrcp/platforms/umc/Makefile.am
index fa38077648e637df91961b39dd1dc40e586bb15b..7c3de34aaca57d3751455055f3c4348e2cad2326 100644 (file)
--- a/libs/unimrcp/platforms/umc/Makefile.am
+++ b/libs/unimrcp/platforms/umc/Makefile.am
@@ -1,6 +1,7 @@
 MAINTAINERCLEANFILES   = Makefile.in
 
 AM_CPPFLAGS            = -Iinclude \
+                         -I$(unimrcp_srcdir)/platforms/umc/include \
                          -I$(top_srcdir)/platforms/libunimrcp-client/include \
                          -I$(top_srcdir)/libs/mrcp-client/include \
                          -I$(top_srcdir)/libs/mrcp-signaling/include \

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