FS-6293: unimrcp srcdir build working

This commit is contained in:
Michael Jerris 2014-03-19 15:04:41 -04:00
parent bda9a55d75
commit ad28998235
4 changed files with 8 additions and 5 deletions

View File

@ -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

View File

@ -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 \

View File

@ -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 \

View File

@ -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 \