From 232b5684cad3ccfe03ccfbe3697fb347d5da44c9 Mon Sep 17 00:00:00 2001 From: Emmanuel Bouthenot Date: Thu, 27 Oct 2005 15:49:03 +0000 Subject: [PATCH] improve python LDFLAGS on *BSD --- configure.in | 7 +++++-- weechat/configure.in | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/configure.in b/configure.in index 82b781c48..6bfce46a5 100644 --- a/configure.in +++ b/configure.in @@ -234,10 +234,13 @@ if test "x$enable_python" = "xyes" ; then AC_MSG_RESULT(found) PYTHON_LIB=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LIBPL')"` + PYTHON_LFLAGS="-lpython$PYTHON_VERSION "`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LIBS')+' '+distutils.sysconfig.get_config_var('LINKFORSHARED')"` AC_MSG_CHECKING(for Python library) - if test -r "$PYTHON_LIB/libpython$PYTHON_VERSION.so" -o -r "$PYTHON_SYSPREFIX/lib/libpython$PYTHON_VERSION.so"; then - PYTHON_LFLAGS="-lpython$PYTHON_VERSION "`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LIBS')+' '+distutils.sysconfig.get_config_var('LINKFORSHARED')"` + if test -r "$PYTHON_LIB/libpython$PYTHON_VERSION.so"; then + PYTHON_LFLAGS="-L$PYTHON_LIB $PYTHON_LFLAGS" + elif test -r "$PYTHON_SYSPREFIX/lib/libpython$PYTHON_VERSION.so"; then + PYTHON_LFLAGS="-L$PYTHON_SYSPREFIX/lib/ $PYTHON_LFLAGS" else AC_MSG_ERROR([ *** Python library couldn't be found in your system. diff --git a/weechat/configure.in b/weechat/configure.in index 82b781c48..6bfce46a5 100644 --- a/weechat/configure.in +++ b/weechat/configure.in @@ -234,10 +234,13 @@ if test "x$enable_python" = "xyes" ; then AC_MSG_RESULT(found) PYTHON_LIB=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LIBPL')"` + PYTHON_LFLAGS="-lpython$PYTHON_VERSION "`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LIBS')+' '+distutils.sysconfig.get_config_var('LINKFORSHARED')"` AC_MSG_CHECKING(for Python library) - if test -r "$PYTHON_LIB/libpython$PYTHON_VERSION.so" -o -r "$PYTHON_SYSPREFIX/lib/libpython$PYTHON_VERSION.so"; then - PYTHON_LFLAGS="-lpython$PYTHON_VERSION "`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LIBS')+' '+distutils.sysconfig.get_config_var('LINKFORSHARED')"` + if test -r "$PYTHON_LIB/libpython$PYTHON_VERSION.so"; then + PYTHON_LFLAGS="-L$PYTHON_LIB $PYTHON_LFLAGS" + elif test -r "$PYTHON_SYSPREFIX/lib/libpython$PYTHON_VERSION.so"; then + PYTHON_LFLAGS="-L$PYTHON_SYSPREFIX/lib/ $PYTHON_LFLAGS" else AC_MSG_ERROR([ *** Python library couldn't be found in your system.