summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-11 02:21:22 -0600
committerSlávek Banko <slavek.banko@axis.cz>2013-03-30 18:48:42 +0100
commit484967ec3112d0bf8fec15b81be0ba68e3c87f23 (patch)
treeb0a5fda6f8ec1220aa1a5dcfd50004d69949e319
parent6e6feb9df80244c0b5af5cb760bd6d714e0daad2 (diff)
downloadadmin-484967ec3112d0bf8fec15b81be0ba68e3c87f23.tar.gz
admin-484967ec3112d0bf8fec15b81be0ba68e3c87f23.zip
Fix Python library detection on multiarch systems
(cherry picked from commit 39466b7b95f25a3e0f6da52b156b194b10cbac9d)
-rw-r--r--acinclude.m4.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/acinclude.m4.in b/acinclude.m4.in
index 432d334..3975a14 100644
--- a/acinclude.m4.in
+++ b/acinclude.m4.in
@@ -4881,7 +4881,8 @@ fi
PYTHONINC=-I$python_incdir
-python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
+python_multiarch_libdirs="`find /usr/lib/ -maxdepth 1 -type d | xargs echo`"
+python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $python_multiarch_libdirs $kde_extra_libs"
AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
if test ! -r $python_libdir/libpython$version.so; then
AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)