Index: configure
===================================================================
RCS file: /cvsroot/pgsql-server/configure,v
retrieving revision 1.393
diff -c -r1.393 configure
*** configure	11 Sep 2004 02:12:14 -0000	1.393
--- configure	16 Sep 2004 23:28:44 -0000
***************
*** 4221,4232 ****
  fi
  
  
  echo "$as_me:$LINENO: checking Python installation directories" >&5
  echo $ECHO_N "checking Python installation directories... $ECHO_C" >&6
  python_version=`${PYTHON} -c "import sys; print sys.version[:3]"`
  python_prefix=`${PYTHON} -c "import sys; print sys.prefix"`
  python_execprefix=`${PYTHON} -c "import sys; print sys.exec_prefix"`
! python_configdir="${python_execprefix}/lib/python${python_version}/config"
  python_includespec="-I${python_prefix}/include/python${python_version}"
  if test "$python_prefix" != "$python_execprefix"; then
    python_includespec="-I${python_execprefix}/include/python${python_version} $python_includespec"
--- 4221,4245 ----
  fi
  
  
+ echo "$as_me:$LINENO: checking for Python distutils module" >&5
+ echo $ECHO_N "checking for Python distutils module... $ECHO_C" >&6
+ if "${PYTHON}" 2>&- -c 'import distutils'
+ then
+     echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+     echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+     { { echo "$as_me:$LINENO: error: distutils module not found" >&5
+ echo "$as_me: error: distutils module not found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
  echo "$as_me:$LINENO: checking Python installation directories" >&5
  echo $ECHO_N "checking Python installation directories... $ECHO_C" >&6
  python_version=`${PYTHON} -c "import sys; print sys.version[:3]"`
  python_prefix=`${PYTHON} -c "import sys; print sys.prefix"`
  python_execprefix=`${PYTHON} -c "import sys; print sys.exec_prefix"`
! 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')"`
  python_includespec="-I${python_prefix}/include/python${python_version}"
  if test "$python_prefix" != "$python_execprefix"; then
    python_includespec="-I${python_execprefix}/include/python${python_version} $python_includespec"
Index: config/python.m4
===================================================================
RCS file: /cvsroot/pgsql-server/config/python.m4,v
retrieving revision 1.7
diff -c -r1.7 python.m4
*** config/python.m4	29 Nov 2003 19:51:17 -0000	1.7
--- config/python.m4	16 Sep 2004 23:28:44 -0000
***************
*** 21,31 ****
  # Determine the name of various directory of a given Python installation.
  AC_DEFUN([_PGAC_CHECK_PYTHON_DIRS],
  [AC_REQUIRE([PGAC_PATH_PYTHON])
  AC_MSG_CHECKING([Python installation directories])
  python_version=`${PYTHON} -c "import sys; print sys.version[[:3]]"`
  python_prefix=`${PYTHON} -c "import sys; print sys.prefix"`
  python_execprefix=`${PYTHON} -c "import sys; print sys.exec_prefix"`
! python_configdir="${python_execprefix}/lib/python${python_version}/config"
  python_includespec="-I${python_prefix}/include/python${python_version}"
  if test "$python_prefix" != "$python_execprefix"; then
    python_includespec="-I${python_execprefix}/include/python${python_version} $python_includespec"
--- 21,39 ----
  # Determine the name of various directory of a given Python installation.
  AC_DEFUN([_PGAC_CHECK_PYTHON_DIRS],
  [AC_REQUIRE([PGAC_PATH_PYTHON])
+ AC_MSG_CHECKING([for Python distutils module])
+ if "${PYTHON}" 2>&- -c 'import distutils'
+ then
+     AC_MSG_RESULT(yes)
+ else
+     AC_MSG_RESULT(no)
+     AC_MSG_ERROR([distutils module not found])
+ fi
  AC_MSG_CHECKING([Python installation directories])
  python_version=`${PYTHON} -c "import sys; print sys.version[[:3]]"`
  python_prefix=`${PYTHON} -c "import sys; print sys.prefix"`
  python_execprefix=`${PYTHON} -c "import sys; print sys.exec_prefix"`
! 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')"`
  python_includespec="-I${python_prefix}/include/python${python_version}"
  if test "$python_prefix" != "$python_execprefix"; then
    python_includespec="-I${python_execprefix}/include/python${python_version} $python_includespec"
