From bb2513fc06611123400832e59b14e096d34760f9 Mon Sep 17 00:00:00 2001 From: Meep-Eep Date: Sat, 24 Oct 2009 17:50:49 +0000 Subject: [PATCH] More fixes. git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3238 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/build/unix/config_functions | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sc2/build/unix/config_functions b/sc2/build/unix/config_functions index 9b81c7277..bec5a3af3 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_PROG. +# PROG_xxx_DEPEND_DETECT_BIN or LIB_xxx_DEPEND_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 @@ -322,9 +322,9 @@ have_program() { TEMP_DETECT=`evalVar PROG_${PROG}_DETECT` if [ -n "$TEMP_DETECT" ]; then - TEMP_DEPEND_PROG=`evalVar PROG_${PROG}_DEPEND_DETECT_BIN` + TEMP_DEPEND_BIN=`evalVar PROG_${PROG}_DEPEND_DETECT_BIN` TEMP_DEPEND_LIB=`evalVar PROG_${PROG}_DEPEND_DETECT_LIB` - detect_dependencies_program "$TEMP_DEPEND_PROG" + detect_dependencies_program "$TEMP_DEPEND_BIN" detect_dependencies_library "$TEMP_DEPEND_LIB" $TEMP_DETECT # NB. TEMP_DETECT should make sure PROG_${PROG}_VERSION and @@ -472,9 +472,9 @@ have_library() { TEMP_DETECT=`evalVar LIB_${LIB}_DETECT` if [ -n "$TEMP_DETECT" ]; then - TEMP_DEPEND_PROG=`evalVar LIB_${LIB}_DEPEND_DETECT_BIN` + TEMP_DEPEND_BIN=`evalVar LIB_${LIB}_DEPEND_DETECT_BIN` TEMP_DEPEND_LIB=`evalVar LIB_${LIB}_DEPEND_DETECT_LIB` - detect_dependencies_program "$TEMP_DEPEND_PROG" + detect_dependencies_program "$TEMP_DEPEND_BIN" detect_dependencies_library "$TEMP_DEPEND_LIB" $TEMP_DETECT # NB. TEMP_DETECT should make sure PROG_$LIB_VERSION is set.