adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Even more fixes.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3239 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
Meep-Eep
2009-10-24 17:56:13 +00:00
parent bb2513fc06
commit 005cbd6656
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/build/unix/config_functions
+10 -10
View File
@@ -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.