Bug 422463, fix pyxpcom build on some x86_64 systems r=mhammond sr=benjamin
authormarco@gnome.org
Tue, 18 Mar 2008 04:57:31 -0700
changeset 13225 d693ba8c363dbd68f5b7fe1b2c68fa43e4591c00
parent 13224 e4802e08c44f967d29a699333847ec7978379e34
child 13226 cceedac57527a6237832bf2991df6eded0640734
push idunknown
push userunknown
push dateunknown
reviewersmhammond, benjamin
bugs422463
milestone1.9b5pre
Bug 422463, fix pyxpcom build on some x86_64 systems r=mhammond sr=benjamin
configure.in
--- a/configure.in
+++ b/configure.in
@@ -7312,16 +7312,18 @@ if test `echo "$MOZ_EXTENSIONS" | grep -
         dnl   dotted versioned .so file because this is the one that
         dnl   the PyXPCOM build mechanics tries to link to.
         dnl   XXX Should find a better way than hardcoding "1.0".
         dnl - Python developement tree dir layouts are NOT allowed here
         dnl   because the PyXPCOM build just dies on it later anyway.
         dnl - Fixes to the above by Python/*nix knowledgable people welcome!
         if test -f "$MOZ_PYTHON_PREFIX/lib/libpython$MOZ_PYTHON_VER_DOTTED.so.1.0"; then
             MOZ_PYTHON_LIBS="-L$MOZ_PYTHON_PREFIX/lib -lpython$MOZ_PYTHON_VER_DOTTED"
+        elif test -f "$MOZ_PYTHON_PREFIX/lib64/libpython$MOZ_PYTHON_VER_DOTTED.so.1.0"; then
+            MOZ_PYTHON_LIBS="-L$MOZ_PYTHON_PREFIX/lib64 -lpython$MOZ_PYTHON_VER_DOTTED"
         elif test -f "$MOZ_PYTHON_PREFIX/lib/libpython$MOZ_PYTHON_VER_DOTTED.so"; then
             MOZ_PYTHON_LIBS="-L$MOZ_PYTHON_PREFIX/lib -lpython$MOZ_PYTHON_VER_DOTTED"
         elif test -f "$MOZ_PYTHON_PREFIX/libpython$MOZ_PYTHON_VER_DOTTED.so"; then
             dnl Don't Python development tree directory layout.
             MOZ_PYTHON_LIBS="-L$MOZ_PYTHON_PREFIX -lpython$MOZ_PYTHON_VER_DOTTED"
             AC_MSG_ERROR([The Python at $MOZ_PYTHON_PREFIX looks like a dev tree. The PyXPCOM build cannot handle this yet. You must 'make install' Python and use the installed tree.])
         elif test "$OS_ARCH" = "Darwin"; then
             dnl We do Darwin last, so if a custom non-framework build of