[cairo-commit] pycairo ChangeLog,1.266,1.267 acinclude.m4,1.2,1.3

[Steve Chaplin]

Committed by: stevech1097

Update of /cvs/cairo/pycairo
In directory kemper:/tmp/cvs-serv16039

Modified Files:
	ChangeLog acinclude.m4 
Log Message:
'SC'

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/pycairo/ChangeLog,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -d -r1.266 -r1.267
--- ChangeLog	20 Nov 2007 09:16:09 -0000	1.266
+++ ChangeLog	2 Dec 2007 06:15:45 -0000	1.267
@@ -1,3 +1,8 @@
+2007-12-02  Steven Chaplin  <steve1097 # yahoo.com.au>
+
+	* acinclude.m4 : Fix #13460 by applying the patch from Sebastien
+	Bacher,	and rearranging a couple of lines.
+
 2007-11-20  Steven Chaplin  <steve1097 # yahoo.com.au>
 
 	* setup.py: update to use subprocess, and require Python 2.4

Index: acinclude.m4
===================================================================
RCS file: /cvs/cairo/pycairo/acinclude.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- acinclude.m4	24 Nov 2004 02:16:28 -0000	1.2
+++ acinclude.m4	2 Dec 2007 06:15:45 -0000	1.3
@@ -43,11 +43,15 @@
 [AC_REQUIRE([AM_PATH_PYTHON])
 AC_MSG_CHECKING(for headers required to compile python extensions)
 dnl deduce PYTHON_INCLUDES
-py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
-py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
-PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
-if test "$py_prefix" != "$py_exec_prefix"; then
-  PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+if test -x "$PYTHON-config"; then
+  PYTHON_INCLUDES=`$PYTHON-config --includes 2>/dev/null`
+else
+  py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
+  py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+  PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+  if test "$py_prefix" != "$py_exec_prefix"; then
+    PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+  fi
 fi
 AC_SUBST(PYTHON_INCLUDES)
 dnl check if the headers exist: