Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit04d15d1

Browse files
committed
Make discovery of python_configdir architecture independent. Solution
from James William Pye.
1 parent9f6df6c commit04d15d1

File tree

2 files changed

+24
-3
lines changed

2 files changed

+24
-3
lines changed

‎config/python.m4

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Autoconf macros for configuring the build of Python extension modules
33
#
4-
# $PostgreSQL: pgsql/config/python.m4,v 1.7 2003/11/29 19:51:17 pgsql Exp $
4+
# $PostgreSQL: pgsql/config/python.m4,v 1.8 2004/09/16 23:30:30 joe Exp $
55
#
66

77
# PGAC_PATH_PYTHON
@@ -21,11 +21,19 @@ fi
2121
# Determine the name of various directory of a given Python installation.
2222
AC_DEFUN([_PGAC_CHECK_PYTHON_DIRS],
2323
[AC_REQUIRE([PGAC_PATH_PYTHON])
24+
AC_MSG_CHECKING([for Python distutils module])
25+
if "${PYTHON}" 2>&- -c 'import distutils'
26+
then
27+
AC_MSG_RESULT(yes)
28+
else
29+
AC_MSG_RESULT(no)
30+
AC_MSG_ERROR([distutils module not found])
31+
fi
2432
AC_MSG_CHECKING([Python installation directories])
2533
python_version=`${PYTHON} -c "import sys; print sys.version[[:3]]"`
2634
python_prefix=`${PYTHON} -c "import sys; print sys.prefix"`
2735
python_execprefix=`${PYTHON} -c "import sys; print sys.exec_prefix"`
28-
python_configdir="${python_execprefix}/lib/python${python_version}/config"
36+
python_configdir=`${PYTHON} -c "from distutils.sysconfig import get_python_lib as f; import os; print os.path.join(f(plat_specific=1,standard_lib=1),'config')"`
2937
python_includespec="-I${python_prefix}/include/python${python_version}"
3038
if test "$python_prefix" != "$python_execprefix"; then
3139
python_includespec="-I${python_execprefix}/include/python${python_version} $python_includespec"

‎configure

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4221,12 +4221,25 @@ echo "$as_me: error: Python not found" >&2;}
42214221
fi
42224222

42234223

4224+
echo "$as_me:$LINENO: checking for Python distutils module" >&5
4225+
echo $ECHO_N "checking for Python distutils module... $ECHO_C" >&6
4226+
if "${PYTHON}" 2>&- -c 'import distutils'
4227+
then
4228+
echo "$as_me:$LINENO: result: yes" >&5
4229+
echo "${ECHO_T}yes" >&6
4230+
else
4231+
echo "$as_me:$LINENO: result: no" >&5
4232+
echo "${ECHO_T}no" >&6
4233+
{ { echo "$as_me:$LINENO: error: distutils module not found" >&5
4234+
echo "$as_me: error: distutils module not found" >&2;}
4235+
{ (exit 1); exit 1; }; }
4236+
fi
42244237
echo "$as_me:$LINENO: checking Python installation directories" >&5
42254238
echo $ECHO_N "checking Python installation directories... $ECHO_C" >&6
42264239
python_version=`${PYTHON} -c "import sys; print sys.version[:3]"`
42274240
python_prefix=`${PYTHON} -c "import sys; print sys.prefix"`
42284241
python_execprefix=`${PYTHON} -c "import sys; print sys.exec_prefix"`
4229-
python_configdir="${python_execprefix}/lib/python${python_version}/config"
4242+
python_configdir=`${PYTHON} -c "from distutils.sysconfig import get_python_lib as f; import os; print os.path.join(f(plat_specific=1,standard_lib=1),'config')"`
42304243
python_includespec="-I${python_prefix}/include/python${python_version}"
42314244
if test "$python_prefix" != "$python_execprefix"; then
42324245
python_includespec="-I${python_execprefix}/include/python${python_version} $python_includespec"

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp