diff options
| -rwxr-xr-x | configure | 2 | ||||
| -rwxr-xr-x | configure.dynamic | 2 | ||||
| -rw-r--r-- | configure.dynamic.in | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rwxr-xr-x | configure.static | 2 | ||||
| -rw-r--r-- | configure.static.in | 2 |
6 files changed, 6 insertions, 6 deletions
@@ -19983,7 +19983,7 @@ fi if $python_prog -c "import distutils.sysconfig ; print(distutils.sysconfig.get_config_var('VERSION'))" ; then PyVersion=`$python_prog -c "import distutils.sysconfig ; print(distutils.sysconfig.get_config_var('VERSION'))"` PyMajorVersion=`echo $PyVersion |sed -e 's/\..*//'` - PySubVersion=`echo $PyVersion |sed -e 's/\(2\|3\)\.//'` + PySubVersion=`echo $PyVersion |sed -e 's/2\.//' -e 's/3\.//'` PyName="python$PyVersion" if test "$PySubVersion" = "" ; then python="no" diff --git a/configure.dynamic b/configure.dynamic index a24a7251..0468f6d2 100755 --- a/configure.dynamic +++ b/configure.dynamic @@ -19983,7 +19983,7 @@ fi if $python_prog -c "import distutils.sysconfig ; print(distutils.sysconfig.get_config_var('VERSION'))" ; then PyVersion=`$python_prog -c "import distutils.sysconfig ; print(distutils.sysconfig.get_config_var('VERSION'))"` PyMajorVersion=`echo $PyVersion |sed -e 's/\..*//'` - PySubVersion=`echo $PyVersion |sed -e 's/\(2\|3\)\.//'` + PySubVersion=`echo $PyVersion |sed -e 's/2\.//' -e 's/3\.//'` PyName="python$PyVersion" if test "$PySubVersion" = "" ; then python="no" diff --git a/configure.dynamic.in b/configure.dynamic.in index 561b7520..330169cb 100644 --- a/configure.dynamic.in +++ b/configure.dynamic.in @@ -263,7 +263,7 @@ if test "$python" = "yes" ; then if $python_prog -c "import distutils.sysconfig ; print(distutils.sysconfig.get_config_var('VERSION'))" ; then PyVersion=`$python_prog -c "import distutils.sysconfig ; print(distutils.sysconfig.get_config_var('VERSION'))"` PyMajorVersion=`echo $PyVersion |sed -e 's/\..*//'` - PySubVersion=`echo $PyVersion |sed -e 's/\(2\|3\)\.//'` + PySubVersion=`echo $PyVersion |sed -e 's/2\.//' -e 's/3\.//'` PyName="python$PyVersion" if test "$PySubVersion" = "" ; then python="no" diff --git a/configure.in b/configure.in index 561b7520..330169cb 100644 --- a/configure.in +++ b/configure.in @@ -263,7 +263,7 @@ if test "$python" = "yes" ; then if $python_prog -c "import distutils.sysconfig ; print(distutils.sysconfig.get_config_var('VERSION'))" ; then PyVersion=`$python_prog -c "import distutils.sysconfig ; print(distutils.sysconfig.get_config_var('VERSION'))"` PyMajorVersion=`echo $PyVersion |sed -e 's/\..*//'` - PySubVersion=`echo $PyVersion |sed -e 's/\(2\|3\)\.//'` + PySubVersion=`echo $PyVersion |sed -e 's/2\.//' -e 's/3\.//'` PyName="python$PyVersion" if test "$PySubVersion" = "" ; then python="no" diff --git a/configure.static b/configure.static index 04033438..b465c69f 100755 --- a/configure.static +++ b/configure.static @@ -5064,7 +5064,7 @@ if test "$python" = "yes" ; then if python -c "import distutils.sysconfig ; print '-I%s' % distutils.sysconfig.get_config_var('INCLUDEPY')" >/dev/null 2>&1 ; then if python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" >/dev/null 2>&1 ; then PyVersion=`python -c "import distutils.sysconfig ; print '%s' % distutils.sysconfig.get_config_var('VERSION')"` - PySubVersion=`echo $PyVersion |sed -e 's/2.//'` + PySubVersion=`echo $PyVersion |sed -e 's/2\.//' -e 's/3\.//'` PyInc=`python -c "import distutils.sysconfig ; print '%s' % distutils.sysconfig.get_config_var('INCLUDEPY')"` PyLib=`python -c "import distutils.sysconfig ; print '%s/%s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LDLIBRARY'))"` if test "$PySubVersion" \!= "" -a "$PySubVersion" -le 2 ; then diff --git a/configure.static.in b/configure.static.in index 3583fed3..ffcdf61e 100644 --- a/configure.static.in +++ b/configure.static.in @@ -151,7 +151,7 @@ if test "$python" = "yes" ; then if python -c "import distutils.sysconfig ; print '-I%s' % distutils.sysconfig.get_config_var('INCLUDEPY')" >/dev/null 2>&1 ; then if python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" >/dev/null 2>&1 ; then PyVersion=`python -c "import distutils.sysconfig ; print '%s' % distutils.sysconfig.get_config_var('VERSION')"` - PySubVersion=`echo $PyVersion |sed -e 's/2.//'` + PySubVersion=`echo $PyVersion |sed -e 's/2\.//' -e 's/3\.//'` PyInc=`python -c "import distutils.sysconfig ; print '%s' % distutils.sysconfig.get_config_var('INCLUDEPY')"` PyLib=`python -c "import distutils.sysconfig ; print '%s/%s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LDLIBRARY'))"` if test "$PySubVersion" \!= "" -a "$PySubVersion" -le 2 ; then |