From: oetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Date: Mon, 12 May 2008 23:03:04 +0000 (+0000)
Subject: some changes to make things work on opensolaris 2008.05
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=54e4ae89de147e30c1cefedaec3f818387c23a5f;p=rrdtool-all.git

some changes to make things work on opensolaris 2008.05


git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk@1350 a5681a0c-68f1-0310-ab6d-d61299d08faa
---

diff --git a/program/configure.ac b/program/configure.ac
index 65256caa..b23d8268 100644
--- a/program/configure.ac
+++ b/program/configure.ac
@@ -307,8 +307,10 @@ dnl gettext
 GETTEXT_PACKAGE=rrdtool
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Gettext package])
+AM_GLIB_GNU_GETTEXT()
 IT_PROG_INTLTOOL([0.35.0],[no-xml])
-AM_GLIB_GNU_GETTEXT
+
+AM_MAINTAINER_MODE
 
 dnl How the vertical axis label is printed
 AC_ARG_VAR(RRDGRAPH_YLEGEND_ANGLE, 
@@ -642,8 +644,13 @@ AC_SUBST(ALL_LIBS)
 
 CONFIGURE_PART(Prep for Building Language Bindings)
   
-dnl Check for Perl.
+dnl Check for Perl and friends
+PATH=/usr/perl5/bin:$PATH
+export PATH
 AC_PATH_PROG(PERL, perl, no)
+AC_PATH_PROG(POD2MAN, pod2man, no)
+AC_PATH_PROG(POD2HTML, pod2html, no)
+
 
 AC_ARG_ENABLE(perl,[  --disable-perl          do not build the perl modules],
 [],[enable_perl=yes])
diff --git a/program/doc/Makefile.am b/program/doc/Makefile.am
index 73962317..16fd6175 100644
--- a/program/doc/Makefile.am
+++ b/program/doc/Makefile.am
@@ -39,7 +39,7 @@ all-local: link txt man html-local
 	perl -n -e 'if (/^=include\s+(\S+)/){open F,"$$1.inc" || die $$?;print <F>; close F} else {print}'  $<  > $@
 
 .pod.1 .pm.1 .pl.1:
-	-pod2man --release=$(VERSION) --center=rrdtool $<  > $@
+	@POD2MAN@ --release=$(VERSION) --center=rrdtool $<  > $@
 
 .1.txt:
 	GROFF_NO_SGR=1 @NROFF@ -man -Tlp $< > $@
@@ -48,7 +48,7 @@ all-local: link txt man html-local
 	@TROFF@ -man $< | ps2pdf - $@
 
 .pm.html .pod.html .pl.html:
-	-pod2html --infile=$< --outfile=$@ --noindex --htmlroot=. --podpath=. --title=$*
+	@POD2HTML@ --infile=$< --outfile=$@ --noindex --htmlroot=. --podpath=. --title=$*
 
 RRDs.pod:
 	$(LN_S) $(top_srcdir)/bindings/perl-shared/RRDs.pm RRDs.pod
diff --git a/program/doc/rrdbuild.pod b/program/doc/rrdbuild.pod
index 5fe138d7..1318e659 100644
--- a/program/doc/rrdbuild.pod
+++ b/program/doc/rrdbuild.pod
@@ -2,9 +2,7 @@
 
 rrdbuild - Instructions for building RRDtool
 
-=head1 DESCRIPTION
-
-=head2 Overview
+=head1 OVERVIEW
 
 If you downloaded the source of rrdtool you have to compile it. This
 document will give some information on how this is done.
@@ -24,7 +22,7 @@ We further assume that your copies of B<tar> and B<make> are actually B<GNU
 tar> and B<GNU make> respectively. It could be that they are installed as
 B<gtar> and B<gmake> on your system.
 
-=head2 Building
+=head1 OPTIMISTIC BUILD
 
 Before you start to build RRDtool, you have to decide two things:
 
@@ -63,13 +61,40 @@ pre-installed.
  ./configure --prefix=$INSTALL_DIR && make && make install
 
 Ok, this was very optimistic. This try will probably have ended with
-B<configure> complaining about several missing libraries. If you are on a
-Linux or *bsd system you may want to just install the missing bits from your
-software repository. When you do that, make sure you also get the B<-dev>
-package for each library you install. Once you have the missing bits on
-board, just re-run the last line of the instructions above.
+B<configure> complaining about several missing libraries.
+
+=head1 INSTALLING DEPENDENCIES
+
+If your OS lets you install additional packages from a software repository,
+you may get away with installing the missing packages. When the packages are
+installed, run configure again and try to compile again. Below you find some
+hints on getting your OS ready for the rrdtool compilation. Additions to
+this list are welcome.
+
+=head2 OpenSolaris 2008.05
+
+Just add a compiler and the gnome development package:
+
+ pkg install sunstudioexpress
+ pkg install SUNWgnome-common-devel
+
+There is a a problem with F<cairo.pc> on opensolaris. It suggests that
+xrender is required for compilation with cairo. This is not true and also
+bad since opensolaris does not include an F<xrender.pc> file. Use perl to
+fix this:
 
-But again this may have been too optimistic, and you actually have to
+ perl -i~ -p -e 's/(Requires.*?)\s*xrender.*/$1/' /usr/lib/pkgconfig/cairo.pc 
+
+=head2 Debian / Ubuntu
+
+Use apt-get to make sure you have all that is required. A number
+of packages will get added through dependencies.
+
+ apt-get install libpango1.0-dev libxml2-dev
+
+=head1 BUILDING DEPENDENCIES
+
+But again this may have been too optimistic still, and you actually have to
 compile your own copies of some of the required libraries. Things like
 libpng and zlib are pretty standard so you will probably have them on your
 system anyway. Freetype, Fontinst, Cairo, Pango may be installed, but it is
@@ -147,7 +172,6 @@ otherwhise just do
 
  export MAKE=make
 
- 
 =item Building zlib
 
 Chances are very high that you already have that on your system ...