From: oetiker Date: Sun, 28 Mar 2010 09:04:49 +0000 (+0000) Subject: * do add intl directory back to Makefile.am ... no use distributing the stuff if... X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=53e0e11306bf5fca6b5738e98402f3632a8a989c;p=rrdtool.git * do add intl directory back to Makefile.am ... no use distributing the stuff if we don't use it * link pangocairo and not pango ... thanks Stephen S. Disbrow for finding this git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@2052 a5681a0c-68f1-0310-ab6d-d61299d08faa --- diff --git a/Makefile.am b/Makefile.am index 1961ef2..114a1be 100644 --- 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 eda5dca..29be00c 100644 --- 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