diff --git a/configure.ac b/configure.ac
index 48e2ef287cf3a4bd86f2b9c438cfbfd5577e968c..ab210d156016adc72dcde0ee5b69c7e54bff9219 100644 (file)
--- a/configure.ac
+++ b/configure.ac
dnl
dnl see http://sourceware.org/autobook/autobook/autobook_91.html
dnl
-LIBVERS=5:3:1
+LIBVERS=6:255:2
AC_SUBST(LIBVERS)
AC_CANONICAL_TARGET
AC_ARG_ENABLE(rrdcgi,AS_HELP_STRING([--disable-rrdcgi],[disable building of rrdcgi]),
[],[enable_rrdcgi=yes])
-AC_ARG_ENABLE(libwrap,
- AS_HELP_STRING([--disable-libwrap],
- [do not build in support for libwrap (tcp wrapper)]),
- [have_libwrap=no],[
- XXX=$LIBS
- LIBS="$LIBS -lwrap"
- AC_MSG_CHECKING(for libwrap)
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM([[#include "tcpd.h"]], [[hosts_access(NULL)]])
- ],[AC_DEFINE(HAVE_LIBWRAP,[1],[have got libwrap installed])
- AC_MSG_RESULT([yes])
- have_libwrap=yes
- ],[LIBS=$XXX
- AC_MSG_RESULT([no])
- have_libwrap=no
- ]
- )
-])
-AM_CONDITIONAL(BUILD_LIBWRAP,[test $have_libwrap != no])
-
AM_CONDITIONAL(BUILD_RRDCGI,[test $enable_rrdcgi != no])
AC_ARG_ENABLE(rrd_graph,AS_HELP_STRING([--disable-rrd_graph],[disable all rrd_graph functions]),
dnl add pic flag in any case this makes sure all our code is relocatable
-eval `./libtool --config | grep pic_flag`
+eval `./libtool --config | grep pic_flag=`
CFLAGS="$CFLAGS $pic_flag"
#include <fcntl.h>])
AC_CHECK_FUNCS(posix_fadvise)
+dnl can we use posix_fallocate
+AC_CHECK_FUNCS(posix_fallocate)
+
CONFIGURE_PART(Libintl Processing)
-AM_GNU_GETTEXT_VERSION(0.18)
+AM_GNU_GETTEXT_VERSION(0.17)
AM_GNU_GETTEXT(external)
CONFIGURE_PART(IEEE Math Checks)
CONFIGURE_PART(Resolve Portability Issues)
+GC_TIMEZONE()
+
CHECK_FOR_WORKING_MS_ASYNC
dnl do we have nl_langinfo(_NL_TIME_WEEK_1STDAY)
CONFIGURE_PART(Find 3rd-Party Libraries)
-AC_ARG_ENABLE(libdbi,AS_HELP_STRING([--disable-libdbi],[do not build in support for libdbi]),[have_libdbi=no],[
- XXX=$LIBS
- LIBS="$LIBS -ldbi -ldl"
- AC_MSG_CHECKING(for libdbi)
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM([[#include <dbi/dbi.h>]],
- [[dbi_initialize(NULL)]]
- )
- ],[AC_DEFINE(HAVE_LIBDBI,[1],[have got libdbi installed])
- AC_MSG_RESULT([yes])
- have_libdbi=yes
- ],[LIBS=$XXX
- AC_MSG_RESULT([no])
- have_libdbi=no
- ]
- )
+have_libdbi=no
+
+AC_ARG_ENABLE(libdbi,AS_HELP_STRING([--disable-libdbi],[do not build in support for libdbi]),[],[
+ AC_CHECK_HEADER(dbi/dbi.h, [
+ AC_CHECK_LIB(dbi, dbi_initialize, [
+ AC_DEFINE(HAVE_LIBDBI,[1],[have got libdbi installed])
+ LIBS="${LIBS} -ldbi -ldl"
+ have_libdbi=yes
+ ])
+ ])
])
+
AM_CONDITIONAL(BUILD_LIBDBI,[test $have_libdbi != no])
+have_libwrap=no
+
+AC_ARG_ENABLE(libwrap, AS_HELP_STRING([--disable-libwrap], [do not build in support for libwrap (tcp wrapper)]),[],[
+ AC_CHECK_HEADER(tcpd.h,[
+ AC_CHECK_FUNCS(hosts_access, [
+ AC_DEFINE(HAVE_LIBWRAP,[1],[have got libwrap installed])
+ have_libwrap=yes
+ ],
+ [
+ AC_CHECK_LIB(wrap, hosts_access, [
+ AC_DEFINE(HAVE_LIBWRAP,[1],[have got libwrap installed])
+ LIBS="${LIBS} -lwrap"
+ have_libwrap=yes
+ ])
+ ])
+ ])
+])
+
+
+AM_CONDITIONAL(BUILD_LIBWRAP,[test $have_libwrap != no])
AM_CONDITIONAL(BUILD_RRDGRAPH,[test $enable_rrd_graph != no])
test "$langpref" = '$(DESTDIR)NONE' && langpref='$(DESTDIR)'$ac_default_prefix
test "$langpref" = "NONE" && langpref=$ac_default_prefix
-PERL_MAKE_OPTIONS="PREFIX=$langpref LIB=$langpref/lib/perl/$PERL_VERSION"
+PERL_MAKE_OPTIONS="PREFIX=$langpref INSTALL_BASE= LIB=$langpref/lib/perl/$PERL_VERSION"
dnl pass additional perl options when generating Makefile from Makefile.PL
AC_ARG_ENABLE(perl-site-install,
withval=""
AC_ARG_WITH(tcllib,[ --with-tcllib=DIR location of the tclConfig.sh])
enable_tcl=no
- for dir in $withval /usr/lib /usr/local/lib /usr/lib/tcl8.4 /usr/lib/tcl8.3 ; do
+ for dir in $withval /usr/lib /usr/lib64 /usr/local/lib /usr/lib/tcl8.4 /usr/lib/tcl8.3 ; do
AC_MSG_CHECKING(for tclConfig.sh in $dir)
if test -f "$dir/tclConfig.sh" ; then
tcl_config=$dir/tclConfig.sh
if test -z "$RRDDOCDIR"; then
RRDDOCDIR='${datadir}/doc/${PACKAGE}-${VERSION}'; fi
+# systemd check
+PKG_PROG_PKG_CONFIG
+AC_ARG_WITH([systemdsystemunitdir],
+ AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
+ [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
+if test "x$with_systemdsystemunitdir" != xno; then
+ AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
+ AC_OUTPUT([etc/rrdcached.socket etc/rrdcached.service])
+fi
+AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ])
+
CONFIGURE_PART(Apply Configuration Information)
echo " Use gettext: $USE_NLS"
echo " With libDBI: $have_libdbi"
echo " With libwrap: $have_libwrap"
+echo " With systemd dir: $with_systemdsystemunitdir"
echo
echo " Libraries: $ALL_LIBS"
echo