summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: a2af704)
raw | patch | inline | side by side (from parent 1: a2af704)
author | oetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa> | |
Fri, 16 Dec 2011 16:13:23 +0000 (16:13 +0000) | ||
committer | oetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa> | |
Fri, 16 Dec 2011 16:13:23 +0000 (16:13 +0000) |
program/configure.ac | patch | blob | history |
diff --git a/program/configure.ac b/program/configure.ac
index e0be4bd47ff6e93b703dc826d3638e670f216bfc..8453a9e1b99bcd27f2fcfca1e777c2bbd28f58ae 100644 (file)
--- a/program/configure.ac
+++ b/program/configure.ac
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],
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])
AM_CONDITIONAL(BUILD_LIBWRAP,[test $have_libwrap != no])
AM_CONDITIONAL(BUILD_RRDCGI,[test $enable_rrdcgi != no])
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(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
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
CONFIGURE_PART(Find 3rd-Party Libraries)
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_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])
AM_CONDITIONAL(BUILD_LIBDBI,[test $have_libdbi != no])