projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RedHat RPM spec: support for RHEL5
[collectd.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
0c7b55c
..
a62d608
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-49,6
+49,13
@@
AC_PROG_YACC
PKG_PROG_PKG_CONFIG
AC_CHECK_PROG([have_protoc_c], [protoc-c], [yes], [no])
PKG_PROG_PKG_CONFIG
AC_CHECK_PROG([have_protoc_c], [protoc-c], [yes], [no])
+AC_CHECK_HEADERS([google/protobuf-c/protobuf-c.h],
+ [have_protobuf_c_h="yes"],
+ [have_protobuf_c_h="no"])
+if test "x$have_protoc_c" = "xyes" && test "x$have_protobuf_c_h" != "xyes"
+then
+ have_protoc_c="no (unable to find <google/protobuf-c/protobuf-c.h>)"
+fi
AM_CONDITIONAL(HAVE_PROTOC_C, test "x$have_protoc_c" = "xyes")
AC_MSG_CHECKING([for kernel type ($host_os)])
AM_CONDITIONAL(HAVE_PROTOC_C, test "x$have_protoc_c" = "xyes")
AC_MSG_CHECKING([for kernel type ($host_os)])
@@
-128,7
+135,7
@@
AC_HEADER_SYS_WAIT
AC_HEADER_DIRENT
AC_HEADER_STDBOOL
AC_HEADER_DIRENT
AC_HEADER_STDBOOL
-AC_CHECK_HEADERS(stdio.h errno.h math.h stdarg.h syslog.h fcntl.h signal.h assert.h sys/types.h sys/socket.h sys/select.h poll.h netdb.h arpa/inet.h sys/resource.h sys/param.h kstat.h regex.h sys/ioctl.h endian.h sys/isa_defs.h)
+AC_CHECK_HEADERS(stdio.h errno.h math.h stdarg.h syslog.h fcntl.h signal.h assert.h sys/types.h sys/socket.h sys/select.h poll.h netdb.h arpa/inet.h sys/resource.h sys/param.h kstat.h regex.h sys/ioctl.h endian.h sys/isa_defs.h
fnmatch.h libgen.h
)
# For ping library
AC_CHECK_HEADERS(netinet/in_systm.h, [], [],
# For ping library
AC_CHECK_HEADERS(netinet/in_systm.h, [], [],
@@
-270,7
+277,19
@@
if test "x$ac_system" = "xDarwin"
then
AC_CHECK_HEADERS(mach/mach_init.h mach/host_priv.h mach/mach_error.h mach/mach_host.h mach/mach_port.h mach/mach_types.h mach/message.h mach/processor_set.h mach/processor.h mach/processor_info.h mach/task.h mach/thread_act.h mach/vm_region.h mach/vm_map.h mach/vm_prot.h mach/vm_statistics.h mach/kern_return.h)
AC_CHECK_HEADERS(CoreFoundation/CoreFoundation.h IOKit/IOKitLib.h IOKit/IOTypes.h IOKit/ps/IOPSKeys.h IOKit/IOBSD.h IOKit/storage/IOBlockStorageDriver.h)
then
AC_CHECK_HEADERS(mach/mach_init.h mach/host_priv.h mach/mach_error.h mach/mach_host.h mach/mach_port.h mach/mach_types.h mach/message.h mach/processor_set.h mach/processor.h mach/processor_info.h mach/task.h mach/thread_act.h mach/vm_region.h mach/vm_map.h mach/vm_prot.h mach/vm_statistics.h mach/kern_return.h)
AC_CHECK_HEADERS(CoreFoundation/CoreFoundation.h IOKit/IOKitLib.h IOKit/IOTypes.h IOKit/ps/IOPSKeys.h IOKit/IOBSD.h IOKit/storage/IOBlockStorageDriver.h)
+ # For the battery plugin
+ AC_CHECK_HEADERS(IOKit/ps/IOPowerSources.h, [], [],
+[
+#if HAVE_IOKIT_IOKITLIB_H
+# include <IOKit/IOKitLib.h>
+#endif
+#if HAVE_IOKIT_IOTYPES_H
+# include <IOKit/IOTypes.h>
+#endif
+])
+
fi
fi
+
AC_CHECK_HEADERS(sys/sysctl.h, [], [],
[
#if HAVE_SYS_TYPES_H
AC_CHECK_HEADERS(sys/sysctl.h, [], [],
[
#if HAVE_SYS_TYPES_H
@@
-298,7
+317,7
@@
else
fi
# For hddtemp module
fi
# For hddtemp module
-AC_CHECK_HEADERS(linux/major.h
libgen.h
)
+AC_CHECK_HEADERS(linux/major.h)
# For md module (Linux only)
if test "x$ac_system" = "xLinux"
# For md module (Linux only)
if test "x$ac_system" = "xLinux"
@@
-315,17
+334,6
@@
else
have_linux_raid_md_u_h="no"
fi
have_linux_raid_md_u_h="no"
fi
-# For the battery plugin
-AC_CHECK_HEADERS(IOKit/ps/IOPowerSources.h, [], [],
-[
-#if HAVE_IOKIT_IOKITLIB_H
-# include <IOKit/IOKitLib.h>
-#endif
-#if HAVE_IOKIT_IOTYPES_H
-# include <IOKit/IOTypes.h>
-#endif
-])
-
# For the swap module
have_linux_wireless_h="no"
if test "x$ac_system" = "xLinux"
# For the swap module
have_linux_wireless_h="no"
if test "x$ac_system" = "xLinux"
@@
-582,13
+590,13
@@
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(
- AC_LANG_PROGRAM(
-
[
[[[
+
[
AC_LANG_PROGRAM(
+[[[
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-
]
]]],
-
[
[[[
+]]],
+[[[
char buffer[] = "foo,bar,baz";
char *token;
char *dummy;
char buffer[] = "foo,bar,baz";
char *token;
char *dummy;
@@
-598,10
+606,11
@@
AC_CACHE_CHECK([for strtok_r],
saveptr = NULL;
while ((token = strtok_r (dummy, ",", &saveptr)) != NULL)
{
saveptr = NULL;
while ((token = strtok_r (dummy, ",", &saveptr)) != NULL)
{
- dummy = NULL;
+
dummy = NULL;
printf ("token = %s;\n", token);
}
printf ("token = %s;\n", token);
}
- ]]]]),
+]]]
+ )],
[c_cv_have_strtok_r_default="yes"],
[c_cv_have_strtok_r_default="no"]
)
[c_cv_have_strtok_r_default="yes"],
[c_cv_have_strtok_r_default="no"]
)
@@
-614,13
+623,13
@@
then
AC_CACHE_CHECK([if strtok_r needs _REENTRANT],
[c_cv_have_strtok_r_reentrant],
AC_LINK_IFELSE(
AC_CACHE_CHECK([if strtok_r needs _REENTRANT],
[c_cv_have_strtok_r_reentrant],
AC_LINK_IFELSE(
- AC_LANG_PROGRAM(
-
[
[[[
+
[
AC_LANG_PROGRAM(
+[[[
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-
]
]]],
-
[
[[[
+]]],
+[[[
char buffer[] = "foo,bar,baz";
char *token;
char *dummy;
char buffer[] = "foo,bar,baz";
char *token;
char *dummy;
@@
-630,10
+639,11
@@
then
saveptr = NULL;
while ((token = strtok_r (dummy, ",", &saveptr)) != NULL)
{
saveptr = NULL;
while ((token = strtok_r (dummy, ",", &saveptr)) != NULL)
{
- dummy = NULL;
+
dummy = NULL;
printf ("token = %s;\n", token);
}
printf ("token = %s;\n", token);
}
- ]]]]),
+]]]
+ )],
[c_cv_have_strtok_r_reentrant="yes"],
[AC_MSG_FAILURE([strtok_r isn't available. Please file a bugreport!])]
)
[c_cv_have_strtok_r_reentrant="yes"],
[AC_MSG_FAILURE([strtok_r isn't available. Please file a bugreport!])]
)
@@
-711,16
+721,15
@@
if test "x$have_strptime" = "xyes"
then
AC_CACHE_CHECK([whether strptime is exported by default],
[c_cv_have_strptime_default],
then
AC_CACHE_CHECK([whether strptime is exported by default],
[c_cv_have_strptime_default],
- AC_COMPILE_IFELSE(
-AC_LANG_PROGRAM(
-[[
-AC_INCLUDES_DEFAULT
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+[[[
#include <time.h>
#include <time.h>
-]],
-[[
+]]
]
,
+[[
[
struct tm stm;
(void) strptime ("2010-12-30%13:42:42", "%Y-%m-%dT%T", &stm);
struct tm stm;
(void) strptime ("2010-12-30%13:42:42", "%Y-%m-%dT%T", &stm);
-]]),
+]]]
+ )],
[c_cv_have_strptime_default="yes"],
[c_cv_have_strptime_default="no"]))
fi
[c_cv_have_strptime_default="yes"],
[c_cv_have_strptime_default="no"]))
fi
@@
-728,9
+737,8
@@
if test "x$have_strptime" = "xyes" && test "x$c_cv_have_strptime_default" = "xno
then
AC_CACHE_CHECK([whether strptime needs standards mode],
[c_cv_have_strptime_standards],
then
AC_CACHE_CHECK([whether strptime needs standards mode],
[c_cv_have_strptime_standards],
- AC_COMPILE_IFELSE(
-AC_LANG_PROGRAM(
-[[
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+[[[
#ifndef _ISOC99_SOURCE
# define _ISOC99_SOURCE 1
#endif
#ifndef _ISOC99_SOURCE
# define _ISOC99_SOURCE 1
#endif
@@
-740,13
+748,13
@@
AC_LANG_PROGRAM(
#ifndef _XOPEN_SOURCE
# define _XOPEN_SOURCE 500
#endif
#ifndef _XOPEN_SOURCE
# define _XOPEN_SOURCE 500
#endif
-AC_INCLUDES_DEFAULT
#include <time.h>
#include <time.h>
-]],
-[[
+]]
]
,
+[[
[
struct tm stm;
(void) strptime ("2010-12-30%13:42:42", "%Y-%m-%dT%T", &stm);
struct tm stm;
(void) strptime ("2010-12-30%13:42:42", "%Y-%m-%dT%T", &stm);
-]]),
+]]]
+ )],
[c_cv_have_strptime_standards="yes"],
[c_cv_have_strptime_standards="no"]))
[c_cv_have_strptime_standards="yes"],
[c_cv_have_strptime_standards="no"]))
@@
-762,7
+770,6
@@
if test "x$GCC" = "xyes"
then
CFLAGS="$SAVE_CFLAGS"
fi
then
CFLAGS="$SAVE_CFLAGS"
fi
-
# }}} Check for strptime
AC_CHECK_FUNCS(swapctl, [have_swapctl="yes"], [have_swapctl="no"])
# }}} Check for strptime
AC_CHECK_FUNCS(swapctl, [have_swapctl="yes"], [have_swapctl="no"])
@@
-770,17
+777,17
@@
if test "x$have_swapctl" = "xyes"; then
AC_CACHE_CHECK([whether swapctl takes two arguments],
[c_cv_have_swapctl_two_args],
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
AC_CACHE_CHECK([whether swapctl takes two arguments],
[c_cv_have_swapctl_two_args],
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-[[
+[[
[
#if HAVE_SYS_SWAP_H && !defined(_LP64) && _FILE_OFFSET_BITS == 64
# undef _FILE_OFFSET_BITS
# undef _LARGEFILE64_SOURCE
#endif
#include <sys/stat.h>
#include <sys/swap.h>
#if HAVE_SYS_SWAP_H && !defined(_LP64) && _FILE_OFFSET_BITS == 64
# undef _FILE_OFFSET_BITS
# undef _LARGEFILE64_SOURCE
#endif
#include <sys/stat.h>
#include <sys/swap.h>
-]],
-[[
+]]
]
,
+[[
[
int num = swapctl(0, NULL);
int num = swapctl(0, NULL);
-]]
+]]
]
)],
[c_cv_have_swapctl_two_args="yes"],
[c_cv_have_swapctl_two_args="no"]
)],
[c_cv_have_swapctl_two_args="yes"],
[c_cv_have_swapctl_two_args="no"]
@@
-790,17
+797,17
@@
int num = swapctl(0, NULL);
[c_cv_have_swapctl_three_args],
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[c_cv_have_swapctl_three_args],
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
-[[
+[[
[
#if HAVE_SYS_SWAP_H && !defined(_LP64) && _FILE_OFFSET_BITS == 64
# undef _FILE_OFFSET_BITS
# undef _LARGEFILE64_SOURCE
#endif
#include <sys/stat.h>
#include <sys/swap.h>
#if HAVE_SYS_SWAP_H && !defined(_LP64) && _FILE_OFFSET_BITS == 64
# undef _FILE_OFFSET_BITS
# undef _LARGEFILE64_SOURCE
#endif
#include <sys/stat.h>
#include <sys/swap.h>
-]],
-[[
+]]
]
,
+[[
[
int num = swapctl(0, NULL, 0);
int num = swapctl(0, NULL, 0);
-]]
+]]
]
)],
[c_cv_have_swapctl_three_args="yes"],
[c_cv_have_swapctl_three_args="no"]
)],
[c_cv_have_swapctl_three_args="yes"],
[c_cv_have_swapctl_three_args="no"]
@@
-834,19
+841,19
@@
AC_ARG_WITH(nan-emulation, [AS_HELP_STRING([--with-nan-emulation], [use emulated
if test "x$nan_type" = "xnone"; then
AC_CACHE_CHECK([whether NAN is defined by default],
[c_cv_have_nan_default],
if test "x$nan_type" = "xnone"; then
AC_CACHE_CHECK([whether NAN is defined by default],
[c_cv_have_nan_default],
- AC_COMPILE_IFELSE(
- AC_LANG_PROGRAM(
- [[
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+[[[
#include <stdlib.h>
#include <math.h>
static double foo = NAN;
#include <stdlib.h>
#include <math.h>
static double foo = NAN;
-
]],
-
[[
+
]
]],
+
[
[[
if (isnan (foo))
return 0;
else
return 1;
if (isnan (foo))
return 0;
else
return 1;
- ]]),
+]]]
+ )],
[c_cv_have_nan_default="yes"],
[c_cv_have_nan_default="no"]
)
[c_cv_have_nan_default="yes"],
[c_cv_have_nan_default="no"]
)
@@
-859,20
+866,20
@@
fi
if test "x$nan_type" = "xnone"; then
AC_CACHE_CHECK([whether NAN is defined by __USE_ISOC99],
[c_cv_have_nan_isoc],
if test "x$nan_type" = "xnone"; then
AC_CACHE_CHECK([whether NAN is defined by __USE_ISOC99],
[c_cv_have_nan_isoc],
- AC_COMPILE_IFELSE(
- AC_LANG_PROGRAM(
- [[
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+[[[
#include <stdlib.h>
#define __USE_ISOC99 1
#include <math.h>
static double foo = NAN;
#include <stdlib.h>
#define __USE_ISOC99 1
#include <math.h>
static double foo = NAN;
-
]],
-
[[
+
]
]],
+
[
[[
if (isnan (foo))
return 0;
else
return 1;
if (isnan (foo))
return 0;
else
return 1;
- ]]),
+]]]
+ )],
[c_cv_have_nan_isoc="yes"],
[c_cv_have_nan_isoc="no"]
)
[c_cv_have_nan_isoc="yes"],
[c_cv_have_nan_isoc="no"]
)
@@
-887,9
+894,8
@@
if test "x$nan_type" = "xnone"; then
LDFLAGS="$LDFLAGS -lm"
AC_CACHE_CHECK([whether NAN can be defined by 0/0],
[c_cv_have_nan_zero],
LDFLAGS="$LDFLAGS -lm"
AC_CACHE_CHECK([whether NAN can be defined by 0/0],
[c_cv_have_nan_zero],
- AC_RUN_IFELSE(
- AC_LANG_PROGRAM(
- [[
+ AC_RUN_IFELSE([AC_LANG_PROGRAM(
+[[[
#include <stdlib.h>
#include <math.h>
#ifdef NAN
#include <stdlib.h>
#include <math.h>
#ifdef NAN
@@
-900,13
+906,14
@@
if test "x$nan_type" = "xnone"; then
# define isnan(f) ((f) != (f))
#endif
static double foo = NAN;
# define isnan(f) ((f) != (f))
#endif
static double foo = NAN;
-
]],
-
[[
+
]
]],
+
[
[[
if (isnan (foo))
return 0;
else
return 1;
if (isnan (foo))
return 0;
else
return 1;
- ]]),
+]]]
+ )],
[c_cv_have_nan_zero="yes"],
[c_cv_have_nan_zero="no"]
)
[c_cv_have_nan_zero="yes"],
[c_cv_have_nan_zero="no"]
)
@@
-948,9
+955,8
@@
fi; fi; fi
if test "x$fp_layout_type" = "xunknown"; then
AC_CACHE_CHECK([if doubles are stored in x86 representation],
[c_cv_fp_layout_need_nothing],
if test "x$fp_layout_type" = "xunknown"; then
AC_CACHE_CHECK([if doubles are stored in x86 representation],
[c_cv_fp_layout_need_nothing],
- AC_RUN_IFELSE(
- AC_LANG_PROGRAM(
- [[[[
+ AC_RUN_IFELSE([AC_LANG_PROGRAM(
+[[[
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@@
-963,8
+969,8
@@
if test "x$fp_layout_type" = "xunknown"; then
#if HAVE_STDBOOL_H
# include <stdbool.h>
#endif
#if HAVE_STDBOOL_H
# include <stdbool.h>
#endif
-
]
]]],
-
[
[[[
+]]],
+[[[
uint64_t i0;
uint64_t i1;
uint8_t c[8];
uint64_t i0;
uint64_t i1;
uint8_t c[8];
@@
-983,7
+989,8
@@
if test "x$fp_layout_type" = "xunknown"; then
return (0);
else
return (1);
return (0);
else
return (1);
- ]]]]),
+]]]
+ )],
[c_cv_fp_layout_need_nothing="yes"],
[c_cv_fp_layout_need_nothing="no"]
)
[c_cv_fp_layout_need_nothing="yes"],
[c_cv_fp_layout_need_nothing="no"]
)
@@
-995,9
+1002,8
@@
fi
if test "x$fp_layout_type" = "xunknown"; then
AC_CACHE_CHECK([if endianflip converts to x86 representation],
[c_cv_fp_layout_need_endianflip],
if test "x$fp_layout_type" = "xunknown"; then
AC_CACHE_CHECK([if endianflip converts to x86 representation],
[c_cv_fp_layout_need_endianflip],
- AC_RUN_IFELSE(
- AC_LANG_PROGRAM(
- [[[[
+ AC_RUN_IFELSE([AC_LANG_PROGRAM(
+[[[
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@@
-1018,8
+1024,8
@@
if test "x$fp_layout_type" = "xunknown"; then
(((uint64_t)(A) & 0x0000000000ff0000LL) << 24) | \
(((uint64_t)(A) & 0x000000000000ff00LL) << 40) | \
(((uint64_t)(A) & 0x00000000000000ffLL) << 56))
(((uint64_t)(A) & 0x0000000000ff0000LL) << 24) | \
(((uint64_t)(A) & 0x000000000000ff00LL) << 40) | \
(((uint64_t)(A) & 0x00000000000000ffLL) << 56))
-
]
]]],
-
[
[[[
+]]],
+[[[
uint64_t i0;
uint64_t i1;
uint8_t c[8];
uint64_t i0;
uint64_t i1;
uint8_t c[8];
@@
-1038,7
+1044,8
@@
if test "x$fp_layout_type" = "xunknown"; then
return (0);
else
return (1);
return (0);
else
return (1);
- ]]]]),
+]]]
+ )],
[c_cv_fp_layout_need_endianflip="yes"],
[c_cv_fp_layout_need_endianflip="no"]
)
[c_cv_fp_layout_need_endianflip="yes"],
[c_cv_fp_layout_need_endianflip="no"]
)
@@
-1050,9
+1057,8
@@
fi
if test "x$fp_layout_type" = "xunknown"; then
AC_CACHE_CHECK([if intswap converts to x86 representation],
[c_cv_fp_layout_need_intswap],
if test "x$fp_layout_type" = "xunknown"; then
AC_CACHE_CHECK([if intswap converts to x86 representation],
[c_cv_fp_layout_need_intswap],
- AC_RUN_IFELSE(
- AC_LANG_PROGRAM(
- [[[[
+ AC_RUN_IFELSE([AC_LANG_PROGRAM(
+[[[
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@@
-1067,8
+1073,8
@@
if test "x$fp_layout_type" = "xunknown"; then
#endif
#define intswap(A) ((((uint64_t)(A) & 0xffffffff00000000LL) >> 32) | \
(((uint64_t)(A) & 0x00000000ffffffffLL) << 32))
#endif
#define intswap(A) ((((uint64_t)(A) & 0xffffffff00000000LL) >> 32) | \
(((uint64_t)(A) & 0x00000000ffffffffLL) << 32))
-
]
]]],
-
[
[[[
+]]],
+[[[
uint64_t i0;
uint64_t i1;
uint8_t c[8];
uint64_t i0;
uint64_t i1;
uint8_t c[8];
@@
-1087,7
+1093,8
@@
if test "x$fp_layout_type" = "xunknown"; then
return (0);
else
return (1);
return (0);
else
return (1);
- ]]]]),
+]]]
+ )],
[c_cv_fp_layout_need_intswap="yes"],
[c_cv_fp_layout_need_intswap="no"]
)
[c_cv_fp_layout_need_intswap="yes"],
[c_cv_fp_layout_need_intswap="no"]
)
@@
-1134,15
+1141,15
@@
if test "x$have_getmntent" = "xc"; then
[c_cv_have_one_getmntent],
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[c_cv_have_one_getmntent],
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
-[[
+[[
[
#include "$srcdir/src/utils_mount.h"
#include "$srcdir/src/utils_mount.h"
-]],
-[[
+]]
]
,
+[[
[
FILE *fh;
struct mntent *me;
fh = setmntent ("/etc/mtab", "r");
me = getmntent (fh);
FILE *fh;
struct mntent *me;
fh = setmntent ("/etc/mtab", "r");
me = getmntent (fh);
-]]
+]]
]
)],
[c_cv_have_one_getmntent="yes"],
[c_cv_have_one_getmntent="no"]
)],
[c_cv_have_one_getmntent="yes"],
[c_cv_have_one_getmntent="no"]
@@
-1152,16
+1159,16
@@
me = getmntent (fh);
[c_cv_have_two_getmntent],
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[c_cv_have_two_getmntent],
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
-[[
+[[
[
#include "$srcdir/src/utils_mount.h"
#include "$srcdir/src/utils_mount.h"
-]],
-[[
+]]
]
,
+[[
[
FILE *fh;
struct mnttab mt;
int status;
fh = fopen ("/etc/mnttab", "r");
status = getmntent (fh, &mt);
FILE *fh;
struct mnttab mt;
int status;
fh = fopen ("/etc/mnttab", "r");
status = getmntent (fh, &mt);
-]]
+]]
]
)],
[c_cv_have_two_getmntent="yes"],
[c_cv_have_two_getmntent="no"]
)],
[c_cv_have_two_getmntent="yes"],
[c_cv_have_two_getmntent="no"]
@@
-1198,17
+1205,19
@@
fi
AC_MSG_CHECKING([if have htonll defined])
have_htonll="no"
AC_MSG_CHECKING([if have htonll defined])
have_htonll="no"
- AC_LINK_IFELSE([
-
AC_LANG_PROGRAM(
[
+ AC_LINK_IFELSE([
AC_LANG_PROGRAM(
+
[[
[
#include <sys/types.h>
#include <netinet/in.h>
#if HAVE_INTTYPES_H
# include <inttypes.h>
#endif
#include <sys/types.h>
#include <netinet/in.h>
#if HAVE_INTTYPES_H
# include <inttypes.h>
#endif
- ], [
+]]],
+[[[
return htonll(0);
return htonll(0);
- ])
- ], [
+]]]
+ )],
+ [
have_htonll="yes"
AC_DEFINE(HAVE_HTONLL, 1, [Define if the function htonll exists.])
])
have_htonll="yes"
AC_DEFINE(HAVE_HTONLL, 1, [Define if the function htonll exists.])
])
@@
-1835,6
+1844,8
@@
then
if test "$with_libgcrypt" != "no"; then
AM_PATH_LIBGCRYPT(1:1.2.0,,with_libgcrypt="no (version 1.2.0+ required)")
if test "$with_libgcrypt" != "no"; then
AM_PATH_LIBGCRYPT(1:1.2.0,,with_libgcrypt="no (version 1.2.0+ required)")
+ GCRYPT_CPPFLAGS="$LIBGCRYPT_CPPFLAGS $LIBGCRYPT_CFLAGS"
+ GCRYPT_LIBS="$LIBGCRYPT_LIBS"
fi
fi
fi
fi
@@
-1998,31
+2009,31
@@
then
if test -d "$with_java_home"
then
AC_MSG_CHECKING([for jni.h])
if test -d "$with_java_home"
then
AC_MSG_CHECKING([for jni.h])
- TMP
DI
R=`find "$with_java_home" -name jni.h -type f -exec 'dirname' '{}' ';' 2>/dev/null | head -n 1`
- if test "x$TMP
DI
R" != "x"
+ TMP
VA
R=`find "$with_java_home" -name jni.h -type f -exec 'dirname' '{}' ';' 2>/dev/null | head -n 1`
+ if test "x$TMP
VA
R" != "x"
then
then
- AC_MSG_RESULT([found in $TMP
DI
R])
- JAVA_CPPFLAGS="$JAVA_CPPFLAGS -I$TMP
DI
R"
+ AC_MSG_RESULT([found in $TMP
VA
R])
+ JAVA_CPPFLAGS="$JAVA_CPPFLAGS -I$TMP
VA
R"
else
AC_MSG_RESULT([not found])
fi
AC_MSG_CHECKING([for jni_md.h])
else
AC_MSG_RESULT([not found])
fi
AC_MSG_CHECKING([for jni_md.h])
- TMP
DI
R=`find "$with_java_home" -name jni_md.h -type f -exec 'dirname' '{}' ';' 2>/dev/null | head -n 1`
- if test "x$TMP
DI
R" != "x"
+ TMP
VA
R=`find "$with_java_home" -name jni_md.h -type f -exec 'dirname' '{}' ';' 2>/dev/null | head -n 1`
+ if test "x$TMP
VA
R" != "x"
then
then
- AC_MSG_RESULT([found in $TMP
DI
R])
- JAVA_CPPFLAGS="$JAVA_CPPFLAGS -I$TMP
DI
R"
+ AC_MSG_RESULT([found in $TMP
VA
R])
+ JAVA_CPPFLAGS="$JAVA_CPPFLAGS -I$TMP
VA
R"
else
AC_MSG_RESULT([not found])
fi
AC_MSG_CHECKING([for libjvm.so])
else
AC_MSG_RESULT([not found])
fi
AC_MSG_CHECKING([for libjvm.so])
- TMP
DI
R=`find "$with_java_home" -name libjvm.so -type f -exec 'dirname' '{}' ';' 2>/dev/null | head -n 1`
- if test "x$TMP
DI
R" != "x"
+ TMP
VA
R=`find "$with_java_home" -name libjvm.so -type f -exec 'dirname' '{}' ';' 2>/dev/null | head -n 1`
+ if test "x$TMP
VA
R" != "x"
then
then
- AC_MSG_RESULT([found in $TMP
DI
R])
- JAVA_LDFLAGS="$JAVA_LDFLAGS -L$TMP
DIR -Wl,-rpath -Wl,$TMPDI
R"
+ AC_MSG_RESULT([found in $TMP
VA
R])
+ JAVA_LDFLAGS="$JAVA_LDFLAGS -L$TMP
VAR -Wl,-rpath -Wl,$TMPVA
R"
else
AC_MSG_RESULT([not found])
fi
else
AC_MSG_RESULT([not found])
fi
@@
-2030,10
+2041,10
@@
then
if test "x$JAVAC" = "x"
then
AC_MSG_CHECKING([for javac])
if test "x$JAVAC" = "x"
then
AC_MSG_CHECKING([for javac])
- TMP
DI
R=`find "$with_java_home" -name javac -type f 2>/dev/null | head -n 1`
- if test "x$TMP
DI
R" != "x"
+ TMP
VA
R=`find "$with_java_home" -name javac -type f 2>/dev/null | head -n 1`
+ if test "x$TMP
VA
R" != "x"
then
then
- JAVAC="$TMP
DI
R"
+ JAVAC="$TMP
VA
R"
AC_MSG_RESULT([$JAVAC])
else
AC_MSG_RESULT([not found])
AC_MSG_RESULT([$JAVAC])
else
AC_MSG_RESULT([not found])
@@
-2042,10
+2053,10
@@
then
if test "x$JAR" = "x"
then
AC_MSG_CHECKING([for jar])
if test "x$JAR" = "x"
then
AC_MSG_CHECKING([for jar])
- TMP
DI
R=`find "$with_java_home" -name jar -type f 2>/dev/null | head -n 1`
- if test "x$TMP
DI
R" != "x"
+ TMP
VA
R=`find "$with_java_home" -name jar -type f 2>/dev/null | head -n 1`
+ if test "x$TMP
VA
R" != "x"
then
then
- JAR="$TMP
DI
R"
+ JAR="$TMP
VA
R"
AC_MSG_RESULT([$JAR])
else
AC_MSG_RESULT([not found])
AC_MSG_RESULT([$JAR])
else
AC_MSG_RESULT([not found])
@@
-2488,34
+2499,34
@@
then
#include <sys/socket.h>])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
#include <sys/socket.h>])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-[[
+[[
[
#include <stdio.h>
#include <sys/types.h>
#include <asm/types.h>
#include <sys/socket.h>
#include <linux/netlink.h>
#include <linux/rtnetlink.h>
#include <stdio.h>
#include <sys/types.h>
#include <asm/types.h>
#include <sys/socket.h>
#include <linux/netlink.h>
#include <linux/rtnetlink.h>
-]],
-[[
+]]
]
,
+[[
[
int retval = TCA_STATS2;
return (retval);
int retval = TCA_STATS2;
return (retval);
-]]
+]]
]
)],
[AC_DEFINE([HAVE_TCA_STATS2], [1], [True if the enum-member TCA_STATS2 exists])])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
)],
[AC_DEFINE([HAVE_TCA_STATS2], [1], [True if the enum-member TCA_STATS2 exists])])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-[[
+[[
[
#include <stdio.h>
#include <sys/types.h>
#include <asm/types.h>
#include <sys/socket.h>
#include <linux/netlink.h>
#include <linux/rtnetlink.h>
#include <stdio.h>
#include <sys/types.h>
#include <asm/types.h>
#include <sys/socket.h>
#include <linux/netlink.h>
#include <linux/rtnetlink.h>
-]],
-[[
+]]
]
,
+[[
[
int retval = TCA_STATS;
return (retval);
int retval = TCA_STATS;
return (retval);
-]]
+]]
]
)],
[AC_DEFINE([HAVE_TCA_STATS], 1, [True if the enum-member TCA_STATS exists])])
)],
[AC_DEFINE([HAVE_TCA_STATS], 1, [True if the enum-member TCA_STATS exists])])
@@
-2537,7
+2548,7
@@
then
[if function 'rtnl_dump_filter' expects five arguments],
[c_cv_rtnl_dump_filter_five_args],
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[if function 'rtnl_dump_filter' expects five arguments],
[c_cv_rtnl_dump_filter_five_args],
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-[[
+[[
[
#include <stdio.h>
#include <sys/types.h>
#include <asm/types.h>
#include <stdio.h>
#include <sys/types.h>
#include <asm/types.h>
@@
-2549,12
+2560,12
@@
then
#elif HAVE_LINUX_LIBNETLINK_H
# include <linux/libnetlink.h>
#endif
#elif HAVE_LINUX_LIBNETLINK_H
# include <linux/libnetlink.h>
#endif
-]],
-[[
+]]
]
,
+[[
[
if (rtnl_dump_filter(NULL, NULL, NULL, NULL, NULL))
return 1;
return 0;
if (rtnl_dump_filter(NULL, NULL, NULL, NULL, NULL))
return 1;
return 0;
-]]
+]]
]
)],
[c_cv_rtnl_dump_filter_five_args="yes"],
[c_cv_rtnl_dump_filter_five_args="no"]
)],
[c_cv_rtnl_dump_filter_five_args="yes"],
[c_cv_rtnl_dump_filter_five_args="no"]
@@
-2565,7
+2576,7
@@
return 0;
[if function 'rtnl_dump_filter' expects three arguments],
[c_cv_rtnl_dump_filter_three_args],
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[if function 'rtnl_dump_filter' expects three arguments],
[c_cv_rtnl_dump_filter_three_args],
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-[[
+[[
[
#include <stdio.h>
#include <sys/types.h>
#include <asm/types.h>
#include <stdio.h>
#include <sys/types.h>
#include <asm/types.h>
@@
-2577,12
+2588,12
@@
return 0;
#elif HAVE_LINUX_LIBNETLINK_H
# include <linux/libnetlink.h>
#endif
#elif HAVE_LINUX_LIBNETLINK_H
# include <linux/libnetlink.h>
#endif
-]],
-[[
+]]
]
,
+[[
[
if (rtnl_dump_filter(NULL, NULL, NULL))
return 1;
return 0;
if (rtnl_dump_filter(NULL, NULL, NULL))
return 1;
return 0;
-]]
+]]
]
)],
[c_cv_rtnl_dump_filter_three_args="yes"],
[c_cv_rtnl_dump_filter_three_args="no"]
)],
[c_cv_rtnl_dump_filter_three_args="yes"],
[c_cv_rtnl_dump_filter_three_args="no"]
@@
-3052,20
+3063,20
@@
dnl ARCHFLAGS="" -> disable multi -arch on OSX (see Config_heavy.pl:fetch_string
AC_CACHE_CHECK([for libperl],
[c_cv_have_libperl],
AC_CACHE_CHECK([for libperl],
[c_cv_have_libperl],
- AC_LINK_IFELSE(
- AC_LANG_PROGRAM(
- [[
+ AC_LINK_IFELSE([AC_LANG_PROGRAM(
+[[[
#define PERL_NO_GET_CONTEXT
#include <EXTERN.h>
#include <perl.h>
#include <XSUB.h>
#define PERL_NO_GET_CONTEXT
#include <EXTERN.h>
#include <perl.h>
#include <XSUB.h>
-
]],
-
[[
+
]
]],
+
[
[[
dTHX;
load_module (PERL_LOADMOD_NOIMPORT,
newSVpv ("Collectd::Plugin::FooBar", 24),
Nullsv);
dTHX;
load_module (PERL_LOADMOD_NOIMPORT,
newSVpv ("Collectd::Plugin::FooBar", 24),
Nullsv);
- ]]),
+]]]
+ )],
[c_cv_have_libperl="yes"],
[c_cv_have_libperl="no"]
)
[c_cv_have_libperl="yes"],
[c_cv_have_libperl="no"]
)
@@
-3097,9
+3108,8
@@
then
AC_CACHE_CHECK([if perl supports ithreads],
[c_cv_have_perl_ithreads],
AC_CACHE_CHECK([if perl supports ithreads],
[c_cv_have_perl_ithreads],
- AC_LINK_IFELSE(
- AC_LANG_PROGRAM(
- [[
+ AC_LINK_IFELSE([AC_LANG_PROGRAM(
+[[[
#include <EXTERN.h>
#include <perl.h>
#include <XSUB.h>
#include <EXTERN.h>
#include <perl.h>
#include <XSUB.h>
@@
-3107,8
+3117,9
@@
then
#if !defined(USE_ITHREADS)
# error "Perl does not support ithreads!"
#endif /* !defined(USE_ITHREADS) */
#if !defined(USE_ITHREADS)
# error "Perl does not support ithreads!"
#endif /* !defined(USE_ITHREADS) */
- ]],
- [[ ]]),
+]]],
+[[[ ]]]
+ )],
[c_cv_have_perl_ithreads="yes"],
[c_cv_have_perl_ithreads="no"]
)
[c_cv_have_perl_ithreads="yes"],
[c_cv_have_perl_ithreads="no"]
)
@@
-3134,20
+3145,20
@@
then
AC_CACHE_CHECK([for broken Perl_load_module()],
[c_cv_have_broken_perl_load_module],
AC_CACHE_CHECK([for broken Perl_load_module()],
[c_cv_have_broken_perl_load_module],
- AC_LINK_IFELSE(
- AC_LANG_PROGRAM(
- [[
+ AC_LINK_IFELSE([AC_LANG_PROGRAM(
+[[[
#define PERL_NO_GET_CONTEXT
#include <EXTERN.h>
#include <perl.h>
#include <XSUB.h>
#define PERL_NO_GET_CONTEXT
#include <EXTERN.h>
#include <perl.h>
#include <XSUB.h>
-
]],
-
[[
+
]
]],
+
[
[[
dTHX;
load_module (PERL_LOADMOD_NOIMPORT,
newSVpv ("Collectd::Plugin::FooBar", 24),
Nullsv);
dTHX;
load_module (PERL_LOADMOD_NOIMPORT,
newSVpv ("Collectd::Plugin::FooBar", 24),
Nullsv);
- ]]),
+]]]
+ )],
[c_cv_have_broken_perl_load_module="no"],
[c_cv_have_broken_perl_load_module="yes"]
)
[c_cv_have_broken_perl_load_module="no"],
[c_cv_have_broken_perl_load_module="yes"]
)
@@
-4963,6
+4974,7
@@
AC_PLUGIN([swap], [$plugin_swap], [Swap usage statistics])
AC_PLUGIN([syslog], [$have_syslog], [Syslog logging plugin])
AC_PLUGIN([table], [yes], [Parsing of tabular data])
AC_PLUGIN([tail], [yes], [Parsing of logfiles])
AC_PLUGIN([syslog], [$have_syslog], [Syslog logging plugin])
AC_PLUGIN([table], [yes], [Parsing of tabular data])
AC_PLUGIN([tail], [yes], [Parsing of logfiles])
+AC_PLUGIN([tail_csv], [yes], [Parsing of CSV files])
AC_PLUGIN([tape], [$plugin_tape], [Tape drive statistics])
AC_PLUGIN([target_notification], [yes], [The notification target])
AC_PLUGIN([target_replace], [yes], [The replace target])
AC_PLUGIN([tape], [$plugin_tape], [Tape drive statistics])
AC_PLUGIN([target_notification], [yes], [The notification target])
AC_PLUGIN([target_replace], [yes], [The replace target])
@@
-4985,8
+4997,9
@@
AC_PLUGIN([vserver], [$plugin_vserver], [Linux VServer statistics])
AC_PLUGIN([wireless], [$plugin_wireless], [Wireless statistics])
AC_PLUGIN([write_graphite], [yes], [Graphite / Carbon output plugin])
AC_PLUGIN([write_http], [$with_libcurl], [HTTP output plugin])
AC_PLUGIN([wireless], [$plugin_wireless], [Wireless statistics])
AC_PLUGIN([write_graphite], [yes], [Graphite / Carbon output plugin])
AC_PLUGIN([write_http], [$with_libcurl], [HTTP output plugin])
-AC_PLUGIN([write_redis], [$with_libcredis], [Redis output plugin])
AC_PLUGIN([write_mongodb], [$with_libmongoc], [MongoDB output plugin])
AC_PLUGIN([write_mongodb], [$with_libmongoc], [MongoDB output plugin])
+AC_PLUGIN([write_redis], [$with_libcredis], [Redis output plugin])
+AC_PLUGIN([write_riemann], [$have_protoc_c], [Riemann output plugin])
AC_PLUGIN([xmms], [$with_libxmms], [XMMS statistics])
AC_PLUGIN([zfs_arc], [$plugin_zfs_arc], [ZFS ARC statistics])
AC_PLUGIN([xmms], [$with_libxmms], [XMMS statistics])
AC_PLUGIN([zfs_arc], [$plugin_zfs_arc], [ZFS ARC statistics])
@@
-5083,6
+5096,7
@@
then
fi
dnl Perl bindings
fi
dnl Perl bindings
+PERL_BINDINGS_OPTIONS="PREFIX=${prefix}"
AC_ARG_WITH(perl-bindings, [AS_HELP_STRING([--with-perl-bindings@<:@=OPTIONS@:>@], [Options passed to "perl Makefile.PL".])],
[
if test "x$withval" != "xno" && test "x$withval" != "xyes"
AC_ARG_WITH(perl-bindings, [AS_HELP_STRING([--with-perl-bindings@<:@=OPTIONS@:>@], [Options passed to "perl Makefile.PL".])],
[
if test "x$withval" != "xno" && test "x$withval" != "xyes"
@@
-5090,12
+5104,10
@@
AC_ARG_WITH(perl-bindings, [AS_HELP_STRING([--with-perl-bindings@<:@=OPTIONS@:>@
PERL_BINDINGS_OPTIONS="$withval"
with_perl_bindings="yes"
else
PERL_BINDINGS_OPTIONS="$withval"
with_perl_bindings="yes"
else
- PERL_BINDINGS_OPTIONS=""
with_perl_bindings="$withval"
fi
],
[
with_perl_bindings="$withval"
fi
],
[
- PERL_BINDINGS_OPTIONS=""
if test -n "$perl_interpreter"
then
with_perl_bindings="yes"
if test -n "$perl_interpreter"
then
with_perl_bindings="yes"
@@
-5296,6
+5308,7
@@
Configuration:
syslog . . . . . . . $enable_syslog
table . . . . . . . . $enable_table
tail . . . . . . . . $enable_tail
syslog . . . . . . . $enable_syslog
table . . . . . . . . $enable_table
tail . . . . . . . . $enable_tail
+ tail_csv . . . . . . $enable_tail_csv
tape . . . . . . . . $enable_tape
target_notification . $enable_target_notification
target_replace . . . $enable_target_replace
tape . . . . . . . . $enable_tape
target_notification . $enable_target_notification
target_replace . . . $enable_target_replace
@@
-5318,8
+5331,9
@@
Configuration:
wireless . . . . . . $enable_wireless
write_graphite . . . $enable_write_graphite
write_http . . . . . $enable_write_http
wireless . . . . . . $enable_wireless
write_graphite . . . $enable_write_graphite
write_http . . . . . $enable_write_http
- write_redis . . . . . $enable_write_redis
write_mongodb . . . . $enable_write_mongodb
write_mongodb . . . . $enable_write_mongodb
+ write_redis . . . . . $enable_write_redis
+ write_riemann . . . . $enable_write_riemann
xmms . . . . . . . . $enable_xmms
zfs_arc . . . . . . . $enable_zfs_arc
xmms . . . . . . . . $enable_xmms
zfs_arc . . . . . . . $enable_zfs_arc