* do add intl directory back to Makefile.am ... no use distributing the stuff if...

* link pangocairo and not pango ... thanks Stephen S. Disbrow for finding this

git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.4/program@2052 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/Makefile.am b/Makefile.am
index 1961ef23dc48c3a481a358e5cdbb2195fa75e708..114a1be5e8adc19405550d6a976a9530d842ccb3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ RSYNC = rsync --rsh=ssh
 
 # build the following subdirectories
 
-SUBDIRS = po src examples doc bindings
+SUBDIRS = po src examples doc bindings intl
 
  # the following files are not mentioned in any other Makefile
 EXTRA_DIST = COPYRIGHT CHANGES WIN32-BUILD-TIPS.txt TODO CONTRIBUTORS THREADS \

diff --git a/configure.ac b/configure.ac
index eda5dca744d61288e7b4630b4841010d3012775e..29be00cacdb5c7b202f1f76c689bfb22ee787aba 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -528,7 +528,7 @@ EX_CHECK_ALL(cairo,      cairo_svg_surface_create,      cairo-svg.h,
 EX_CHECK_ALL(cairo,      cairo_pdf_surface_create,      cairo-pdf.h,            cairo-pdf,   1.4.6,  http://cairographics.org/releases/, "")
 EX_CHECK_ALL(cairo,      cairo_ps_surface_create,       cairo-ps.h,             cairo-ps,    1.4.6,  http://cairographics.org/releases/, "")
 EX_CHECK_ALL(glib-2.0,   glib_check_version,            glib.h,                 glib-2.0,    2.12.12, ftp://ftp.gtk.org/pub/glib/2.12/, "")
-EX_CHECK_ALL(pango-1.0,  pango_cairo_context_set_font_options,  pango/pango.h,  pangocairo,  1.17,    http://ftp.gnome.org/pub/GNOME/sources/pango/1.17, "")
+EX_CHECK_ALL(pangocairo-1.0,  pango_cairo_context_set_font_options,  pango/pango.h,  pangocairo,  1.17,    http://ftp.gnome.org/pub/GNOME/sources/pango/1.17, "")
 EX_CHECK_ALL(xml2,       xmlParseFile,                  libxml/parser.h,        libxml-2.0,        2.6.31,  http://xmlsoft.org/downloads.html, /usr/include/libxml2)
 
 if test "$EX_CHECK_ALL_ERR" = "YES"; then