summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--librsvg/Makefile.am2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9c2b87dc1..3d19dcf0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-02-14 Ramiro Estrugo <ramiro@eazel.com>
+
+ * librsvg/Makefile.am: Move $(FREETYPE2_CFLAGS) all the way to the
+ top of $(INCLUDES), so that if there are multiple versions of
+ freetype installed in the build machine, then we will catch only
+ the one we are interested in.
+
2001-02-14 Kjartan Maraas <kmaraas@gnome.org>
* configure.in: Added Norwegian (nynorsk) to ALL_LINGUAS.
diff --git a/librsvg/Makefile.am b/librsvg/Makefile.am
index 8852f3567..1ee84e61e 100644
--- a/librsvg/Makefile.am
+++ b/librsvg/Makefile.am
@@ -9,11 +9,11 @@ noinst_PROGRAMS =\
noinst_LTLIBRARIES = librsvg.la
INCLUDES = \
+ $(FREETYPE2_CFLAGS) \
$(GNOME_CFLAGS) \
$(GNOMECANVASPIXBUF_INCLUDEDIR) \
$(GDK_PIXBUF_CFLAGS) \
$(XML_CFLAGS) \
- $(FREETYPE2_CFLAGS) \
$(WERROR) \
-D_REENTRANT \
-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \