From 005cbd665671209132073e06d008f2f8f944ce8e Mon Sep 17 00:00:00 2001 From: Meep-Eep Date: Sat, 24 Oct 2009 17:56:13 +0000 Subject: [PATCH] Even more fixes. git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3239 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/build/unix/config_functions | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sc2/build/unix/config_functions b/sc2/build/unix/config_functions index bec5a3af3..84bda3192 100644 --- a/sc2/build/unix/config_functions +++ b/sc2/build/unix/config_functions @@ -273,7 +273,7 @@ EOF # This only makes sure the PROG_xxx_PRESENT flag is set. # It does not bail out if a dependency is not found. # This function is called for programs in -# PROG_xxx_DEPEND_DETECT_BIN or LIB_xxx_DEPEND_BIN. +# PROG_xxx_DEPEND_DETECT_BIN or LIB_xxx_DEPEND_DETECT_BIN. # Using have_program in the respective depend functions would # not save the PRESENT flag, as it is executed in a subshell. # Arguments: $1 - the list of programs @@ -289,7 +289,7 @@ detect_dependencies_program() { # This only makes sure the LIB_xxx_PRESENT flag is set. # It does not bail out if a dependency is not found. # This function is called for libraries in -# PROG_xxx_DEPEND_DETECT_LIB or LIB_xxx_DEPEND_LIB. +# PROG_xxx_DEPEND_DETECT_LIB or LIB_xxx_DEPEND_DETECT_LIB. # Using have_library in the respective depend functions would # not save the PRESENT flag, as it is executed in a subshell. # Arguments: $1 - the list of libaries @@ -322,10 +322,10 @@ have_program() { TEMP_DETECT=`evalVar PROG_${PROG}_DETECT` if [ -n "$TEMP_DETECT" ]; then - TEMP_DEPEND_BIN=`evalVar PROG_${PROG}_DEPEND_DETECT_BIN` - TEMP_DEPEND_LIB=`evalVar PROG_${PROG}_DEPEND_DETECT_LIB` - detect_dependencies_program "$TEMP_DEPEND_BIN" - detect_dependencies_library "$TEMP_DEPEND_LIB" + TEMP_DEPEND_DETECT_BIN=`evalVar PROG_${PROG}_DEPEND_DETECT_BIN` + TEMP_DEPEND_DETECT_LIB=`evalVar PROG_${PROG}_DEPEND_DETECT_LIB` + detect_dependencies_program "$TEMP_DEPEND_DETECT_BIN" + detect_dependencies_library "$TEMP_DEPEND_DETECT_LIB" $TEMP_DETECT # NB. TEMP_DETECT should make sure PROG_${PROG}_VERSION and # PROG_${PROG}_FILE are set. @@ -472,10 +472,10 @@ have_library() { TEMP_DETECT=`evalVar LIB_${LIB}_DETECT` if [ -n "$TEMP_DETECT" ]; then - TEMP_DEPEND_BIN=`evalVar LIB_${LIB}_DEPEND_DETECT_BIN` - TEMP_DEPEND_LIB=`evalVar LIB_${LIB}_DEPEND_DETECT_LIB` - detect_dependencies_program "$TEMP_DEPEND_BIN" - detect_dependencies_library "$TEMP_DEPEND_LIB" + TEMP_DEPEND_DETECT_BIN=`evalVar LIB_${LIB}_DEPEND_DETECT_BIN` + TEMP_DEPEND_DETECT_LIB=`evalVar LIB_${LIB}_DEPEND_DETECT_LIB` + detect_dependencies_program "$TEMP_DEPEND_DETECT_BIN" + detect_dependencies_library "$TEMP_DEPEND_DETECT_LIB" $TEMP_DETECT # NB. TEMP_DETECT should make sure PROG_$LIB_VERSION is set. # return value of $TEMP_DETECT is used below.