all repos — openbox @ 035f7d3ff483238c801fc785fc8fd2dac0e91cfc

openbox fork - make it a bit more like ryudo

use -export-dynamic when linking libpython.a
Dana Jansens danakj@orodu.net
commit

035f7d3ff483238c801fc785fc8fd2dac0e91cfc

parent

50863470923dec831ba1995e393477378fb245d4

2 files changed, 7 insertions(+), 1 deletions(-)

jump to
M m4/python.m4m4/python.m4

@@ -2,7 +2,8 @@ # PYTHON_DEVEL()

# # Checks for Python and tries to get the include path to 'Python.h', and # the libpython library. -# It provides the $(PYTHON_CFLAGS) $(PYTHON_LIBS) output variables. +# It provides the $(PYTHON_CFLAGS) $(PYTHON_LIBS) $(PYTHON_LDFLAGS) output +# variables. AC_DEFUN([PYTHON_DEVEL], [ AC_REQUIRE([AM_PATH_PYTHON])

@@ -41,17 +42,20 @@ do

if test -r "$i/libpython$PYTHON_VERSION.so"; then PYLIB="$i/libpython$PYTHON_VERSION.so" PYTHON_LIBS="-L$i -lpython$PYTHON_VERSION" + PYTHON_LDFLAGS="" break else if test -r "$i/libpython$PYTHON_VERSION.a"; then PYLIB="$i/libpython$PYTHON_VERSION.a" PYTHON_LIBS="-L$i -lpython$PYTHON_VERSION -lpthread -ldl -lutil -lm" + PYTHON_LDFLAGS="-export-dynamic" break else # look for really old versions if test -r "$i/libPython.a"; then PYLIB="$i/libPython.a" PYTHON_LIBS="-L$i -lModules -lPython -lObjects -lParser" + PYTHON_LDFLAGS="-export-dynamic" break fi fi

@@ -64,4 +68,5 @@ else

AC_MSG_ERROR([cannot find python library]) fi AC_SUBST([PYTHON_LIBS]) + AC_SUBST([PYTHON_LDFLAGS]) ])
M src/Makefile.amsrc/Makefile.am

@@ -21,6 +21,7 @@ openbox3_SOURCES= actions.cc client.cc frame.cc openbox.cc screen.cc \

main.cc backgroundwidget.cc labelwidget.cc \ buttonwidget.cc python.cc bindings.cc \ openbox_wrap.cc +openbox3_LDFLAGS= $(PYTHON_LDFLAGS) script_DATA = openbox.py