mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-12-15 08:56:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-sys: Update orc.m4 to latest upstream version

Browse source 
ORCC is now correctly set to orcc on build system instead of host for cross-compiling
This commit is contained in:
Maarten Bosmans 2011-06-23 22:21:06 +02:00 • committed by Colin Guthrie
parent ebf93404b6
commit f04331fa15
1 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
m4/orc.m4
View file

@ -5,7 +5,7 @@ dnl ORC_CHECK([REQUIRED_VERSION])
AC_DEFUN([ORC_CHECK], AC_DEFUN([ORC_CHECK],
[ [
ORC_REQ=ifelse([$1], , "0.4.5", [$1]) ORC_REQ=ifelse([$1], , "0.4.6", [$1])
AC_ARG_ENABLE(orc, AC_ARG_ENABLE(orc,
AC_HELP_STRING([--enable-orc],[use Orc if installed]), AC_HELP_STRING([--enable-orc],[use Orc if installed]),
@ -21,21 +21,34 @@ AC_DEFUN([ORC_CHECK],
if test "x$enable_orc" != "xno" ; then if test "x$enable_orc" != "xno" ; then
PKG_CHECK_MODULES(ORC, orc-0.4 >= $ORC_REQ, [ PKG_CHECK_MODULES(ORC, orc-0.4 >= $ORC_REQ, [
AC_DEFINE(HAVE_ORC, 1, [Use Orc]) AC_DEFINE(HAVE_ORC, 1, [Use Orc])
ORCC=`$PKG_CONFIG --variable=orcc orc-0.4`
AC_SUBST(ORCC)
HAVE_ORC=yes HAVE_ORC=yes
if test "x$ORCC" = "x" ; then
AC_MSG_CHECKING(for usable orcc)
ORCC=`$PKG_CONFIG --variable=orcc orc-0.4`
dnl check whether the orcc found by pkg-config can be run from the build environment
dnl if this is not the case (e.g. when cross-compiling) fall back to orcc from PATH
AS_IF([$ORCC --version 1> /dev/null 2> /dev/null], [], [ORCC=`which orcc`])
AC_MSG_RESULT($ORCC)
fi
AC_SUBST(ORCC)
ORCC_FLAGS="--compat $ORC_REQ"
AC_SUBST(ORCC_FLAGS)
AS_IF([test "x$ORCC" = "x"], [HAVE_ORCC=no], [HAVE_ORCC=yes])
], [ ], [
if test "x$enable_orc" = "xyes" ; then if test "x$enable_orc" = "xyes" ; then
AC_MSG_ERROR([--enable-orc specified, but Orc >= $ORC_REQ not found]) AC_MSG_ERROR([--enable-orc specified, but Orc >= $ORC_REQ not found])
fi fi
AC_DEFINE(DISABLE_ORC, 1, [Disable Orc]) AC_DEFINE(DISABLE_ORC, 1, [Disable Orc])
HAVE_ORC=no HAVE_ORC=no
HAVE_ORCC=no
]) ])
else else
AC_DEFINE(DISABLE_ORC, 1, [Disable Orc]) AC_DEFINE(DISABLE_ORC, 1, [Disable Orc])
HAVE_ORC=no HAVE_ORC=no
HAVE_ORCC=no
fi fi
AM_CONDITIONAL(HAVE_ORC, test "x$HAVE_ORC" = "xyes") AM_CONDITIONAL(HAVE_ORC, [test "x$HAVE_ORC" = "xyes"])
AM_CONDITIONAL(HAVE_ORCC, [test "x$HAVE_ORCC" = "xyes"])
])) ]))