------------------------------------------------------------
revno: 991
committer: Mark Sapiro <[EMAIL PROTECTED]>
branch nick: 2.1
timestamp: Fri 2007-09-21 15:41:19 -0700
message:
It is reported that some RedHat packages (for at least FC5 and FC6, but not
FC7) contain a full working distutils in the 'python' package, but only
contain the Python header files in the 'python-devel' package. This allows
configure to succeed, but make install fails to setup the japanese and
korean codecs. This change adds a specific test for Python.h to the
distutils test.
modified:
configure
=== modified file 'configure'
--- a/configure 2006-12-29 21:56:04 +0000
+++ b/configure 2007-09-21 22:41:19 +0000
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 7462 .
+# From configure.in Revision: 8122 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59.
#
@@ -1446,7 +1446,14 @@
except distutils.errors.DistutilsPlatformError:
res = "no"
else:
- res = "yes"
+ # some RedHat packages put distutils in python, but the C headers
+ # are in python-devel so check for headers too.
+ import os.path
+ pdothpath = distutils.sysconfig.get_config_var('CONFINCLUDEPY')
+ if os.path.isfile(os.path.join(pdothpath, "Python.h")):
+ res = "yes"
+ else:
+ res = "no"
fp = open("conftest.out", "w")
fp.write("%s\n" % res)
fp.close()
@@ -1462,13 +1469,15 @@
***** Distutils is not available or is incomplete for $PYTHON
***** If you installed Python from RPM (or other package manager)
***** be sure to install the -devel package, or install Python
-***** from source. See README.LINUX for details" >&5
+***** from source. See sec. 15.1 of the Installation Manual for
+***** details" >&5
echo "$as_me: error:
***** Distutils is not available or is incomplete for $PYTHON
***** If you installed Python from RPM (or other package manager)
***** be sure to install the -devel package, or install Python
-***** from source. See README.LINUX for details" >&2;}
+***** from source. See sec. 15.1 of the Installation Manual for
+***** details" >&2;}
{ (exit 1); exit 1; }; }
fi
echo "$as_me:$LINENO: result: $havedistutils" >&5
@@ -4369,9 +4378,10 @@
# 1. Remove the extension, and $U if already installed.
ac_i=`echo "$ac_i" |
sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
- # 2. Add them.
- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
+ # will be set to the directory where LIBOBJS objects are built.
+ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
done
LIBOBJS=$ac_libobjs
--
https://code.launchpad.net/~mailman-coders/mailman/2.1
You are receiving this branch notification because you are subscribed to it.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/2.1/+subscription/mailman-checkins.
_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
