r21357 - gnucash/branches/2.4 - Find the python libraries and includes even if the path to them includes a symlink.
Micha Lenk
micha at code.gnucash.org
Mon Sep 26 16:21:20 EDT 2011
Author: micha
Date: 2011-09-26 16:21:20 -0400 (Mon, 26 Sep 2011)
New Revision: 21357
Trac: http://svn.gnucash.org/trac/changeset/21357
Modified:
gnucash/branches/2.4/
gnucash/branches/2.4/macros/ac_python_devel.m4
Log:
Find the python libraries and includes even if the path to them includes a symlink.
When python is installed using MacPorts there is a symlink in the path.
This is a backport of SVN rev. 21301 from trunk.
Original commit by Mike Alexander <mta at umich.edu>.
Property changes on: gnucash/branches/2.4
___________________________________________________________________
Added: svn:mergeinfo
+ /gnucash/trunk:21301
Modified: gnucash/branches/2.4/macros/ac_python_devel.m4
===================================================================
--- gnucash/branches/2.4/macros/ac_python_devel.m4 2011-09-26 16:39:21 UTC (rev 21356)
+++ gnucash/branches/2.4/macros/ac_python_devel.m4 2011-09-26 20:21:20 UTC (rev 21357)
@@ -22,7 +22,7 @@
AC_MSG_CHECKING([for Python include path])
python_path=`echo $PYTHON | sed "s,/bin.*$,,"`
for i in "$python_path/include/python$PYTHON_VERSION/" "$python_path/include/python/" "$python_path/" ; do
- python_path=`find $i -type f -name Python.h -print | sed "1q"`
+ python_path=`find -L $i -type f -name Python.h -print | sed "1q"`
if test -n "$python_path" ; then
break
fi
@@ -38,7 +38,7 @@
AC_MSG_CHECKING([for Python library path])
python_path=`echo $PYTHON | sed "s,/bin.*$,,"`
for i in "$python_path/lib/python$PYTHON_VERSION/config/" "$python_path/lib/python$PYTHON_VERSION/" "$python_path/lib/python/config/" "$python_path/lib/python/" "$python_path/" ; do
- python_path=`find $i -type f -name libpython$PYTHON_VERSION.* -print | sed "1q"`
+ python_path=`find -L $i -type f -name libpython$PYTHON_VERSION.* -print | sed "1q"`
if test -n "$python_path" ; then
break
fi
More information about the gnucash-changes
mailing list