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

More fixes.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3238 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
Meep-Eep
2009-10-24 17:50:49 +00:00
parent 4eb191e859
commit bb2513fc06
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/build/unix/config_functions
+5 -5
View File
@@ -273,7 +273,7 @@ EOF
# This only makes sure the PROG_xxx_PRESENT flag is set. # This only makes sure the PROG_xxx_PRESENT flag is set.
# It does not bail out if a dependency is not found. # It does not bail out if a dependency is not found.
# This function is called for programs in # 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 # Using have_program in the respective depend functions would
# not save the PRESENT flag, as it is executed in a subshell. # not save the PRESENT flag, as it is executed in a subshell.
# Arguments: $1 - the list of programs # Arguments: $1 - the list of programs
@@ -322,9 +322,9 @@ have_program() {
TEMP_DETECT=`evalVar PROG_${PROG}_DETECT` TEMP_DETECT=`evalVar PROG_${PROG}_DETECT`
if [ -n "$TEMP_DETECT" ]; then 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` 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" detect_dependencies_library "$TEMP_DEPEND_LIB"
$TEMP_DETECT $TEMP_DETECT
# NB. TEMP_DETECT should make sure PROG_${PROG}_VERSION and # NB. TEMP_DETECT should make sure PROG_${PROG}_VERSION and
@@ -472,9 +472,9 @@ have_library() {
TEMP_DETECT=`evalVar LIB_${LIB}_DETECT` TEMP_DETECT=`evalVar LIB_${LIB}_DETECT`
if [ -n "$TEMP_DETECT" ]; then 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` 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" detect_dependencies_library "$TEMP_DEPEND_LIB"
$TEMP_DETECT $TEMP_DETECT
# NB. TEMP_DETECT should make sure PROG_$LIB_VERSION is set. # NB. TEMP_DETECT should make sure PROG_$LIB_VERSION is set.