From: Michael Jerris <mike@jerris.com>
Date: Wed, 19 Mar 2014 19:04:41 +0000 (-0400)
Subject: FS-6293: unimrcp srcdir build working
X-Git-Tag: v1.5.12~383
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad28998235cd80672941f82db3f5403b87793b20;p=thirdparty%2Ffreeswitch.git

FS-6293: unimrcp srcdir build working
---

diff --git a/libs/unimrcp/configure.ac b/libs/unimrcp/configure.ac
index 4f112af034..e59de1e3c8 100644
--- 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 cf89280e35..58bde0f625 100644
--- 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 fa38077648..7c3de34aac 100644
--- 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 a8d86c6450..c0073b850b 100644
--- 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 \