From ce8b96ae642984f7f16a49b3f43c63f6de2b26c7 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Thu, 28 Feb 2013 12:21:18 +0100 Subject: [PATCH] configure.in: Update for autoconf 2.68. --- configure.in | 210 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 104 insertions(+), 106 deletions(-) diff --git a/configure.in b/configure.in index 1492ba2f..f7371fa3 100644 --- a/configure.in +++ b/configure.in @@ -583,13 +583,13 @@ fi AC_CACHE_CHECK([for strtok_r], [c_cv_have_strtok_r_default], AC_LINK_IFELSE( - AC_LANG_PROGRAM( - [[[[ + [AC_LANG_PROGRAM( + [[[ #include #include #include - ]]]], - [[[[ + ]]], + [[[ char buffer[] = "foo,bar,baz"; char *token; char *dummy; @@ -599,10 +599,10 @@ AC_CACHE_CHECK([for strtok_r], saveptr = NULL; while ((token = strtok_r (dummy, ",", &saveptr)) != NULL) { - dummy = NULL; + dummy = NULL; printf ("token = %s;\n", token); } - ]]]]), + ]]])], [c_cv_have_strtok_r_default="yes"], [c_cv_have_strtok_r_default="no"] ) @@ -615,13 +615,13 @@ then AC_CACHE_CHECK([if strtok_r needs _REENTRANT], [c_cv_have_strtok_r_reentrant], AC_LINK_IFELSE( - AC_LANG_PROGRAM( - [[[[ + [AC_LANG_PROGRAM( + [[[ #include #include #include - ]]]], - [[[[ + ]]], + [[[ char buffer[] = "foo,bar,baz"; char *token; char *dummy; @@ -631,10 +631,10 @@ then saveptr = NULL; while ((token = strtok_r (dummy, ",", &saveptr)) != NULL) { - dummy = NULL; + dummy = NULL; printf ("token = %s;\n", token); } - ]]]]), + ]]])], [c_cv_have_strtok_r_reentrant="yes"], [AC_MSG_FAILURE([strtok_r isn't available. Please file a bugreport!])] ) @@ -713,15 +713,14 @@ 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_LANG_PROGRAM( +[[[ #include -]], -[[ +]]], +[[[ 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 @@ -730,8 +729,8 @@ then AC_CACHE_CHECK([whether strptime needs standards mode], [c_cv_have_strptime_standards], AC_COMPILE_IFELSE( -AC_LANG_PROGRAM( -[[ +[AC_LANG_PROGRAM( +[[[ #ifndef _ISOC99_SOURCE # define _ISOC99_SOURCE 1 #endif @@ -741,13 +740,13 @@ AC_LANG_PROGRAM( #ifndef _XOPEN_SOURCE # define _XOPEN_SOURCE 500 #endif -AC_INCLUDES_DEFAULT + #include -]], -[[ +]]], +[[[ 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"])) @@ -770,18 +769,19 @@ AC_CHECK_FUNCS(swapctl, [have_swapctl="yes"], [have_swapctl="no"]) 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_INCLUDES_DEFAULT + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [[ +AC_INCLUDES_DEFAULT #if HAVE_SYS_SWAP_H && !defined(_LP64) && _FILE_OFFSET_BITS == 64 # undef _FILE_OFFSET_BITS # undef _LARGEFILE64_SOURCE #endif #include #include ]], - [[ + [[[ int num = swapctl(0, NULL); - ]] - ), + ]]] + )], [c_cv_have_swapctl_two_args="yes"], [c_cv_have_swapctl_two_args="no"] ) @@ -789,17 +789,17 @@ if test "x$have_swapctl" = "xyes"; then AC_CACHE_CHECK([whether swapctl takes three arguments], [c_cv_have_swapctl_three_args], AC_COMPILE_IFELSE( - AC_LANG_PROGRAM([[AC_INCLUDES_DEFAULT + [AC_LANG_PROGRAM([[[AC_INCLUDES_DEFAULT #if HAVE_SYS_SWAP_H && !defined(_LP64) && _FILE_OFFSET_BITS == 64 # undef _FILE_OFFSET_BITS # undef _LARGEFILE64_SOURCE #endif #include -#include ]], - [[ +#include ]]], + [[[ int num = swapctl(0, NULL,0); - ]] - ), + ]]] + )], [c_cv_have_swapctl_three_args="yes"], [c_cv_have_swapctl_three_args="no"] ) @@ -833,18 +833,18 @@ 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_LANG_PROGRAM( + [[[ #include #include static double foo = NAN; - ]], - [[ + ]]], + [[[ if (isnan (foo)) return 0; else return 1; - ]]), + ]]])], [c_cv_have_nan_default="yes"], [c_cv_have_nan_default="no"] ) @@ -858,19 +858,19 @@ 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_LANG_PROGRAM( + [[[ #include #define __USE_ISOC99 1 #include static double foo = NAN; - ]], - [[ + ]]], + [[[ if (isnan (foo)) return 0; else return 1; - ]]), + ]]])], [c_cv_have_nan_isoc="yes"], [c_cv_have_nan_isoc="no"] ) @@ -886,8 +886,8 @@ if test "x$nan_type" = "xnone"; then AC_CACHE_CHECK([whether NAN can be defined by 0/0], [c_cv_have_nan_zero], AC_RUN_IFELSE( - AC_LANG_PROGRAM( - [[ + [AC_LANG_PROGRAM( + [[[ #include #include #ifdef NAN @@ -898,13 +898,13 @@ if test "x$nan_type" = "xnone"; then # define isnan(f) ((f) != (f)) #endif static double foo = NAN; - ]], - [[ + ]]], + [[[ if (isnan (foo)) return 0; else return 1; - ]]), + ]]])], [c_cv_have_nan_zero="yes"], [c_cv_have_nan_zero="no"] ) @@ -947,8 +947,8 @@ 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_LANG_PROGRAM( + [[[ #include #include #include @@ -961,8 +961,8 @@ if test "x$fp_layout_type" = "xunknown"; then #if HAVE_STDBOOL_H # include #endif - ]]]], - [[[[ + ]]], + [[[ uint64_t i0; uint64_t i1; uint8_t c[8]; @@ -981,7 +981,7 @@ if test "x$fp_layout_type" = "xunknown"; then return (0); else return (1); - ]]]]), + ]]])], [c_cv_fp_layout_need_nothing="yes"], [c_cv_fp_layout_need_nothing="no"] ) @@ -994,8 +994,8 @@ 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_LANG_PROGRAM( + [[[ #include #include #include @@ -1016,8 +1016,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 i0; uint64_t i1; uint8_t c[8]; @@ -1036,7 +1036,7 @@ if test "x$fp_layout_type" = "xunknown"; then return (0); else return (1); - ]]]]), + ]]])], [c_cv_fp_layout_need_endianflip="yes"], [c_cv_fp_layout_need_endianflip="no"] ) @@ -1049,8 +1049,8 @@ 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_LANG_PROGRAM( + [[[ #include #include #include @@ -1065,8 +1065,8 @@ if test "x$fp_layout_type" = "xunknown"; then #endif #define intswap(A) ((((uint64_t)(A) & 0xffffffff00000000LL) >> 32) | \ (((uint64_t)(A) & 0x00000000ffffffffLL) << 32)) - ]]]], - [[[[ + ]]], + [[[ uint64_t i0; uint64_t i1; uint8_t c[8]; @@ -1085,7 +1085,7 @@ if test "x$fp_layout_type" = "xunknown"; then return (0); else return (1); - ]]]]), + ]]])], [c_cv_fp_layout_need_intswap="yes"], [c_cv_fp_layout_need_intswap="no"] ) @@ -1131,15 +1131,15 @@ if test "x$have_getmntent" = "xc"; then AC_CACHE_CHECK([whether getmntent takes one argument], [c_cv_have_one_getmntent], AC_COMPILE_IFELSE( - AC_LANG_PROGRAM([[AC_INCLUDES_DEFAULT -#include "$srcdir/src/utils_mount.h"]], - [[ + [AC_LANG_PROGRAM([[[AC_INCLUDES_DEFAULT +#include "$srcdir/src/utils_mount.h"]]], + [[[ 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"] ) @@ -1147,16 +1147,16 @@ if test "x$have_getmntent" = "xc"; then AC_CACHE_CHECK([whether getmntent takes two arguments], [c_cv_have_two_getmntent], AC_COMPILE_IFELSE( - AC_LANG_PROGRAM([[AC_INCLUDES_DEFAULT -#include "$srcdir/src/utils_mount.h"]], - [[ + [AC_LANG_PROGRAM([[[AC_INCLUDES_DEFAULT +#include "$srcdir/src/utils_mount.h"]]], + [[[ 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"] ) @@ -1193,15 +1193,15 @@ AC_MSG_CHECKING([if have htonll defined]) have_htonll="no" AC_LINK_IFELSE([ - AC_LANG_PROGRAM([ + AC_LANG_PROGRAM([[[ #include #include #if HAVE_INTTYPES_H # include #endif - ], [ + ]]], [[[ return htonll(0); - ]) + ]]]) ], [ have_htonll="yes" AC_DEFINE(HAVE_HTONLL, 1, [Define if the function htonll exists.]) @@ -2484,33 +2484,33 @@ then #include ]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM( - [ + [[[ #include #include #include #include #include #include - ], [ + ]]], [[[ int retval = TCA_STATS2; return (retval); - ] + ]]] )], [AC_DEFINE([HAVE_TCA_STATS2], [1], [True if the enum-member TCA_STATS2 exists])]) - AC_COMPILE_IFELSE( -[#include + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( +[[[#include #include #include #include #include #include - +]]], [[[ int main (void) { int retval = TCA_STATS; return (retval); -}], +}]]])], [AC_DEFINE([HAVE_TCA_STATS], 1, [True if the enum-member TCA_STATS exists])] []); @@ -2532,7 +2532,7 @@ then [if function 'rtnl_dump_filter' expects five arguments], [c_cv_rtnl_dump_filter_five_args], AC_COMPILE_IFELSE([AC_LANG_PROGRAM( - [ + [[[ AC_INCLUDES_DEFAULT #include #include @@ -2543,12 +2543,11 @@ AC_INCLUDES_DEFAULT #elif HAVE_LINUX_LIBNETLINK_H # include #endif - ], - [ + ]]], [[[ 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"] @@ -2559,7 +2558,7 @@ return 0; [if function 'rtnl_dump_filter' expects three arguments], [c_cv_rtnl_dump_filter_three_args], AC_COMPILE_IFELSE([AC_LANG_PROGRAM( - [ + [[[ AC_INCLUDES_DEFAULT #include #include @@ -2570,12 +2569,11 @@ AC_INCLUDES_DEFAULT #elif HAVE_LINUX_LIBNETLINK_H # include #endif - ], - [ + ]]], [[[ 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"] @@ -3046,19 +3044,19 @@ dnl ARCHFLAGS="" -> disable multi -arch on OSX (see Config_heavy.pl:fetch_string AC_CACHE_CHECK([for libperl], [c_cv_have_libperl], AC_LINK_IFELSE( - AC_LANG_PROGRAM( - [[ + [AC_LANG_PROGRAM( + [[[ #define PERL_NO_GET_CONTEXT #include #include #include - ]], - [[ + ]]], + [[[ dTHX; load_module (PERL_LOADMOD_NOIMPORT, newSVpv ("Collectd::Plugin::FooBar", 24), Nullsv); - ]]), + ]]])], [c_cv_have_libperl="yes"], [c_cv_have_libperl="no"] ) @@ -3091,8 +3089,8 @@ then AC_CACHE_CHECK([if perl supports ithreads], [c_cv_have_perl_ithreads], AC_LINK_IFELSE( - AC_LANG_PROGRAM( - [[ + [AC_LANG_PROGRAM( + [[[ #include #include #include @@ -3100,8 +3098,8 @@ then #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"] ) @@ -3128,19 +3126,19 @@ then AC_CACHE_CHECK([for broken Perl_load_module()], [c_cv_have_broken_perl_load_module], AC_LINK_IFELSE( - AC_LANG_PROGRAM( - [[ + [AC_LANG_PROGRAM( + [[[ #define PERL_NO_GET_CONTEXT #include #include #include - ]], - [[ + ]]], + [[[ 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"] ) -- 2.11.0