Changeset 3013 for cel/trunk/configure

Show
Ignore:
Timestamp:
2007-10-03 00:12:09 (4 years ago)
Author:
caedesv
Message:

synced swig.jam file from cs, and adapted configure check to
account for libcrystalspace-python not existing any more.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • cel/trunk/configure

    r2773 r3013  
    714714ac_ct_CSLIBS_CONFIG 
    715715PYTHON 
     716ac_ct_PYTHON 
    716717PKG_CONFIG 
    717718ac_ct_PKG_CONFIG 
    … …  
    37983799    if test "$cs_prog_path_prepared" != yes; then 
    37993800  cs_prog_path_prepared=yes 
    3800         PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin" 
     3801        PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin" 
    38013802        export PATH 
    38023803fi 
    … …  
    41744175 
    41754176 
     4177 
     4178    if test "$cs_prog_path_prepared" != yes; then 
     4179  cs_prog_path_prepared=yes 
     4180        PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin" 
     4181        export PATH 
     4182fi 
     4183 
     4184    if test -n "$ac_tool_prefix"; then 
     4185  for ac_prog in ld 
     4186  do 
     4187    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 
     4188set dummy $ac_tool_prefix$ac_prog; ac_word=$2 
     4189{ echo "$as_me:$LINENO: checking for $ac_word" >&5 
     4190echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } 
     4191if test "${ac_cv_prog_LD+set}" = set; then 
     4192  echo $ECHO_N "(cached) $ECHO_C" >&6 
     4193else 
     4194  if test -n "$LD"; then 
     4195  ac_cv_prog_LD="$LD" # Let the user override the test. 
     4196else 
     4197as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 
     4198for as_dir in $PATH 
     4199do 
     4200  IFS=$as_save_IFS 
     4201  test -z "$as_dir" && as_dir=. 
     4202  for ac_exec_ext in '' $ac_executable_extensions; do 
     4203  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
     4204    ac_cv_prog_LD="$ac_tool_prefix$ac_prog" 
     4205    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 
     4206    break 2 
     4207  fi 
     4208done 
     4209done 
     4210IFS=$as_save_IFS 
     4211 
     4212fi 
     4213fi 
     4214LD=$ac_cv_prog_LD 
     4215if test -n "$LD"; then 
     4216  { echo "$as_me:$LINENO: result: $LD" >&5 
     4217echo "${ECHO_T}$LD" >&6; } 
     4218else 
     4219  { echo "$as_me:$LINENO: result: no" >&5 
     4220echo "${ECHO_T}no" >&6; } 
     4221fi 
     4222 
     4223 
     4224    test -n "$LD" && break 
     4225  done 
     4226fi 
     4227if test -z "$LD"; then 
     4228  ac_ct_LD=$LD 
     4229  for ac_prog in ld 
     4230do 
     4231  # Extract the first word of "$ac_prog", so it can be a program name with args. 
     4232set dummy $ac_prog; ac_word=$2 
     4233{ echo "$as_me:$LINENO: checking for $ac_word" >&5 
     4234echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } 
     4235if test "${ac_cv_prog_ac_ct_LD+set}" = set; then 
     4236  echo $ECHO_N "(cached) $ECHO_C" >&6 
     4237else 
     4238  if test -n "$ac_ct_LD"; then 
     4239  ac_cv_prog_ac_ct_LD="$ac_ct_LD" # Let the user override the test. 
     4240else 
     4241as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 
     4242for as_dir in $PATH 
     4243do 
     4244  IFS=$as_save_IFS 
     4245  test -z "$as_dir" && as_dir=. 
     4246  for ac_exec_ext in '' $ac_executable_extensions; do 
     4247  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
     4248    ac_cv_prog_ac_ct_LD="$ac_prog" 
     4249    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 
     4250    break 2 
     4251  fi 
     4252done 
     4253done 
     4254IFS=$as_save_IFS 
     4255 
     4256fi 
     4257fi 
     4258ac_ct_LD=$ac_cv_prog_ac_ct_LD 
     4259if test -n "$ac_ct_LD"; then 
     4260  { echo "$as_me:$LINENO: result: $ac_ct_LD" >&5 
     4261echo "${ECHO_T}$ac_ct_LD" >&6; } 
     4262else 
     4263  { echo "$as_me:$LINENO: result: no" >&5 
     4264echo "${ECHO_T}no" >&6; } 
     4265fi 
     4266 
     4267 
     4268  test -n "$ac_ct_LD" && break 
     4269done 
     4270 
     4271  if test "x$ac_ct_LD" = x; then 
     4272    LD="" 
     4273  else 
     4274    case $cross_compiling:$ac_tool_warned in 
     4275yes:) 
     4276{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools 
     4277whose name does not start with the host triplet.  If you think this 
     4278configuration is useful to you, please write to autoconf@gnu.org." >&5 
     4279echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools 
     4280whose name does not start with the host triplet.  If you think this 
     4281configuration is useful to you, please write to autoconf@gnu.org." >&2;} 
     4282ac_tool_warned=yes ;; 
     4283esac 
     4284    LD=$ac_ct_LD 
     4285  fi 
     4286fi 
     4287 
     4288    cs_build_prop_val="$LD" 
     4289    cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/   */ /g;s/^ //;s/ $//'` 
     4290    if test -n "$cs_build_prop_val"; then 
     4291  cs_jamconfig_text="${cs_jamconfig_text}CMD.LD ?= \"$cs_build_prop_val\" ; 
     4292" 
     4293fi 
     4294 
     4295 
    41764296    cs_build_prop_val="$LDFLAGS" 
    41774297    cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/   */ /g;s/^ //;s/ $//'` 
    … …  
    52035323    if test "$cs_prog_path_prepared" != yes; then 
    52045324  cs_prog_path_prepared=yes 
    5205         PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin" 
     5325        PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin" 
    52065326        export PATH 
    52075327fi 
    … …  
    53225442    if test "$cs_prog_path_prepared" != yes; then 
    53235443  cs_prog_path_prepared=yes 
    5324         PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin" 
     5444        PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin" 
    53255445        export PATH 
    53265446fi 
    … …  
    54455565    if test "$cs_prog_path_prepared" != yes; then 
    54465566  cs_prog_path_prepared=yes 
    5447         PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin" 
     5567        PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin" 
    54485568        export PATH 
    54495569fi 
    … …  
    55645684    if test "$cs_prog_path_prepared" != yes; then 
    55655685  cs_prog_path_prepared=yes 
    5566         PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin" 
     5686        PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin" 
    55675687        export PATH 
    55685688fi 
    … …  
    56835803    if test "$cs_prog_path_prepared" != yes; then 
    56845804  cs_prog_path_prepared=yes 
    5685         PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin" 
     5805        PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin" 
    56865806        export PATH 
    56875807fi 
    … …  
    58055925    if test "$cs_prog_path_prepared" != yes; then 
    58065926  cs_prog_path_prepared=yes 
    5807         PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin" 
     5927        PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin" 
    58085928        export PATH 
    58095929fi 
    … …  
    58235943else 
    58245944as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 
    5825 for as_dir in     /sw/bin$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin 
     5945for as_dir in     /sw/bin$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin 
    58265946do 
    58275947  IFS=$as_save_IFS 
    … …  
    58675987else 
    58685988as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 
    5869 for as_dir in     /sw/bin$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin 
     5989for as_dir in     /sw/bin$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin 
    58705990do 
    58715991  IFS=$as_save_IFS 
    … …  
    59176037    if test "$cs_prog_path_prepared" != yes; then 
    59186038  cs_prog_path_prepared=yes 
    5919         PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin" 
     6039        PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin" 
    59206040        export PATH 
    59216041fi 
    … …  
    59346054  *) 
    59356055  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 
    5936 for as_dir in     /sw/bin$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin 
     6056for as_dir in     /sw/bin$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin 
    59376057do 
    59386058  IFS=$as_save_IFS 
    … …  
    59826102    if test "$cs_prog_path_prepared" != yes; then 
    59836103  cs_prog_path_prepared=yes 
    5984         PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin" 
     6104        PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin" 
    59856105        export PATH 
    59866106fi 
    … …  
    61066226    if test "$cs_prog_path_prepared" != yes; then 
    61076227  cs_prog_path_prepared=yes 
    6108         PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin" 
     6228        PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin" 
    61096229        export PATH 
    61106230fi 
    … …  
    61236243  *) 
    61246244  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 
    6125 for as_dir in     /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin 
     6245for as_dir in     /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin 
    61266246do 
    61276247  IFS=$as_save_IFS 
    … …  
    63136433    if test "$cs_prog_path_prepared" != yes; then 
    63146434  cs_prog_path_prepared=yes 
    6315         PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin" 
     6435        PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin" 
    63166436        export PATH 
    63176437fi 
    … …  
    63876507    if test "$cs_prog_path_prepared" != yes; then 
    63886508  cs_prog_path_prepared=yes 
    6389         PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin" 
     6509        PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin" 
    63906510        export PATH 
    63916511fi 
    … …  
    64446564    if test "$cs_prog_path_prepared" != yes; then 
    64456565  cs_prog_path_prepared=yes 
    6446         PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin" 
     6566        PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin" 
    64476567        export PATH 
    64486568fi 
    … …  
    65016621    if test "$cs_prog_path_prepared" != yes; then 
    65026622  cs_prog_path_prepared=yes 
    6503         PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin" 
     6623        PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin" 
    65046624        export PATH 
    65056625fi 
    … …  
    65586678    if test "$cs_prog_path_prepared" != yes; then 
    65596679  cs_prog_path_prepared=yes 
    6560         PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin" 
     6680        PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin" 
    65616681        export PATH 
    65626682fi 
    … …  
    66156735    if test "$cs_prog_path_prepared" != yes; then 
    66166736  cs_prog_path_prepared=yes 
    6617         PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin" 
     6737        PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin" 
    66186738        export PATH 
    66196739fi 
    … …  
    66716791    if test "$cs_prog_path_prepared" != yes; then 
    66726792  cs_prog_path_prepared=yes 
    6673         PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin" 
     6793        PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin" 
    66746794        export PATH 
    66756795fi 
    … …  
    67286848    if test "$cs_prog_path_prepared" != yes; then 
    67296849  cs_prog_path_prepared=yes 
    6730         PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin" 
     6850        PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin" 
    67316851        export PATH 
    67326852fi 
    … …  
    68476967    if test "$cs_prog_path_prepared" != yes; then 
    68486968  cs_prog_path_prepared=yes 
    6849         PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin" 
     6969        PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin" 
    68506970        export PATH 
    68516971fi 
    … …  
    69057025    if test "$cs_prog_path_prepared" != yes; then 
    69067026  cs_prog_path_prepared=yes 
    6907         PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin" 
     7027        PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin" 
    69087028        export PATH 
    69097029fi 
    … …  
    69647084    if test "$cs_prog_path_prepared" != yes; then 
    69657085  cs_prog_path_prepared=yes 
    6966         PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin" 
     7086        PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin" 
    69677087        export PATH 
    69687088fi 
    … …  
    70217141    if test "$cs_prog_path_prepared" != yes; then 
    70227142  cs_prog_path_prepared=yes 
    7023         PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin" 
     7143        PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin" 
    70247144        export PATH 
    70257145fi 
    … …  
    70787198    if test "$cs_prog_path_prepared" != yes; then 
    70797199  cs_prog_path_prepared=yes 
    7080         PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin" 
     7200        PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin" 
    70817201        export PATH 
    70827202fi 
    … …  
    71467266    if test "$cs_prog_path_prepared" != yes; then 
    71477267  cs_prog_path_prepared=yes 
    7148         PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin" 
     7268        PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin" 
    71497269        export PATH 
    71507270fi 
    … …  
    72117331    if test "$cs_prog_path_prepared" != yes; then 
    72127332  cs_prog_path_prepared=yes 
    7213         PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin" 
     7333        PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin" 
    72147334        export PATH 
    72157335fi 
    … …  
    91179237    if test "$cs_prog_path_prepared" != yes; then 
    91189238  cs_prog_path_prepared=yes 
    9119         PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin" 
     9239        PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin" 
    91209240        export PATH 
    91219241fi 
    … …  
    996110081    if test "$cs_prog_path_prepared" != yes; then 
    996210082  cs_prog_path_prepared=yes 
    9963         PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin" 
     10083        PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin" 
    996410084        export PATH 
    996510085fi 
    996610086 
    9967     for ac_prog in python 
    9968 do 
    9969   # Extract the first word of "$ac_prog", so it can be a program name with args. 
    9970 set dummy $ac_prog; ac_word=$2 
     10087    if test -n "$ac_tool_prefix"; then 
     10088  for ac_prog in python 
     10089  do 
     10090    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 
     10091set dummy $ac_tool_prefix$ac_prog; ac_word=$2 
    997110092{ echo "$as_me:$LINENO: checking for $ac_word" >&5 
    997210093echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } 
    … …  
    998410105  for ac_exec_ext in '' $ac_executable_extensions; do 
    998510106  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    9986     ac_cv_prog_PYTHON="$ac_prog" 
     10107    ac_cv_prog_PYTHON="$ac_tool_prefix$ac_prog" 
    998710108    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 
    998810109    break 2 
    … …  
    1000410125 
    1000510126 
    10006   test -n "$PYTHON" && break 
    10007 done 
     10127    test -n "$PYTHON" && break 
     10128  done 
     10129fi 
     10130if test -z "$PYTHON"; then 
     10131  ac_ct_PYTHON=$PYTHON 
     10132  for ac_prog in python 
     10133do 
     10134  # Extract the first word of "$ac_prog", so it can be a program name with args. 
     10135set dummy $ac_prog; ac_word=$2 
     10136{ echo "$as_me:$LINENO: checking for $ac_word" >&5 
     10137echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } 
     10138if test "${ac_cv_prog_ac_ct_PYTHON+set}" = set; then 
     10139  echo $ECHO_N "(cached) $ECHO_C" >&6 
     10140else 
     10141  if test -n "$ac_ct_PYTHON"; then 
     10142  ac_cv_prog_ac_ct_PYTHON="$ac_ct_PYTHON" # Let the user override the test. 
     10143else 
     10144as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 
     10145for as_dir in $PATH 
     10146do 
     10147  IFS=$as_save_IFS 
     10148  test -z "$as_dir" && as_dir=. 
     10149  for ac_exec_ext in '' $ac_executable_extensions; do 
     10150  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
     10151    ac_cv_prog_ac_ct_PYTHON="$ac_prog" 
     10152    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 
     10153    break 2 
     10154  fi 
     10155done 
     10156done 
     10157IFS=$as_save_IFS 
     10158 
     10159fi 
     10160fi 
     10161ac_ct_PYTHON=$ac_cv_prog_ac_ct_PYTHON 
     10162if test -n "$ac_ct_PYTHON"; then 
     10163  { echo "$as_me:$LINENO: result: $ac_ct_PYTHON" >&5 
     10164echo "${ECHO_T}$ac_ct_PYTHON" >&6; } 
     10165else 
     10166  { echo "$as_me:$LINENO: result: no" >&5 
     10167echo "${ECHO_T}no" >&6; } 
     10168fi 
     10169 
     10170 
     10171  test -n "$ac_ct_PYTHON" && break 
     10172done 
     10173 
     10174  if test "x$ac_ct_PYTHON" = x; then 
     10175    PYTHON="" 
     10176  else 
     10177    case $cross_compiling:$ac_tool_warned in 
     10178yes:) 
     10179{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools 
     10180whose name does not start with the host triplet.  If you think this 
     10181configuration is useful to you, please write to autoconf@gnu.org." >&5 
     10182echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools 
     10183whose name does not start with the host triplet.  If you think this 
     10184configuration is useful to you, please write to autoconf@gnu.org." >&2;} 
     10185ac_tool_warned=yes ;; 
     10186esac 
     10187    PYTHON=$ac_ct_PYTHON 
     10188  fi 
     10189fi 
    1000810190 
    1000910191 
    … …  
    1001110193    cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/   */ /g;s/^ //;s/ $//'` 
    1001210194    if test -n "$cs_build_prop_val"; then 
    10013   : 
    10014  
     10195  cs_jamconfig_text="${cs_jamconfig_text}PYTHON ?= \"$cs_build_prop_val\" ; 
     10196" 
    1001510197fi 
    1001610198 
    … …  
    1010510287            if test -n "$cs_pyver" && 
    1010610288                   test -n "$cs_cv_pybase_cflags" && 
    10107                    test -n "$cs_cv_pybase_lflags$cs_cv_pybase_sysprefix_lflags"; then 
     10289                   test -n "$cs_cv_pybase_lflags_base$cs_cv_pybase_sysprefix_lflags"; then 
    1010810290  cs_cv_python_sdk=yes 
    1010910291else 
    … …  
    1013210314    cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/   */ /g;s/^ //;s/ $//'` 
    1013310315    if test -n "$cs_build_prop_val"; then 
    10134   : 
    10135  
     10316  cs_jamconfig_text="${cs_jamconfig_text}PYTHON.MODULE_EXT ?= \"$cs_build_prop_val\" ; 
     10317" 
    1013610318fi 
    1013710319 
    … …  
    1046010642    cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/   */ /g;s/^ //;s/ $//'` 
    1046110643    if test -n "$cs_build_prop_val"; then 
    10462   : 
    10463  
     10644  cs_jamconfig_text="${cs_jamconfig_text}PYTHON.AVAILABLE ?= \"$cs_build_prop_val\" ; 
     10645" 
    1046410646fi 
    1046510647 
    … …  
    1046710649    cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/   */ /g;s/^ //;s/ $//'` 
    1046810650    if test -n "$cs_build_prop_val"; then 
    10469   : 
    10470  
     10651  cs_jamconfig_text="${cs_jamconfig_text}PYTHON.CFLAGS ?= \"$cs_build_prop_val\" ; 
     10652" 
    1047110653fi 
    1047210654 
    … …  
    1047410656    cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/   */ /g;s/^ //;s/ $//'` 
    1047510657    if test -n "$cs_build_prop_val"; then 
    10476   : 
    10477  
     10658  cs_jamconfig_text="${cs_jamconfig_text}PYTHON.LFLAGS ?= \"$cs_build_prop_val\" ; 
     10659" 
    1047810660fi 
    1047910661 
    … …  
    1052910711    if test "$cs_prog_path_prepared" != yes; then 
    1053010712  cs_prog_path_prepared=yes 
    10531         PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin" 
     10713        PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin" 
    1053210714        export PATH 
    1053310715fi 
    … …  
    1069510877    if test "$cs_prog_path_prepared" != yes; then 
    1069610878  cs_prog_path_prepared=yes 
    10697         PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin" 
     10879        PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin" 
    1069810880        export PATH 
    1069910881fi 
    … …  
    1214112323    if test "$cs_prog_path_prepared" != yes; then 
    1214212324  cs_prog_path_prepared=yes 
    12143         PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin" 
     12325        PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin" 
    1214412326        export PATH 
    1214512327fi 
    … …  
    1230712489    if test "$cs_prog_path_prepared" != yes; then 
    1230812490  cs_prog_path_prepared=yes 
    12309         PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin" 
     12491        PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin" 
    1231012492        export PATH 
    1231112493fi 
    … …  
    1295113133 
    1295213134if test $with_cs != no; then 
    12953   if test $cs_cv_python != no; then 
    12954   cs_opt_libs="crystalspace_python" 
    12955 else 
    12956   cs_opt_libs='' 
    12957 fi 
    12958  
    1295913135 
    1296013136# Check whether --with-cs-prefix was given. 
    … …  
    1301513191cs_version_sequence="$cs_version_major.$cs_version_minor" 
    1301613192 
    13017 cs_version_desired_is_stable=`expr $cs_version_minor % 2` 
    13018  
    13019 if test $cs_version_desired_is_stable -eq 0; then 
     13193cs_version_desired_is_unstable=`expr $cs_version_minor % 2` 
     13194 
     13195if test $cs_version_desired_is_unstable -eq 1; then 
    1302013196  # Development version search sequence 
    1302113197  y=`expr $cs_version_minor + 1` 
    … …  
    1380013976# running the CS test). 
    1380113977#---------------------------------------------------------------------------- 
    13802 if test $with_cs != no && test $cs_cv_python != no; then 
    13803   { echo "$as_me:$LINENO: checking for Crystal Space Python support" >&5 
    13804 echo $ECHO_N "checking for Crystal Space Python support... $ECHO_C" >&6; } 
    13805     cel_do_python=no 
    13806     for m in $CRYSTAL_AVAILABLE_LIBS; do 
    13807         if test crystalspace_python = "$m"; then 
    13808   cel_do_python=yes 
    13809             break 
    13810 fi 
    13811  
    13812     done 
    13813     { echo "$as_me:$LINENO: result: $cel_do_python" >&5 
    13814 echo "${ECHO_T}$cel_do_python" >&6; } 
    13815     if test $cel_do_python = yes; then 
    13816   if test "$cs_cv_python" = yes; then 
    13817   cs_build_prop_val="yes" 
    13818     cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/   */ /g;s/^ //;s/ $//'` 
    13819     if test -n "$cs_build_prop_val"; then 
    13820   cs_jamconfig_text="${cs_jamconfig_text}PYTHON.AVAILABLE ?= \"$cs_build_prop_val\" ; 
    13821 " 
    13822 fi 
    13823  
    13824         cs_build_prop_val="$cs_cv_python_cflags" 
    13825     cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/   */ /g;s/^ //;s/ $//'` 
    13826     if test -n "$cs_build_prop_val"; then 
    13827   cs_jamconfig_text="${cs_jamconfig_text}PYTHON.CFLAGS ?= \"$cs_build_prop_val\" ; 
    13828 " 
    13829 fi 
    13830  
    13831         cs_build_prop_val="$cs_cv_python_lflags $cs_cv_python_libs" 
    13832     cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/   */ /g;s/^ //;s/ $//'` 
    13833     if test -n "$cs_build_prop_val"; then 
    13834   cs_jamconfig_text="${cs_jamconfig_text}PYTHON.LFLAGS ?= \"$cs_build_prop_val\" ; 
    13835 " 
    13836 fi 
    13837  
    13838 fi 
    13839  
    13840 fi 
    13841  
    13842 fi 
    13843  
     13978#AS_IF([test $with_cs != no && test $cs_cv_python != no], 
     13979#    [AC_MSG_CHECKING([for Crystal Space Python support]) 
     13980#    cel_do_python=no 
     13981#    for m in $CRYSTAL_AVAILABLE_LIBS; do 
     13982#       AS_IF([test crystalspace_python = "$m"], 
     13983#           [cel_do_python=yes 
     13984#           break]) 
     13985#    done 
     13986#    AC_MSG_RESULT([$cel_do_python]) 
     13987#    AS_IF([test $cel_do_python = yes], 
     13988#       [CS_EMIT_BUILD_RESULT([cs_cv_python], [PYTHON])])]) 
    1384413989 
    1384513990#---------------------------------------------------------------------------- 
    … …  
    1468914834    if test "$cs_prog_path_prepared" != yes; then 
    1469014835  cs_prog_path_prepared=yes 
    14691         PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin" 
     14836        PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin" 
    1469214837        export PATH 
    1469314838fi 
    … …  
    1480814953    if test "$cs_prog_path_prepared" != yes; then 
    1480914954  cs_prog_path_prepared=yes 
    14810         PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin" 
     14955        PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin" 
    1481114956        export PATH 
    1481214957fi 
    … …  
    1497915124    if test "$cs_prog_path_prepared" != yes; then 
    1498015125  cs_prog_path_prepared=yes 
    14981         PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin" 
     15126        PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin" 
    1498215127        export PATH 
    1498315128fi 
    … …  
    1514515290    if test "$cs_prog_path_prepared" != yes; then 
    1514615291  cs_prog_path_prepared=yes 
    15147         PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin" 
     15292        PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin" 
    1514815293        export PATH 
    1514915294fi 
    … …  
    1702217167ac_ct_CSLIBS_CONFIG!$ac_ct_CSLIBS_CONFIG$ac_delim 
    1702317168PYTHON!$PYTHON$ac_delim 
    17024 PKG_CONFIG!$PKG_CONFIG$ac_delim 
     17169ac_ct_PYTHON!$ac_ct_PYTHON$ac_delim 
    1702517170_ACEOF 
    1702617171 
    … …  
    1706417209for ac_last_try in false false false false false :; do 
    1706517210  cat >conf$$subs.sed <<_ACEOF 
     17211PKG_CONFIG!$PKG_CONFIG$ac_delim 
    1706617212ac_ct_PKG_CONFIG!$ac_ct_PKG_CONFIG$ac_delim 
    1706717213CONFIG_CPPUNIT!$CONFIG_CPPUNIT$ac_delim 
    … …  
    1708017226_ACEOF 
    1708117227 
    17082   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 14; then 
     17228  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 15; then 
    1708317229    break 
    1708417230  elif $ac_last_try; then