diff --git a/program/configure.ac b/program/configure.ac
index 8453a9e1b99bcd27f2fcfca1e777c2bbd28f58ae..7fe70bcdca18331bc5c2b11102c9823ebac5365d 100644 (file)
--- a/program/configure.ac
+++ b/program/configure.ac
dnl
dnl see http://sourceware.org/autobook/autobook/autobook_91.html
dnl
dnl
dnl see http://sourceware.org/autobook/autobook/autobook_91.html
dnl
-LIBVERS=5:3:1
+LIBVERS=6:999:2
AC_SUBST(LIBVERS)
AC_CANONICAL_TARGET
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(rrdcgi,AS_HELP_STRING([--disable-rrdcgi],[disable building of rrdcgi]),
[],[enable_rrdcgi=yes])
-have_libwrap=no
-
-AC_ARG_ENABLE(libwrap,
- AS_HELP_STRING([--disable-libwrap],
- [do not build in support for libwrap (tcp wrapper)]
- ),
- [],
- [
- AC_CHECK_FUNCS(hosts_access, [],
- AC_CHECK_LIB(wrap, hosts_access, [
- LIBS="${LIBS} -lwrap"
- AC_DEFINE(HAVE_LIBWRAP,[1],[have got libwrap installed])
- have_libwrap=yes
- ],[])
- )
- ]
-)
-
-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]),
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 Checks for header files.
AC_HEADER_STDC
AC_HEADER_DIRENT
dnl Checks for header files.
AC_HEADER_STDC
AC_HEADER_DIRENT
-AC_CHECK_HEADERS(tcpd.h dbi/dbi.h langinfo.h stdint.h inttypes.h libgen.h features.h sys/stat.h sys/types.h fcntl.h fp_class.h malloc.h unistd.h ieeefp.h math.h sys/times.h sys/param.h sys/resource.h signal.h float.h stdio.h stdlib.h errno.h string.h ctype.h)
+AC_CHECK_HEADERS(langinfo.h stdint.h inttypes.h libgen.h features.h sys/stat.h sys/types.h fcntl.h fp_class.h malloc.h unistd.h ieeefp.h math.h sys/times.h sys/param.h sys/resource.h signal.h float.h stdio.h stdlib.h errno.h string.h ctype.h)
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
dnl add pic flag in any case this makes sure all our code is relocatable
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"
CFLAGS="$CFLAGS $pic_flag"
#include <fcntl.h>])
AC_CHECK_FUNCS(posix_fadvise)
#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.17)
CONFIGURE_PART(Libintl Processing)
AM_GNU_GETTEXT_VERSION(0.17)
CONFIGURE_PART(Resolve Portability Issues)
CONFIGURE_PART(Resolve Portability Issues)
+GC_TIMEZONE()
+
CHECK_FOR_WORKING_MS_ASYNC
dnl do we have nl_langinfo(_NL_TIME_WEEK_1STDAY)
CHECK_FOR_WORKING_MS_ASYNC
dnl do we have nl_langinfo(_NL_TIME_WEEK_1STDAY)
have_libdbi=no
AC_ARG_ENABLE(libdbi,AS_HELP_STRING([--disable-libdbi],[do not build in support for libdbi]),[],[
have_libdbi=no
AC_ARG_ENABLE(libdbi,AS_HELP_STRING([--disable-libdbi],[do not build in support for libdbi]),[],[
- AC_CHECK_LIB(dbi, dbi_initialize, [
- LIBS="${LIBS} -ldbi -ldl"
- AC_DEFINE(HAVE_LIBDBI,[1],[have got libdbi installed])
- have_libdbi=yes
- ],[],[-ldl])
+ 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])
])
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])
AM_CONDITIONAL(BUILD_RRDGRAPH,[test $enable_rrd_graph != no])
withval=""
AC_ARG_WITH(tcllib,[ --with-tcllib=DIR location of the tclConfig.sh])
enable_tcl=no
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
AC_MSG_CHECKING(for tclConfig.sh in $dir)
if test -f "$dir/tclConfig.sh" ; then
tcl_config=$dir/tclConfig.sh