X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=configure.ac;h=8482501635b22fec404b073f305f7df71da6f409;hp=fd6f52e740d54bd93a0c7a75bb93ec972453fb07;hb=6a1b841eb858e4b66817654b41df212e08de6da8;hpb=cb7e9e67ca8504ec45d51eddaf37cdf5b4822853 diff --git a/configure.ac b/configure.ac index fd6f52e..8482501 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,16 @@ dnl dnl Inspiration from http://autoconf-archive.cryp.to dnl tell automake the this script is for rrdtool -AC_INIT([rrdtool],[1.2.6]) +dnl the official version number is +dnl a.b.c +AC_INIT([rrdtool],[1.2.8]) +dnl for testing a numberical version number comes handy +dnl the released version are +dnl a.bccc +dnl the devl versions will be something like +dnl a.b999yymmddhh +NUMVERS=1.2008 +AC_SUBST(NUMVERS) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE AC_CONFIG_HEADERS([config.h]) @@ -166,10 +175,6 @@ 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` @@ -184,7 +189,7 @@ AC_C_BIGENDIAN dnl for each function found we get a definition in config.h dnl of the form HAVE_FUNCTION -AC_CHECK_FUNCS(tzset opendir readdir chdir chroot getuid setlocale strerror strerror_r snprintf vsnprintf fpclass class fp_class isnan memmove strchr mktime getrusage gettimeofday) +AC_CHECK_FUNCS(tzset mbstowcs opendir readdir chdir chroot getuid setlocale strerror strerror_r snprintf vsnprintf fpclass class fp_class isnan memmove strchr mktime getrusage gettimeofday) dnl Use mmap in rrd_update instead of seek+write AC_ARG_ENABLE([mmap], @@ -299,7 +304,7 @@ AM_CONDITIONAL(BUILD_MULTITHREAD,[test $enable_pthread != no]) dnl Check for Perl. AC_PATH_PROG(PERL, perl, no) -AC_ARG_ENABLE(perl,[ --disable-perl do not build the perl modules], +AC_ARG_ENABLE(perl,[ --disable-perl do not build the perl modules], [],[enable_perl=yes]) @@ -313,9 +318,9 @@ else AC_MSG_CHECKING(for the C compiler perl wants to use to build its modules) perlcc=`$PERL -MConfig -e 'print $Config{cc}'` 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 "$perlcc"; then + AC_PATH_PROG(PERLCC, "${perlcc}", no) + if test "$PERLCC" = "no"; 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 @@ -332,7 +337,7 @@ AC_MSG_RESULT(${COMP_PERL:-No Perl Modules will be built}) # Options to pass when configuring perl module ppref=$prefix -test "x$ppref" = xNONE && ppref=$ac_default_prefix +test "$ppref" = "NONE" && ppref=$ac_default_prefix PERL_MAKE_OPTIONS="PREFIX=$ppref LIB=$ppref/lib/perl/$PERL_VERSION" @@ -358,29 +363,32 @@ AC_SUBST(PERL) AC_SUBST(COMP_PERL) AC_SUBST(PERL_VERSION) +AC_ARG_ENABLE(tcl,[ --disable-tcl do not build the tcl modules], +[],[enable_tcl=yes]) -dnl Check for Tcl. -withval="" -AC_ARG_WITH(tcllib,[ --with-tcllib=DIR location of the tclConfig.sh]) -found=0 -AC_MSG_CHECKING(for tclConfig.sh in $withval) -if test -f "$withval/tclConfig.sh" ; then +if test "$enable_tcl" = "yes"; then + dnl Check for Tcl. + withval="" + AC_ARG_WITH(tcllib,[ --with-tcllib=DIR location of the tclConfig.sh]) + enable_tcl=no + AC_MSG_CHECKING(for tclConfig.sh in $withval) + if test -f "$withval/tclConfig.sh" ; then tcl_config=$withval/tclConfig.sh - found=1 + enable_tcl=yes AC_MSG_RESULT(yes) break -else + else AC_MSG_RESULT(no) -fi + fi -if test $found -eq 0 ; then + if test "$enable_tcl" = "no"; then AC_MSG_WARN([tclConfig.sh not found - Tcl interface won't be built]) -else + else . $tcl_config + fi fi - -AM_CONDITIONAL(COMP_TCL, test x$found = x1 ) +AM_CONDITIONAL(BUILD_TCL, test "$enable_tcl" = "yes" ) AC_SUBST(TCL_PREFIX) AC_SUBST(TCL_SHLIB_CFLAGS) @@ -389,18 +397,23 @@ 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)]) +AC_ARG_ENABLE(python,[ --disable-python do not build the python modules], +[],[enable_python=yes]) +if test "$enable_python" = "yes"; then +dnl Check for python +AM_PATH_PYTHON(2.3,[],[enable_python=no]) +AM_CHECK_PYTHON_HEADERS(,[enable_python=no;AC_MSG_WARN(could not find Python headers)]) +fi +AM_CONDITIONAL(BUILD_PYTHON,[test "$enable_python" = "yes"]) dnl Check for nroff AC_PATH_PROGS(NROFF, gnroff nroff) AC_PATH_PROGS(TROFF, groff troff) dnl Does the compiler like -Wall and -pedantic? -if test "x$GCC" = "xyes"; then +if test "$GCC" = "yes"; then oCFLAGS=$CFLAGS CFLAGS="$CFLAGS -Wall -pedantic -Wshadow -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline -W" AC_CACHE_CHECK(if we can use GCC-specific compiler options, rd_cv_gcc_opt, @@ -463,15 +476,15 @@ echo echo "----------------------------------------------------------------" echo "Config is DONE!" echo -echo " With MMAP IO: $ac_cv_func_mmap_fixed_mapped" -echo " Perl Modules: $COMP_PERL" -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 " With MMAP IO: $ac_cv_func_mmap_fixed_mapped" +echo " Perl Modules: $COMP_PERL" +echo " Perl Binary: $PERL" +echo " Perl Version: $PERL_VERSION" +echo " Perl Options: $PERL_MAKE_OPTIONS" +echo " Build Tcl Bindings: $enable_tcl" +echo " Build Python Bindings: $enable_python" +echo " Build rrdcgi: $enable_rrdcgi" +echo " Build librrd MT: $enable_pthread" echo echo echo "Type 'make' to compile the software and use 'make install' to "