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

A few corrections.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3237 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
Meep-Eep
2009-10-24 17:44:34 +00:00
parent 2362c376a4
commit 4eb191e859
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_PROG or LIB_xxx_DEPEND_PROG. # PROG_xxx_DEPEND_DETECT_BIN or LIB_xxx_DEPEND_PROG.
# 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
@@ -306,7 +306,7 @@ detect_dependencies_library() {
# "BIN_" # "BIN_"
have_program() { have_program() {
local PROG TEMP_NAME TEMP_FILE TEMP_VERSION TEMP_PRESENT TEMP_DETECT local PROG TEMP_NAME TEMP_FILE TEMP_VERSION TEMP_PRESENT TEMP_DETECT
local TEMP_DEPEND_DETECT_PROG TEMP_DEPEND_DETECT_LIB local TEMP_DEPEND_DETECT_BIN TEMP_DEPEND_DETECT_LIB
PROG="$1" PROG="$1"
TEMP_NAME=`evalVar PROG_${PROG}_NAME` TEMP_NAME=`evalVar PROG_${PROG}_NAME`
@@ -322,7 +322,7 @@ 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_PROG` TEMP_DEPEND_PROG=`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_PROG"
detect_dependencies_library "$TEMP_DEPEND_LIB" detect_dependencies_library "$TEMP_DEPEND_LIB"
@@ -456,7 +456,7 @@ have_build_tools_language() {
have_library() { have_library() {
local LIB TEMP_NAME TEMP_PRESENT TEMP_LDFLAGS TEMP_CFLAGS \ local LIB TEMP_NAME TEMP_PRESENT TEMP_LDFLAGS TEMP_CFLAGS \
TEMP_VERSION TEMP_DETECT TEMP_VERSION TEMP_DETECT
local TEMP_DEPEND_DETECT_PROG TEMP_DEPEND_DETECT_LIB local TEMP_DEPEND_DETECT_BIN TEMP_DEPEND_DETECT_LIB
LIB="$1" LIB="$1"
TEMP_NAME=`evalVar LIB_${LIB}_NAME` TEMP_NAME=`evalVar LIB_${LIB}_NAME`
@@ -472,7 +472,7 @@ 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_PROG` TEMP_DEPEND_PROG=`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_PROG"
detect_dependencies_library "$TEMP_DEPEND_LIB" detect_dependencies_library "$TEMP_DEPEND_LIB"