Changeset 4158

Show
Ignore:
Timestamp:
Sat Dec 10 15:24:41 2005
Author:
mugur
Message:

fixed ticket:1580 - check4_functions out of date

Files:

Legend:

Unmodified
Added
Removed
Modified

  • trunk/campsite/install_conf/check4_functions

    r4089 r4158  
    534 534 is_checked stl && return 0  
    535 535 err_message="Could not find STL (Standard Template Library) files. Please install libstdc++-devel package."  
    536   stl_versions="3.1 3.2 3.2.1 3.2.2 3.2.3 3.3 3.3.0 3.3.1 3.3.2 3.3.3 3.3.4 3.3.5 3.4 3.4.0 3.4.1 3.4.2 3.4.3 3.4.4"  
      536 stl_major_versions="6 5 4 3"  
    536 536 for stl_prefix in /usr/include /usr/local/include; do  
    537 537     for stl_dir in c++ g++; do  
    538 538     stl_path="$stl_prefix:$stl_prefix/$stl_dir"  
    539       for stl_ver in $stl_versions; do  
    540           stl_path="$stl_path:$stl_prefix/$stl_dir/$stl_ver"  
      539     for stl_major_version in $stl_major_versions; do  
      540         stl_subdir=`ls -1 -r "$stl_prefix/$stl_dir" 2> /dev/null | grep -m 1 "^$stl_major_version."`  
      541         stl_result=$?  
      542         [ $stl_result -eq 0 ] && file_path="$stl_prefix/$stl_dir/$stl_subdir" && break  
    541 543     done  
    542       check4_file string --file --path "$stl_path" &> /dev/null  
    543       stl_result=$?  
    544       if [ $stl_result -eq 0 ]; then  
    545           break  
    546       fi  
      544     [ $stl_result -eq 0 ] && break  
    547 545     done  
    548       if [ $stl_result -eq 0 ]; then  
    549       break  
    550       fi  
      546     [ $stl_result -eq 0 ] && break  
    551 547 done  
    552 548 if [ $stl_result -ne 0 ]; then  
    553       stl_path="/usr/include/g++-2:/usr/include/g++-3:/usr/local/include/g++-2:/usr/local/include/g++-3"  
      549     stl_path="/usr/include/c++/4.0.2:/usr/include/g++-2:/usr/include/g++-3:/usr/local/include/g++-2:/usr/local/include/g++-3"  
    553 549     check4_file string --file --path "$stl_path" &> /dev/null  
    554 550     stl_result=$?  
      551     [ $stl_result -eq 0 ] && file_path=`cut_last_dirs $file_path 1`  
    555 552 fi  
    556 553 if [ $stl_result -ne 0 ]; then  
    560 557     return 1  
    561 558 fi  
    562   export STL_PATH=`cut_last_dirs $file_path 1`  
      559 export STL_PATH=$file_path  
    562 559 for file in map list stack hashtable.h vector; do  
    563 560     check4_file $file --file --path "$STL_PATH" &> /dev/null  
    564 561     result=$?  
    565 562     if [ $result -ne 0 ]; then  
    566       check4_file $file --file --path "$STL_PATH/backward"  
      563     check4_file $file --file --path "$STL_PATH/backward" &> /dev/null  
    566 563     result=$?  
    567 564     fi