diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2013-03-26 16:03:49 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@googlemail.com> | 2013-03-26 16:03:49 +0000 |
| commit | d2bba282171a9e2c70a624794650689ec4531047 (patch) | |
| tree | 726ae8aa2ae75cc8272f13fa09ed8abc56e60724 /src/Makefile.am | |
| parent | Revert r12183 and replace with better work-around for Pango bug (incorrect (diff) | |
| download | inkscape-d2bba282171a9e2c70a624794650689ec4531047.tar.gz inkscape-d2bba282171a9e2c70a624794650689ec4531047.zip | |
Fix Glibmm inclusions for Gtk+ 3 builds and implement a Gtk+ 3 compatible check for X11 backend
Fixed bugs:
- https://launchpad.net/bugs/1160252
- https://launchpad.net/bugs/1122774
(bzr r12247)
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 7d8a9ef50..b9ec53ab1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -49,7 +49,8 @@ all_libs = \ $(LIBCDR_LIBS) \ $(DBUS_LIBS) \ $(GDL_LIBS) \ - $(IMAGEMAGICK_LIBS) + $(IMAGEMAGICK_LIBS) \ + $(X11_LIBS) # Add sources common for Inkscape and Inkview to this variable. ink_common_sources = @@ -83,7 +84,8 @@ AM_CPPFLAGS = \ $(WIN32_CFLAGS) \ -I$(srcdir)/bind/javainc \ -I$(srcdir)/bind/javainc/linux \ - -I$(builddir)/extension/dbus + -I$(builddir)/extension/dbus \ + $(X11_CFLAGS) CXXTEST_TEMPLATE = $(srcdir)/cxxtest-template.tpl CXXTESTGENFLAGS = --root --have-eh --template=$(CXXTEST_TEMPLATE) |