[glom/glom-1-24] Find libpython* on Ubuntu Trusty 64-bit.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom/glom-1-24] Find libpython* on Ubuntu Trusty 64-bit.
- Date: Sun, 15 Dec 2013 11:21:50 +0000 (UTC)
commit 6c84c26ab2ab1eb1ea5612b83c351ec70cba0278
Author: Murray Cumming <murrayc murrayc com>
Date: Sat Dec 14 12:13:01 2013 -0800
Find libpython* on Ubuntu Trusty 64-bit.
* macros/mm-python.m4: Look in i386-linux-gnu too, as that seems
to be used in Ubuntu Trusty Tahr.
macros/mm-python.m4 | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/macros/mm-python.m4 b/macros/mm-python.m4
index b590979..fb3cb58 100644
--- a/macros/mm-python.m4
+++ b/macros/mm-python.m4
@@ -58,8 +58,8 @@ AS_IF([test "x$PYTHON_LIBS" = x],
_MM_PYTHON_SYSCONFIG([[get_config_var('LIBS')]], [PYTHON_LIBS=$mm_val])
set X
dnl On Windows the library is in libs/, not in lib/, so check there as well:
- _MM_PYTHON_SYSCONFIG([[EXEC_PREFIX]], [set "[$]@" "$mm_val/lib" "$mm_val/libs" "$mm_val/lib64"
"$mm_val/lib/i386-linux-gnu"])
- _MM_PYTHON_SYSCONFIG([[PREFIX]], [set "[$]@" "$mm_val/lib" "$mm_val/libs" "$mm_val/lib64"
"$mm_val/lib/i386-linux-gnu"])
+ _MM_PYTHON_SYSCONFIG([[EXEC_PREFIX]], [set "[$]@" "$mm_val/lib" "$mm_val/libs" "$mm_val/lib64"
"$mm_val/lib/i386-linux-gnu" "$mm_val/lib/x86_64-linux-gnu"])
+ _MM_PYTHON_SYSCONFIG([[PREFIX]], [set "[$]@" "$mm_val/lib" "$mm_val/libs" "$mm_val/lib64"
"$mm_val/lib/i386-linux-gnu" "$mm_val/lib/x86_64-linux-gnu"])
_MM_PYTHON_SYSCONFIG([[get_python_lib(True, True)]], [set "[$]@" "$mm_val/config" "$mm_val"])
_MM_PYTHON_SYSCONFIG([[get_python_lib(False, True)]], [set "[$]@" "$mm_val/config" "$mm_val"])
shift
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]