Martin Pitt has proposed merging lp:~pitti/libindicate/no-hardcoded-python into lp:libindicate.
Requested reviews: Indicator Applet Developers (indicator-applet-developers) Related bugs: #690555 Don't force Python 2.6 https://bugs.launchpad.net/bugs/690555 See bug 690555 for details. -- https://code.launchpad.net/~pitti/libindicate/no-hardcoded-python/+merge/43754 Your team ayatana-commits is subscribed to branch lp:libindicate.
=== modified file 'bindings/python/Makefile.am' --- bindings/python/Makefile.am 2010-06-02 17:42:29 +0000 +++ bindings/python/Makefile.am 2010-12-15 11:49:52 +0000 @@ -21,7 +21,7 @@ indicatedir = $(pkgpyexecdir)/indicate indicate_LTLIBRARIES = _indicate.la -_indicate_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_indicate -lpyglib-2.0-python2.6 -lpython2.6 +_indicate_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_indicate _indicate_la_LIBADD = $(INDICATE_PYTHON_LIBS) -L$(top_builddir)/libindicate/.libs/ -lindicate -L$(top_builddir)/libindicate-gtk/.libs -lindicate-gtk $(LIBINDICATEGTK_LIBS) _indicate_la_SOURCES = indicatemodule.c nodist__indicate_la_SOURCES = indicate.c === modified file 'configure.ac' --- configure.ac 2010-09-15 16:28:22 +0000 +++ configure.ac 2010-12-15 11:49:52 +0000 @@ -154,6 +154,11 @@ PKG_CHECK_MODULES(INDICATE_PYTHON, [pygtk-2.0 >= $PYGTK_REQUIRED pygobject-2.0 >= $PYGOBJECT_REQUIRED]) + +INDICATE_PYTHON_LIBS+=$(python$PYTHON_VERSION-config --libs) +# libpyglib-2.0-python* doesn't have a pkgconfig unfortunately +INDICATE_PYTHON_LIBS+=" -lpyglib-2.0-python$PYTHON_VERSION" + AC_SUBST(INDICATE_PYTHON_CFLAGS) AC_SUBST(INDICATE_PYTHON_LIBS)
_______________________________________________ Mailing list: https://launchpad.net/~ayatana-commits Post to : [email protected] Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
