projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add RPM .spec file and startup script for AIX
[collectd.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
804cdfc
..
254e7fd
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-2,6
+2,7
@@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(collectd, m4_esyscmd(./version-gen.sh))
AC_CONFIG_SRCDIR(src/collectd.c)
AC_CONFIG_HEADERS(src/config.h)
AC_INIT(collectd, m4_esyscmd(./version-gen.sh))
AC_CONFIG_SRCDIR(src/collectd.c)
AC_CONFIG_HEADERS(src/config.h)
+AC_CONFIG_AUX_DIR([libltdl/config])
m4_ifdef([LT_PACKAGE_VERSION],
# libtool >= 2.2
m4_ifdef([LT_PACKAGE_VERSION],
# libtool >= 2.2
@@
-91,6
+92,10
@@
if test "x$ac_system" = "xSolaris"
then
AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1, [Define to enforce POSIX thread semantics under Solaris.])
fi
then
AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1, [Define to enforce POSIX thread semantics under Solaris.])
fi
+if test "x$ac_system" = "xAIX"
+then
+ AC_DEFINE(_THREAD_SAFE_ERRNO, 1, [Define to use the thread-safe version of errno under AIX.])
+fi
# Where to install .pc files.
pkgconfigdir="${libdir}/pkgconfig"
# Where to install .pc files.
pkgconfigdir="${libdir}/pkgconfig"
@@
-484,6
+489,13
@@
AC_CHECK_FUNCS(gettimeofday select strdup strtol getaddrinfo getnameinfo strchr
AC_FUNC_STRERROR_R
AC_FUNC_STRERROR_R
+SAVE_CFLAGS="$CFLAGS"
+# Emulate behavior of src/Makefile.am
+if test "x$GCC" = "xyes"
+then
+ CFLAGS="$CFLAGS -Wall -Werror"
+fi
+
AC_CACHE_CHECK([for strtok_r],
[c_cv_have_strtok_r_default],
AC_LINK_IFELSE(
AC_CACHE_CHECK([for strtok_r],
[c_cv_have_strtok_r_default],
AC_LINK_IFELSE(
@@
-514,7
+526,6
@@
AC_CACHE_CHECK([for strtok_r],
if test "x$c_cv_have_strtok_r_default" = "xno"
then
if test "x$c_cv_have_strtok_r_default" = "xno"
then
- SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -D_REENTRANT=1"
AC_CACHE_CHECK([if strtok_r needs _REENTRANT],
CFLAGS="$CFLAGS -D_REENTRANT=1"
AC_CACHE_CHECK([if strtok_r needs _REENTRANT],
@@
-546,6
+557,12
@@
then
)
fi
)
fi
+CFLAGS="$SAVE_CFLAGS"
+if test "x$c_cv_have_strtok_r_reentrant" = "xyes"
+then
+ CFLAGS="$CFLAGS -D_REENTRANT=1"
+fi
+
AC_CHECK_FUNCS(getpwnam_r getgrnam_r setgroups regcomp regerror regexec regfree)
socket_needs_socket="no"
AC_CHECK_FUNCS(getpwnam_r getgrnam_r setgroups regcomp regerror regexec regfree)
socket_needs_socket="no"
@@
-955,7
+972,7
@@
fi
AC_MSG_CHECKING([if have htonll defined])
have_htonll="no"
AC_MSG_CHECKING([if have htonll defined])
have_htonll="no"
- AC_
RUN
_IFELSE([
+ AC_
LINK
_IFELSE([
AC_LANG_PROGRAM([
#include <sys/types.h>
#include <netinet/in.h>
AC_LANG_PROGRAM([
#include <sys/types.h>
#include <netinet/in.h>
@@
-1621,7
+1638,8
@@
then
[
with_libiptc="yes"
with_own_libiptc="yes"
[
with_libiptc="yes"
with_own_libiptc="yes"
- ])
+ ],
+ [-lip4tc -lip6tc])
fi
# The system wide version failed for some reason. Check if we have the required
# headers to build the shipped version.
fi
# The system wide version failed for some reason. Check if we have the required
# headers to build the shipped version.
@@
-2540,19
+2558,13
@@
then
fi
if test "x$with_libpcap" = "xyes"
then
fi
if test "x$with_libpcap" = "xyes"
then
- AC_CHECK_HEADERS(pcap.h,
- [
- AC_DEFINE(HAVE_PCAP_H, 1, [Define to 1 if you have the <pcap.h> header file.])
- ], [with_libpcap="no (pcap.h not found)"])
+ AC_CHECK_HEADERS(pcap.h,,
+ [with_libpcap="no (pcap.h not found)"])
fi
if test "x$with_libpcap" = "xyes"
then
fi
if test "x$with_libpcap" = "xyes"
then
- collect_libpcap=1
-else
- collect_libpcap=0
+ AC_CHECK_HEADERS(pcap-bpf.h)
fi
fi
-AC_DEFINE_UNQUOTED(COLLECT_LIBPCAP, [$collect_libpcap],
- [Wether or not to use the pcap library])
AM_CONDITIONAL(BUILD_WITH_LIBPCAP, test "x$with_libpcap" = "xyes")
# }}}
AM_CONDITIONAL(BUILD_WITH_LIBPCAP, test "x$with_libpcap" = "xyes")
# }}}
@@
-3375,7
+3387,7
@@
AM_CONDITIONAL(BUILD_WITH_LIBTOKYOTYRANT, test "x$with_libtokyotyrant" = "xyes")
with_libupsclient_config=""
with_libupsclient_cflags=""
with_libupsclient_libs=""
with_libupsclient_config=""
with_libupsclient_cflags=""
with_libupsclient_libs=""
-AC_ARG_WITH(libupsclient, [AS_HELP_STRING([--with-libupsclient@<:@=PREFIX@:>@], [Path to the
Net-SNMPD
library.])],
+AC_ARG_WITH(libupsclient, [AS_HELP_STRING([--with-libupsclient@<:@=PREFIX@:>@], [Path to the
upsclient
library.])],
[
if test "x$withval" = "xno"
then
[
if test "x$withval" = "xno"
then
@@
-3597,6
+3609,7
@@
then
CPPFLAGS="$CPPFLAGS $with_libyajl_cppflags"
AC_CHECK_HEADERS(yajl/yajl_parse.h, [with_libyajl="yes"], [with_libyajl="no (yajl/yajl_parse.h not found)"])
CPPFLAGS="$CPPFLAGS $with_libyajl_cppflags"
AC_CHECK_HEADERS(yajl/yajl_parse.h, [with_libyajl="yes"], [with_libyajl="no (yajl/yajl_parse.h not found)"])
+ AC_CHECK_HEADERS(yajl/yajl_version.h)
CPPFLAGS="$SAVE_CPPFLAGS"
fi
CPPFLAGS="$SAVE_CPPFLAGS"
fi
@@
-4018,7
+4031,7
@@
then
plugin_vserver="yes"
plugin_wireless="yes"
plugin_vserver="yes"
plugin_wireless="yes"
- if test "x$have_net_ip_vs_h" = "xyes"
-o
"x$have_ip_vs_h" = "xyes"
+ if test "x$have_net_ip_vs_h" = "xyes"
|| test
"x$have_ip_vs_h" = "xyes"
then
plugin_ipvs="yes"
fi
then
plugin_ipvs="yes"
fi
@@
-4488,7
+4501,7
@@
then
with_librrd="yes (warning: librrd is not thread-safe)"
fi
with_librrd="yes (warning: librrd is not thread-safe)"
fi
-if test "x$with_libiptc" = "xyes"
-a
"x$with_own_libiptc" = "xyes"
+if test "x$with_libiptc" = "xyes"
&& test
"x$with_own_libiptc" = "xyes"
then
with_libiptc="yes (shipped version)"
fi
then
with_libiptc="yes (shipped version)"
fi