qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-22 12:31:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move the prefix setup out of QF_PROCESS_NEED_subroutine.

Browse source 
And fix the macro's spelling, too :)

QF_PROCESS_NEED_subroutine needs too much knowledge to get the prefix
riight every time. Much easier to set it at invocation.
This commit is contained in:
Bill Currie 2012-02-10 18:15:00 +09:00
parent 4707706f5d
commit e513e29905
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
m4/quakeforge.m4
View file

@ -93,9 +93,8 @@ for qfn_lib in $2; do
done done
]) ])
AC_DEFUN([QF_PROCESS_NEED_subroutin], [ AC_DEFUN([QF_PROCESS_NEED_subroutine], [
qfn_pref="$1" qfn_pref="$1"
qfn_pref=${qfn_pref:+${qfn_pref}$2_}
qfn_suf="$3" qfn_suf="$3"
for qfn_need in $5; do for qfn_need in $5; do
if eval test x'"${$2_need_'${qfn_need}'}"' = xyes; then if eval test x'"${$2_need_'${qfn_need}'}"' = xyes; then
@ -109,11 +108,11 @@ AC_SUBST([$2_$4])
AC_DEFUN([QF_PROCESS_NEED_LIBS], [ AC_DEFUN([QF_PROCESS_NEED_LIBS], [
qfn_ext="$3" qfn_ext="$3"
qfn_ext=${qfn_ext:-la} qfn_ext=${qfn_ext:-la}
QF_PROCESS_NEED_subroutin([lib],[$1],[.${qfn_ext}],[libs],[$2]) QF_PROCESS_NEED_subroutine([lib$1_],[$1],[.${qfn_ext}],[libs],[$2])
]) ])
AC_DEFUN([QF_PROCESS_NEED_DIRS], [ AC_DEFUN([QF_PROCESS_NEED_DIRS], [
QF_PROCESS_NEED_subroutin([],[$1],[],[dirs],[$2]) QF_PROCESS_NEED_subroutine([],[$1],[],[dirs],[$2])
]) ])
AC_DEFUN([QF_WITH_TARGETS], [ AC_DEFUN([QF_WITH_TARGETS], [