qt4/src/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
New commits: commit b97c28c42a18d1c2a8fabea52c092d948811d582 Merge: 32bb874... f8c116f... Author: Albert Astals Cid <[email protected]> Date: Tue Sep 25 23:22:23 2012 +0200 Merge remote-tracking branch 'origin/poppler-0.20' Conflicts: qt4/src/Makefile.am diff --cc qt4/src/Makefile.am index 745db97,22033e3..b91daf0 --- a/qt4/src/Makefile.am +++ b/qt4/src/Makefile.am @@@ -1,7 -1,9 +1,8 @@@ INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/poppler \ - $(POPPLER_QT4_CFLAGS) - $(FONTCONFIG_CFLAGS) \ + $(POPPLER_QT4_CFLAGS) \ + $(LCMS_CFLAGS) SUFFIXES: .moc commit f8c116f1e0fbf3516ce228fbb34c33d6b618bed0 Author: Albert Astals Cid <[email protected]> Date: Tue Sep 25 23:07:55 2012 +0200 Add LCMS_FLAGS Fixes compilation when lcms is on non standard locations Bug #55326 diff --git a/qt4/src/Makefile.am b/qt4/src/Makefile.am index 02e0720..22033e3 100644 --- a/qt4/src/Makefile.am +++ b/qt4/src/Makefile.am @@ -2,7 +2,8 @@ INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/poppler \ $(FONTCONFIG_CFLAGS) \ - $(POPPLER_QT4_CFLAGS) + $(POPPLER_QT4_CFLAGS) \ + $(LCMS_CFLAGS) SUFFIXES: .moc _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
