source: trunk/dports/sysutils/rpm/files/patch-configure.diff @ 5213

Last change on this file since 5213 was 5213, checked in by ssen, 16 years ago

Search for python2.3 before python2.2, so that it finds the dports
python on Jaguar

  • Property svn:eol-style set to native
File size: 2.0 KB
  • configure

    old new  
    1251212512WITH_PYTHON_VERSION=
    1251312513if test $withval = auto ; then
    1251412514
    12515   echo $ac_n "checking for python 2.2""... $ac_c" 1>&6
    12516 echo "configure:12517: checking for python 2.2" >&5
     12515  echo $ac_n "checking for python 2.3""... $ac_c" 1>&6
     12516echo "configure:12517: checking for python 2.3" >&5
    1251712517  if test "$cross_compiling" = yes; then
    1251812518  withval=yes
    1251912519else
     
    1252112521#line 12522 "configure"
    1252212522#include "confdefs.h"
    1252312523
    12524 #include <python2.2/Python.h>
     12524#include <python2.3/Python.h>
    1252512525main() {
    12526   exit(strncmp("2.2", PY_VERSION, 3));
     12526  exit(strncmp("2.3", PY_VERSION, 3));
    1252712527}
    1252812528EOF
    1252912529if { (eval echo configure:12530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     
    1254012540
    1254112541  echo "$ac_t""$withval" 1>&6
    1254212542  if test $withval = yes ; then
    12543     WITH_PYTHON_VERSION="2.2"
     12543    WITH_PYTHON_VERSION="2.3"
    1254412544  else
    1254512545
     12546        echo $ac_n "checking for python 2.2""... $ac_c" 1>&6
     12547        echo "configure:12517: checking for python 2.2" >&5
     12548        if test "$cross_compiling" = yes; then
     12549            withval=yes
     12550        else
     12551            cat > conftest.$ac_ext <<EOF
     12552#line 12522 "configure"
     12553#include "confdefs.h"
     12554
     12555#include <python2.2/Python.h>
     12556main() {
     12557        exit(strncmp("2.2", PY_VERSION, 3));
     12558}
     12559EOF
     12560            if { (eval echo configure:12530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     12561                then
     12562                withval=yes
     12563            else
     12564                echo "configure: failed program was:" >&5
     12565                cat conftest.$ac_ext >&5
     12566                rm -fr conftest*
     12567                withval=no
     12568            fi
     12569            rm -fr conftest*
     12570        fi
     12571
     12572        echo "$ac_t""$withval" 1>&6
     12573        if test $withval = yes ; then
     12574            WITH_PYTHON_VERSION="2.2"
     12575        else
     12576
    1254612577    echo $ac_n "checking for python 1.5.2""... $ac_c" 1>&6
    1254712578echo "configure:12548: checking for python 1.5.2" >&5
    1254812579    if test "$cross_compiling" = yes; then
     
    1257412605      WITH_PYTHON_VERSION="1.5"
    1257512606    fi
    1257612607  fi
    12577 
     12608  fi
    1257812609fi
    1257912610
    1258012611if test -n "$WITH_PYTHON_VERSION" ; then
Note: See TracBrowser for help on using the repository browser.