libindicate

Merge lp:~pitti/libindicate/no-hardcoded-python into lp:libindicate/0.6

  1. no-hardcoded-python
  2. Merge into trunk
Proposed by Martin Pitt
Status: Merged
Merged at revision: 394
Proposed branch: lp:~pitti/libindicate/no-hardcoded-python
Merge into: lp:libindicate/0.6
Diff against target: 27 lines (+6/-1)
2 files modified
bindings/python/Makefile.am (+1/-1)
configure.ac (+5/-0)
To merge this branch: bzr merge lp:~pitti/libindicate/no-hardcoded-python
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
Review via email: mp+43754@code.launchpad.net

Description of the change

See bug 690555 for details.

To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bindings/python/Makefile.am'
2--- bindings/python/Makefile.am 2010-06-02 17:42:29 +0000
3+++ bindings/python/Makefile.am 2010-12-15 11:49:52 +0000
4@@ -21,7 +21,7 @@
5 indicatedir = $(pkgpyexecdir)/indicate
6 indicate_LTLIBRARIES = _indicate.la
7
8-_indicate_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_indicate -lpyglib-2.0-python2.6 -lpython2.6
9+_indicate_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_indicate
10 _indicate_la_LIBADD = $(INDICATE_PYTHON_LIBS) -L$(top_builddir)/libindicate/.libs/ -lindicate -L$(top_builddir)/libindicate-gtk/.libs -lindicate-gtk $(LIBINDICATEGTK_LIBS)
11 _indicate_la_SOURCES = indicatemodule.c
12 nodist__indicate_la_SOURCES = indicate.c
13
14=== modified file 'configure.ac'
15--- configure.ac 2010-09-15 16:28:22 +0000
16+++ configure.ac 2010-12-15 11:49:52 +0000
17@@ -154,6 +154,11 @@
18
19 PKG_CHECK_MODULES(INDICATE_PYTHON, [pygtk-2.0 >= $PYGTK_REQUIRED
20 pygobject-2.0 >= $PYGOBJECT_REQUIRED])
21+
22+INDICATE_PYTHON_LIBS+=$(python$PYTHON_VERSION-config --libs)
23+# libpyglib-2.0-python* doesn't have a pkgconfig unfortunately
24+INDICATE_PYTHON_LIBS+=" -lpyglib-2.0-python$PYTHON_VERSION"
25+
26 AC_SUBST(INDICATE_PYTHON_CFLAGS)
27 AC_SUBST(INDICATE_PYTHON_LIBS)
28

Subscribers

People subscribed via source and target branches