[dia] Bug 610530 - Don't use LOCALMODLIBS from Python for linking
- From: Hans Breuer <hans src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dia] Bug 610530 - Don't use LOCALMODLIBS from Python for linking
- Date: Thu, 29 Jul 2010 16:50:40 +0000 (UTC)
commit 2edec01c98ff66ebb03d59c62196612917c501a1
Author: Hans Breuer <hans breuer org>
Date: Thu Jul 29 18:46:45 2010 +0200
Bug 610530 - Don't use LOCALMODLIBS from Python for linking
Stop failing to link on Debian and derivates.
acinclude.m4 | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/acinclude.m4 b/acinclude.m4
index f40c738..09026f7 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -231,17 +231,16 @@ py_config_dir="$py_prefix/$py_lib/python${PYTHON_VERSION}/config"
py_makefile="${py_config_dir}/Makefile"
if test -f "$py_makefile"; then
dnl extra required libs
- py_localmodlibs=`sed -n -e 's/^LOCALMODLIBS=\(.*\)/\1/p' $py_makefile`
py_basemodlibs=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $py_makefile`
py_other_libs=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $py_makefile`
dnl now the actual libpython
if test -e "$PYTHON_PREFIX/${py_lib}/libpython${PYTHON_VERSION}.so"; then
- PYTHON_LIBS="-L${py_config_dir} -lpython${PYTHON_VERSION} $py_localmodlibs $py_basemodlibs $py_other_libs"
+ PYTHON_LIBS="-L${py_config_dir} -lpython${PYTHON_VERSION} $py_basemodlibs $py_other_libs"
AC_MSG_RESULT(found)
elif test -e "${py_config_dir}/libpython${PYTHON_VERSION}.a"; then
dnl Same as above, but looking into the previous location: bug #581533
- PYTHON_LIBS="-L${py_config_dir} -lpython${PYTHON_VERSION} $py_localmodlibs $py_basemodlibs $py_other_libs"
+ PYTHON_LIBS="-L${py_config_dir} -lpython${PYTHON_VERSION} $py_basemodlibs $py_other_libs"
AC_MSG_RESULT(found)
else
AC_MSG_RESULT(not found)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]