[glom] Fix the build on Ubuntu Raring.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] Fix the build on Ubuntu Raring.
- Date: Mon, 25 Feb 2013 13:23:09 +0000 (UTC)
commit bab3794ddd4dccef4dbcf1a425290450192e9cbe
Author: Murray Cumming <murrayc murrayc com>
Date: Mon Feb 25 14:22:51 2013 +0100
Fix the build on Ubuntu Raring.
* macros/macros/mm-python.m4: Also check in
/usr/lib/i386-linux-gnu/ because that is where Ubuntu Raring
(and maybe Debian) put libpython2.7 there.
ChangeLog | 8 ++++++++
macros/mm-python.m4 | 6 +++---
2 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 0d56e2c..ec0a5c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-02-25 Murray Cumming <murrayc murrayc com>
+
+ Fix the build on Ubuntu Raring.
+
+ * macros/macros/mm-python.m4: Also check in
+ /usr/lib/i386-linux-gnu/ because that is where Ubuntu Raring
+ (and maybe Debian) put libpython2.7 there.
+
2013-02-04 Murray Cumming <murrayc murrayc com>
MySQL backend: Removed some unnused variables.
diff --git a/macros/mm-python.m4 b/macros/mm-python.m4
index 505f5b2..b590979 100644
--- a/macros/mm-python.m4
+++ b/macros/mm-python.m4
@@ -30,7 +30,7 @@ AS_IF([test "[$]?" -eq 0 && test "x$mm_val" != x], [$2], [$3])[]dnl
## MM_CHECK_MODULE_PYTHON
##
## Check whether Python is installed, and determine the include path
-## and libraries needed for linking an C or C++ program with Python.
+## and libraries needed for linking a C or C++ program with Python.
## The resulting configuration is stored in the PYTHON_CPPFLAGS and
## PYTHON_LIBS substitution variables.
##
@@ -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_PYTHON_SYSCONFIG([[PREFIX]], [set "[$]@" "$mm_val/lib" "$mm_val/libs" "$mm_val/lib64"])
+ _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([[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]