X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.ac;h=fd6f52e740d54bd93a0c7a75bb93ec972453fb07;hb=0bac2398d14f8a11c3430872c2503b93a596ea66;hp=a67ea55145a5ae810a2a0e4e720290f7042e70af;hpb=f439b204fb1481edd6a777a3b172ccd722b5b6ed;p=rrdtool.git

diff --git a/configure.ac b/configure.ac
index a67ea55..fd6f52e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ dnl
 dnl Inspiration from http://autoconf-archive.cryp.to
 
 dnl tell automake the this script is for rrdtool
-AC_INIT([rrdtool],[1.2rc5])
+AC_INIT([rrdtool],[1.2.6])
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
 AC_CONFIG_HEADERS([config.h])
@@ -141,6 +141,19 @@ AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_LIBTOOL
 
+dnl Check if we run on a system that has fonts
+AC_ARG_WITH(rrd-default-font,
+[  --with-rrd-default-font=[OPTIONS]  set the full path to your default font.],
+[RRD_DEFAULT_FONT=$withval],[
+  if test -d ${WINDIR:-nodir}/cour.ttf ; then
+	RRD_DEFAULT_FONT=`cd $WINDIR;pwd`/cour.ttf
+  else
+	RRD_DEFAULT_FONT='$(fontsdir)/$(fonts_DATA)'
+  fi
+])
+
+AC_SUBST(RRD_DEFAULT_FONT)
+
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_DIRENT
@@ -153,6 +166,10 @@ AC_STRUCT_TM
 
 dnl Checks for libraries.
 AC_CHECK_FUNC(acos, , AC_CHECK_LIB(m, acos))
+dnl Use libiconv if we have one but fall back to libc otherwhise
+AC_CHECK_LIB(iconv, iconv_open, , [
+         AC_CHECK_FUNC(iconv_open,,)
+         ])
 
 dnl add pic flag in any case this makes sure all our code is relocatable
 eval `./libtool --config | grep pic_flag`
@@ -212,9 +229,9 @@ if test $enable_rrdcgi != no; then
 EX_CHECK_ALL(cgi,        cgiInit,                   cgi.h,                  cgilib,      0.5,    http://www.infodrom.org/projects/cgilib, "")
 fi
 EX_CHECK_ALL(art_lgpl_2, art_vpath_add_point,       libart_lgpl/libart.h,   libart-2.0,  2.3.17, ftp://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/, /usr/include/libart-2.0)
-EX_CHECK_ALL(z,          zlibVersion,               zlib.h,                 zlib,        1.2.1,  http://www.gzip.org/zlib/, "")
+EX_CHECK_ALL(z,          zlibVersion,               zlib.h,                 zlib,        1.2.2,  http://www.gzip.org/zlib/, "")
 EX_CHECK_ALL(png,        png_access_version_number, png.h,                  libpng,      1.2.8,  http://prdownloads.sourceforge.net/libpng/, "")
-EX_CHECK_ALL(freetype,   FT_Init_FreeType,          ft2build.h,		     freetype2,   2.1.9,  http://prdownloads.sourceforge.net/freetype/, /usr/include/freetype2)
+EX_CHECK_ALL(freetype,   FT_Init_FreeType,          ft2build.h,		    freetype2,   2.1.9,  http://prdownloads.sourceforge.net/freetype/, /usr/include/freetype2)
 
 if test "$EX_CHECK_ALL_ERR" = "YES"; then
   AC_MSG_ERROR([Please fix the library issues listed above and try again.])
@@ -281,7 +298,12 @@ AM_CONDITIONAL(BUILD_MULTITHREAD,[test $enable_pthread != no])
   
 dnl Check for Perl.
 AC_PATH_PROG(PERL, perl, no)
-if test "x$PERL" = "xno"; then
+
+AC_ARG_ENABLE(perl,[  --disable-perl    do not build the perl modules],
+[],[enable_perl=yes])
+
+
+if test "x$PERL" = "xno" -o  x$enable_perl = xno; then
 	COMP_PERL=
 else
 	COMP_PERL="perl_piped perl_shared"
@@ -293,7 +315,7 @@ else
 	AC_MSG_RESULT($perlcc)
 	if test ! -x $perlcc; then
  	       AC_PATH_PROG(PERLCC, ${perlcc}, no)
-	       if test -x $"x$PERLCC" = "xno"; then
+	       if test -x "x$PERLCC" = "xno"; then
                   AC_MSG_WARN([
 I would not find the Compiler ($perlcc) that was originally used to compile your
 perl binary. You should either make sure that this compiler is available on your
@@ -367,6 +389,10 @@ AC_SUBST(TCL_SHLIB_SUFFIX)
 AC_SUBST(TCL_PACKAGE_PATH)
 AC_SUBST(TCL_LD_SEARCH_FLAGS)
 
+dnl Check for python
+AM_PATH_PYTHON(2.3)
+AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
+
 
 
 dnl Check for nroff
@@ -413,6 +439,7 @@ AC_CONFIG_FILES([examples/shared-demo.pl			\
           src/Makefile					\
           bindings/Makefile                             \
           bindings/tcl/Makefile				\
+          bindings/python/Makefile			\
           Makefile])
 AC_CONFIG_COMMANDS([default],[[\
           chmod +x examples/*.cgi examples/*.pl]],[[]])
@@ -442,6 +469,7 @@ echo "     Perl Binary: $PERL"
 echo "    Perl Version: $PERL_VERSION"
 echo "    Perl Options: $PERL_MAKE_OPTIONS"
 echo "      Tcl Config: $tcl_config"
+echo "  Python Version: $PYTHON_VERSION"
 echo "    Build rrdcgi: $enable_rrdcgi"
 echo " Build librrd MT: $enable_pthread"
 echo