mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git
synced 2025-08-26 23:12:44 +02:00
acinclude: fix variable expansion issues
Origin commit data
------------------
Branch: master
Commit: 2b23273b0e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
20
acinclude.m4
20
acinclude.m4
@@ -57,21 +57,33 @@ check_path () {
|
|||||||
|
|
||||||
])
|
])
|
||||||
|
|
||||||
|
dnl expand nested ${foo}/bar
|
||||||
|
AC_DEFUN([TUXBOX_EXPAND_VARIABLE],[__$1="$2"
|
||||||
|
for __CNT in false false false false true; do dnl max 5 levels of indirection
|
||||||
|
|
||||||
|
$1=`eval echo "$__$1"`
|
||||||
|
echo ${$1} | grep -q '\$' || break # 'grep -q' is POSIX, exit if no $ in variable
|
||||||
|
__$1="${$1}"
|
||||||
|
done
|
||||||
|
$__CNT && AC_MSG_ERROR([can't expand variable $1=$2]) dnl bail out if we did not expand
|
||||||
|
])
|
||||||
|
|
||||||
AC_DEFUN([TUXBOX_APPS_DIRECTORY_ONE],[
|
AC_DEFUN([TUXBOX_APPS_DIRECTORY_ONE],[
|
||||||
AC_ARG_WITH($1,[ $6$7 [[PREFIX$4$5]]],[
|
AC_ARG_WITH($1,[ $6$7 [[PREFIX$4$5]]],[
|
||||||
_$2=$withval
|
_$2=$withval
|
||||||
if test "$TARGET" = "cdk"; then
|
if test "$TARGET" = "cdk"; then
|
||||||
$2=`eval echo "${targetprefix}$withval"`
|
$2=`eval echo "${targetprefix}$withval"` # no indirection possible IMNSHO
|
||||||
else
|
else
|
||||||
$2=$withval
|
$2=$withval
|
||||||
fi
|
fi
|
||||||
TARGET_$2=${$2}
|
TARGET_$2=${$2}
|
||||||
],[
|
],[
|
||||||
$2="\${$3}$5"
|
# RFC 1925: "you can always add another level of indirection..."
|
||||||
|
TUXBOX_EXPAND_VARIABLE($2,"${$3}$5")
|
||||||
if test "$TARGET" = "cdk"; then
|
if test "$TARGET" = "cdk"; then
|
||||||
_$2=`eval echo "${target$3}$5"`
|
TUXBOX_EXPAND_VARIABLE(_$2,"${target$3}$5")
|
||||||
else
|
else
|
||||||
_$2=`eval echo "${$3}$5"`
|
_$2=${$2}
|
||||||
fi
|
fi
|
||||||
TARGET_$2=$_$2
|
TARGET_$2=$_$2
|
||||||
])
|
])
|
||||||
|
Reference in New Issue
Block a user