merge and commit

1 files changed, 17 insertions, 7 deletions

diff --git a/configure b/configure
index 075541ca..3f05770b 100755
--- a/configure
+++ b/configure
@@ -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 @@ else:
     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 @@ then
 ***** 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 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 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