Merge lp://staging/~florian-brandes/ubuntu/oneiric/quickplot/fix-for-770785 into lp://staging/ubuntu/oneiric/quickplot
Proposed by
Florian Brandes
| Status: | Merged |
|---|---|
| Merged at revision: | 8 |
| Proposed branch: | lp://staging/~florian-brandes/ubuntu/oneiric/quickplot/fix-for-770785 |
| Merge into: | lp://staging/ubuntu/oneiric/quickplot |
| Diff against target: |
83 lines (+27/-6) 5 files modified
Makefile.am (+14/-4) configure.ac (+5/-1) debian/changelog (+6/-0) debian/control (+1/-1) debian/rules (+1/-0) |
| To merge this branch: | bzr merge lp://staging/~florian-brandes/ubuntu/oneiric/quickplot/fix-for-770785 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Luke Yelavich (community) | Needs Fixing | ||
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
Changed configure.ac and Makefile.am to fix FTBFS.
Added:
PKG_CHECK_
PKG_CHECK_
PKG_CHECK_
to configure.ac to separately check for wanted modules and added
AM_CPPFLAGS = $(GTK_CFLAGS) \
$(GTKMM_CFLAGS) \
$(SNDFILE_CFLAGS)
quickplot_CXXFLAGS = -DHTMLDIR=
quickplot_LDADD = $(GTK_LIBS) \
$(GTKMM_LIBS) \
$(SNDFILE_LIBS)
to Makefile.am to automatically choose the libs and compiler flags, since it didn't seem to work if done "manually" by pkg-config in configure.ac.
To post a comment you must log in.
Revision history for this message
| Florian Brandes (florian-brandes) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks for your work. I see what you changed in configure.ac which is fine, however I would prefer if you gave a bit more information in the changelog as to what exactly you changed to allow the package to properly build again. I'd also document the fact that you added dh-autoreconf and used dh-autoreconf in the package build process.
Otherwise, looks good, thanks for your work.