diff options
| author | Bastien Nocera <hadess@hadess.net> | 2007-10-17 20:03:31 +0000 |
|---|---|---|
| committer | Bastien Nocera <hadess@src.gnome.org> | 2007-10-17 20:03:31 +0000 |
| commit | 73606d27be2cf981f06a55317d47b0a333bcf13d (patch) | |
| tree | fa71fc9c8884fb4f9f108744d21a2fb1ce7f2f75 | |
| parent | d2ddc392c7d80bf6dc728e8c7b6385308b34c8fb (diff) | |
Work-around problems with python being installed in /usr/lib64 rather than
2007-10-17 Bastien Nocera <hadess@hadess.net>
* configure.in: Work-around problems with python being installed
in /usr/lib64 rather than /usr/lib
svn path=/trunk/; revision=4782
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 9 |
2 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2007-10-17 Bastien Nocera <hadess@hadess.net> + + * configure.in: Work-around problems with python being installed + in /usr/lib64 rather than /usr/lib + 2007-10-16 Bastien Nocera <hadess@hadess.net> * data/Makefile.am: diff --git a/configure.in b/configure.in index 63380004..8f8908d8 100644 --- a/configure.in +++ b/configure.in @@ -883,9 +883,14 @@ if test "x$have_python" != "xno"; then PY_PREFIX=`$PYTHON -c 'import sys ; print sys.prefix'` PY_EXEC_PREFIX=`$PYTHON -c 'import sys ; print sys.exec_prefix'` PYTHON_LIBS="-lpython$PYTHON_VERSION" - PYTHON_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python$PYTHON_VERSION/config" + if test -d $PY_EXEC_PREFIX/lib64 ; then + PYTHON_LIB_LOC="-L$PY_EXEC_PREFIX/lib64/python$PYTHON_VERSION/config" + PYTHON_MAKEFILE="$PY_EXEC_PREFIX/lib64/python$PYTHON_VERSION/config/Makefile" + else + PYTHON_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python$PYTHON_VERSION/config" + PYTHON_MAKEFILE="$PY_EXEC_PREFIX/lib/python$PYTHON_VERSION/config/Makefile" + fi PYTHON_CFLAGS="-I$PY_PREFIX/include/python$PYTHON_VERSION" - PYTHON_MAKEFILE="$PY_EXEC_PREFIX/lib/python$PYTHON_VERSION/config/Makefile" PYTHON_LOCALMODLIBS=`sed -n -e 's/^LOCALMODLIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE` PYTHON_BASEMODLIBS=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE` PYTHON_OTHER_LIBS=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE` |