X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=configure.ac;h=8453a9e1b99bcd27f2fcfca1e777c2bbd28f58ae;hp=f351398a0ab8e6b5e36808e6e339be60cb7137b2;hb=a490ff8d4ae97046a200b6a1c9c033d9b461b77d;hpb=caa19cdeabf402ea899ffb0c29756f520bd968e6 diff --git a/configure.ac b/configure.ac index f351398..8453a9e 100644 --- a/configure.ac +++ b/configure.ac @@ -102,24 +102,24 @@ AC_DEFINE_UNQUOTED(RRDGRAPH_YLEGEND_ANGLE,${RRDGRAPH_YLEGEND_ANGLE:-90.0}, 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)]), - [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 - ] - ) -]) + [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]) @@ -211,7 +211,7 @@ CONFIGURE_PART(Checking for Header Files) dnl Checks for header files. AC_HEADER_STDC AC_HEADER_DIRENT -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) +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) dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -303,7 +303,7 @@ AC_CHECK_FUNCS(posix_fadvise) 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) @@ -514,23 +514,16 @@ AC_LANG_POP(C) 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_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_LIB(dbi, dbi_initialize, [ + LIBS="${LIBS} -ldbi -ldl" + AC_DEFINE(HAVE_LIBDBI,[1],[have got libdbi installed]) + have_libdbi=yes + ],[],[-ldl]) ]) + AM_CONDITIONAL(BUILD_LIBDBI,[test $have_libdbi != no]) @@ -552,7 +545,7 @@ EX_CHECK_ALL(pangocairo-1.0, pango_cairo_context_set_font_options, pango/pango fi EX_CHECK_ALL(glib-2.0, glib_check_version, glib.h, glib-2.0, 2.28.7, ftp://ftp.gtk.org/pub/glib/2.28/, "") -[AEX_CHECK_ALL(xml2, xmlParseFile, libxml/parser.h, libxml-2.0, 2.7.8, http://xmlsoft.org/downloads.html, /usr/include/libxml2) +EX_CHECK_ALL(xml2, xmlParseFile, libxml/parser.h, libxml-2.0, 2.7.8, http://xmlsoft.org/downloads.html, /usr/include/libxml2) if test "$EX_CHECK_ALL_ERR" = "YES"; then AC_MSG_ERROR([Please fix the library issues listed above and try again.])