Changeset 480 for trunk/configure

Show
Ignore:
Timestamp:
01/15/07 02:05:20 (2 years ago)
Author:
vossg
Message:

fixed : scons : windows build (boost toolset selection, defaultlibs)

configure : check systemdrive first to find visual studio dirs

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/configure

    r134 r480  
    24202420    ac_gdz_find_prog_dir_result="" 
    24212421 
    2422     for drive in c d e f g; do 
     2422    ac_gdz_systemdrive=`echo $SYSTEMDRIVE | sed 's/://g'` 
     2423 
     2424    for drive in $ac_gdz_systemdrive c d e f g; do 
    24232425     for progdir in "Program Files" "Programme"; do 
    24242426      for vsnet in "Microsoft Visual Studio.NET 2003" "Microsoft Visual Studio .NET 2003"; do 
     
    24712473    ac_gdz_find_prog_dir_result="" 
    24722474 
    2473     for drive in c d e f g; do 
     2475    ac_gdz_systemdrive=`echo $SYSTEMDRIVE | sed 's/://g'` 
     2476 
     2477    for drive in $ac_gdz_systemdrive c d e f g; do 
    24742478     for progdir in "Program Files" "Programme"; do 
    24752479      for vsnet in "Microsoft Visual Studio 8"; do 
     
    25242528    ac_gdz_find_prog_dir_result="" 
    25252529 
    2526     for drive in c d e f g; do 
     2530    ac_gdz_systemdrive=`echo $SYSTEMDRIVE | sed 's/://g'` 
     2531 
     2532    for drive in $ac_gdz_systemdrive c d e f g; do 
    25272533     for progdir in "Program Files" "Programme"; do 
    25282534      for vsnet in "Microsoft Visual Studio.NET" "Microsoft Visual Studio .NET"; do 
     
    26592665    if test $ac_gdz_check_compiler_available = yes; then 
    26602666        echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is available""... $ac_c" 1>&6 
    2661 echo "configure:2662: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is available" >&5 
     2667echo "configure:2668: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is available" >&5 
    26622668 
    26632669 
     
    26762682set dummy $ac_prog; ac_word=$2 
    26772683echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 
    2678 echo "configure:2679: checking for $ac_word" >&5 
     2684echo "configure:2685: checking for $ac_word" >&5 
    26792685if eval "test \"`echo '$''{'ac_cv_path_CC'+set}'`\" = set"; then 
    26802686  echo $ac_n "(cached) $ac_c" 1>&6 
     
    27182724set dummy $ac_prog; ac_word=$2 
    27192725echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 
    2720 echo "configure:2721: checking for $ac_word" >&5 
     2726echo "configure:2727: checking for $ac_word" >&5 
    27212727if eval "test \"`echo '$''{'ac_cv_path_CC'+set}'`\" = set"; then 
    27222728  echo $ac_n "(cached) $ac_c" 1>&6 
     
    27762782set dummy $ac_prog; ac_word=$2 
    27772783echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 
    2778 echo "configure:2779: checking for $ac_word" >&5 
     2784echo "configure:2785: checking for $ac_word" >&5 
    27792785if eval "test \"`echo '$''{'ac_cv_path_CXX'+set}'`\" = set"; then 
    27802786  echo $ac_n "(cached) $ac_c" 1>&6 
     
    28182824set dummy $ac_prog; ac_word=$2 
    28192825echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 
    2820 echo "configure:2821: checking for $ac_word" >&5 
     2826echo "configure:2827: checking for $ac_word" >&5 
    28212827if eval "test \"`echo '$''{'ac_cv_path_CXX'+set}'`\" = set"; then 
    28222828  echo $ac_n "(cached) $ac_c" 1>&6 
     
    28602866    else 
    28612867        echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 
    2862 echo "configure:2863: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 
     2868echo "configure:2869: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 
    28632869 
    28642870ac_ext=c 
     
    28762882set dummy $ac_prog; ac_word=$2 
    28772883echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 
    2878 echo "configure:2879: checking for $ac_word" >&5 
     2884echo "configure:2885: checking for $ac_word" >&5 
    28792885if eval "test \"`echo '$''{'ac_cv_path_CC'+set}'`\" = set"; then 
    28802886  echo $ac_n "(cached) $ac_c" 1>&6 
     
    29182924set dummy $ac_prog; ac_word=$2 
    29192925echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 
    2920 echo "configure:2921: checking for $ac_word" >&5 
     2926echo "configure:2927: checking for $ac_word" >&5 
    29212927if eval "test \"`echo '$''{'ac_cv_path_CC'+set}'`\" = set"; then 
    29222928  echo $ac_n "(cached) $ac_c" 1>&6 
     
    29582964cat > conftest.$ac_ext << EOF 
    29592965 
    2960 #line 2961 "configure" 
     2966#line 2967 "configure" 
    29612967#include "confdefs.h" 
    29622968 
    29632969main(){return(0);} 
    29642970EOF 
    2965 if { (eval echo configure:2966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
     2971if { (eval echo configure:2972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
    29662972  ac_cv_prog_cc_works=yes 
    29672973  # If we can't run a trivial program, we are probably using a cross compiler. 
     
    29892995fi 
    29902996echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 
    2991 echo "configure:2992: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 
     2997echo "configure:2998: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 
    29922998echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 
    29932999cross_compiling=$ac_cv_prog_cc_cross 
     
    30013007set dummy $ac_prog; ac_word=$2 
    30023008echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 
    3003 echo "configure:3004: checking for $ac_word" >&5 
     3009echo "configure:3010: checking for $ac_word" >&5 
    30043010if eval "test \"`echo '$''{'ac_cv_path_CXX'+set}'`\" = set"; then 
    30053011  echo $ac_n "(cached) $ac_c" 1>&6 
     
    30433049set dummy $ac_prog; ac_word=$2 
    30443050echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 
    3045 echo "configure:3046: checking for $ac_word" >&5 
     3051echo "configure:3052: checking for $ac_word" >&5 
    30463052if eval "test \"`echo '$''{'ac_cv_path_CXX'+set}'`\" = set"; then 
    30473053  echo $ac_n "(cached) $ac_c" 1>&6 
     
    30873093set dummy $ac_prog; ac_word=$2 
    30883094echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 
    3089 echo "configure:3090: checking for $ac_word" >&5 
     3095echo "configure:3096: checking for $ac_word" >&5 
    30903096if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then 
    30913097  echo $ac_n "(cached) $ac_c" 1>&6 
     
    31233129set dummy $ac_prog; ac_word=$2 
    31243130echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 
    3125 echo "configure:3126: checking for $ac_word" >&5 
     3131echo "configure:3132: checking for $ac_word" >&5 
    31263132if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then 
    31273133  echo $ac_n "(cached) $ac_c" 1>&6 
     
    31573163 
    31583164echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 
    3159 echo "configure:3160: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 
     3165echo "configure:3166: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 
    31603166 
    31613167ac_ext=C 
     
    31683174cat > conftest.$ac_ext << EOF 
    31693175 
    3170 #line 3171 "configure" 
     3176#line 3177 "configure" 
    31713177#include "confdefs.h" 
    31723178 
    31733179int main(){return(0);} 
    31743180EOF 
    3175 if { (eval echo configure:3176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
     3181if { (eval echo configure:3182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
    31763182  ac_cv_prog_cxx_works=yes 
    31773183  # If we can't run a trivial program, we are probably using a cross compiler. 
     
    31993205fi 
    32003206echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 
    3201 echo "configure:3202: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 
     3207echo "configure:3208: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 
    32023208echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 
    32033209cross_compiling=$ac_cv_prog_cxx_cross 
    32043210 
    32053211echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 
    3206 echo "configure:3207: checking whether we are using GNU C++" >&5 
     3212echo "configure:3213: checking whether we are using GNU C++" >&5 
    32073213if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then 
    32083214  echo $ac_n "(cached) $ac_c" 1>&6 
     
    32133219#endif 
    32143220EOF 
    3215 if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:3216: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then 
     3221if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:3222: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then 
    32163222  ac_cv_prog_gxx=yes 
    32173223else 
     
    32263232CXXFLAGS= 
    32273233echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 
    3228 echo "configure:3229: checking whether ${CXX-g++} accepts -g" >&5 
     3234echo "configure:3235: checking whether ${CXX-g++} accepts -g" >&5 
    32293235if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then 
    32303236  echo $ac_n "(cached) $ac_c" 1>&6 
     
    32643270 
    32653271echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 
    3266 echo "configure:3267: checking for Cygwin environment" >&5 
     3272echo "configure:3273: checking for Cygwin environment" >&5 
    32673273if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then 
    32683274  echo $ac_n "(cached) $ac_c" 1>&6 
    32693275else 
    32703276  cat > conftest.$ac_ext <<EOF 
    3271 #line 3272 "configure" 
     3277#line 3278 "configure" 
    32723278#include "confdefs.h" 
    32733279 
     
    32803286; return 0; } 
    32813287EOF 
    3282 if { (eval echo configure:3283: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 
     3288if { (eval echo configure:3289: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 
    32833289  rm -rf conftest* 
    32843290  ac_cv_cygwin=yes 
     
    32973303test "$ac_cv_cygwin" = yes && CYGWIN=yes 
    32983304echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 
    3299 echo "configure:3300: checking for mingw32 environment" >&5 
     3305echo "configure:3306: checking for mingw32 environment" >&5 
    33003306if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then 
    33013307  echo $ac_n "(cached) $ac_c" 1>&6 
    33023308else 
    33033309  cat > conftest.$ac_ext <<EOF 
    3304 #line 3305 "configure" 
     3310#line 3311 "configure" 
    33053311#include "confdefs.h" 
    33063312 
     
    33093315; return 0; } 
    33103316EOF 
    3311 if { (eval echo configure:3312: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 
     3317if { (eval echo configure:3318: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 
    33123318  rm -rf conftest* 
    33133319  ac_cv_mingw32=yes 
     
    33303336       cygwin*) 
    33313337        echo $ac_n "checking executable suffix""... $ac_c" 1>&6 
    3332 echo "configure:3333: checking executable suffix" >&5 
     3338echo "configure:3339: checking executable suffix" >&5 
    33333339        EXEEXT=.exe 
    33343340        ac_gdz_exe_suffix=.exe 
     
    33403346 
    33413347echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 
    3342 echo "configure:3343: checking for executable suffix" >&5 
     3348echo "configure:3349: checking for executable suffix" >&5 
    33433349if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then 
    33443350  echo $ac_n "(cached) $ac_c" 1>&6 
     
    33503356  echo 'int main () { return 0; }' > conftest.$ac_ext 
    33513357  ac_cv_exeext= 
    3352   if { (eval echo configure:3353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then 
     3358  if { (eval echo configure:3359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then 
    33533359    for file in conftest.*; do 
    33543360      case $file in 
     
    33853391        if test $ac_gdz_compiler_base = g++; then 
    33863392                echo $ac_n "checking obj suffix""... $ac_c" 1>&6 
    3387 echo "configure:3388: checking obj suffix" >&5 
     3393echo "configure:3394: checking obj suffix" >&5 
    33883394                ac_gdz_obj_suffix=.o 
    33893395                echo "$ac_t""$ac_gdz_obj_suffix" 1>&6 
    33903396        else 
    33913397                echo $ac_n "checking obj suffix""... $ac_c" 1>&6 
    3392 echo "configure:3393: checking obj suffix" >&5 
     3398echo "configure:3399: checking obj suffix" >&5 
    33933399                ac_gdz_obj_suffix=.obj 
    33943400                echo "$ac_t""$ac_gdz_obj_suffix" 1>&6 
     
    33983404        *) 
    33993405        echo $ac_n "checking for object suffix""... $ac_c" 1>&6 
    3400 echo "configure:3401: checking for object suffix" >&5 
     3406echo "configure:3407: checking for object suffix" >&5 
    34013407if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then 
    34023408  echo $ac_n "(cached) $ac_c" 1>&6 
     
    34043410  rm -f conftest* 
    34053411echo 'int i = 1;' > conftest.$ac_ext 
    3406 if { (eval echo configure:3407: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 
     3412if { (eval echo configure:3413: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 
    34073413  for ac_file in conftest.*; do 
    34083414    case $ac_file in 
     
    34283434 
    34293435    echo $ac_n "checking lib suffix""... $ac_c" 1>&6 
    3430 echo "configure:3431: checking lib suffix" >&5 
     3436echo "configure:3437: checking lib suffix" >&5 
    34313437 
    34323438    case "$build_os" in 
     
    34503456 
    34513457    echo $ac_n "checking shared object suffix""... $ac_c" 1>&6 
    3452 echo "configure:3453: checking shared object suffix" >&5 
     3458echo "configure:3459: checking shared object suffix" >&5 
    34533459 
    34543460    case "$build_os" in 
     
    34753481 
    34763482     echo $ac_n "checking shared object praefix""... $ac_c" 1>&6 
    3477 echo "configure:3478: checking shared object praefix" >&5 
     3483echo "configure:3484: checking shared object praefix" >&5 
    34783484 
    34793485     case "$build_os" in 
     
    34983504                 
    34993505    echo $ac_n "checking system dir""... $ac_c" 1>&6 
    3500 echo "configure:3501: checking system dir" >&5 
     3506echo "configure:3507: checking system dir" >&5 
    35013507 
    35023508    if test $enable_win_exclude_default_path = no; then 
     
    37413747 
    37423748echo $ac_n "checking project config common.project.in""... $ac_c" 1>&6 
    3743 echo "configure:3744: checking project config common.project.in" >&5 
     3749echo "configure:3750: checking project config common.project.in" >&5 
    37443750 
    37453751if test -r "$ac_gdz_commonconf_dir/common.project.in"; then 
     
    37523758 
    37533759echo $ac_n "checking package config common.libs.in""... $ac_c" 1>&6 
    3754 echo "configure:3755: checking package config common.libs.in" >&5 
     3760echo "configure:3761: checking package config common.libs.in" >&5 
    37553761 
    37563762if test -r "$ac_gdz_commonconf_dir/common.libs.in"; then 
     
    37643770 
    37653771echo $ac_n "checking additional package configs""... $ac_c" 1>&6 
    3766 echo "configure:3767: checking additional package configs" >&5 
     3772echo "configure:3773: checking additional package configs" >&5 
    37673773 
    37683774for i in `find . -name common.libs.in | sed -e 's|^./||'` ;