From 01a4d0ac2dec01b668a6cb80136a166ec8548a97 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Thu, 21 Feb 2013 11:18:53 +0100 Subject: [PATCH] configure.in: Fix quoting of AC_LANG_PROGRAM(). Autoconf 2.68 complains about that and aborts building the configure script. *sigh* --- configure.in | 169 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 83 insertions(+), 86 deletions(-) diff --git a/configure.in b/configure.in index b2b496ab..7d4967b4 100644 --- a/configure.in +++ b/configure.in @@ -517,13 +517,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; @@ -533,10 +533,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"] ) @@ -549,13 +549,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; @@ -565,10 +565,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!])] ) @@ -631,18 +631,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 float foo = NAN; - ]], - [[ +static double foo = NAN; + ]]], + [[[ if (isnan (foo)) return 0; else return 1; - ]]), + ]]])], [c_cv_have_nan_default="yes"], [c_cv_have_nan_default="no"] ) @@ -656,19 +656,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 float foo = NAN; - ]], - [[ +static double foo = NAN; + ]]], + [[[ if (isnan (foo)) return 0; else return 1; - ]]), + ]]])], [c_cv_have_nan_isoc="yes"], [c_cv_have_nan_isoc="no"] ) @@ -684,8 +684,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 @@ -695,14 +695,14 @@ if test "x$nan_type" = "xnone"; then #ifndef isnan # define isnan(f) ((f) != (f)) #endif -static float foo = NAN; - ]], - [[ +static double foo = NAN; + ]]], + [[[ if (isnan (foo)) return 0; else return 1; - ]]), + ]]])], [c_cv_have_nan_zero="yes"], [c_cv_have_nan_zero="no"] ) @@ -745,8 +745,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 @@ -759,8 +759,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]; @@ -779,7 +779,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"] ) @@ -792,8 +792,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 @@ -814,8 +814,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]; @@ -834,7 +834,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"] ) @@ -847,8 +847,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 @@ -863,8 +863,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]; @@ -883,7 +883,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"] ) @@ -929,15 +929,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 + [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"] ) @@ -945,16 +945,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 + [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"] ) @@ -991,15 +991,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.]) @@ -2154,33 +2154,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])] []); @@ -2201,8 +2201,7 @@ then AC_CACHE_CHECK( [if function 'rtnl_dump_filter' expects five arguments], [c_cv_rtnl_dump_filter_five_args], - AC_COMPILE_IFELSE([AC_LANG_PROGRAM( - [ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ AC_INCLUDES_DEFAULT #include #include @@ -2213,12 +2212,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"] @@ -2229,7 +2227,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 @@ -2240,12 +2238,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"] @@ -2715,19 +2712,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"] ) @@ -2760,8 +2757,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 @@ -2769,8 +2766,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"] ) @@ -2797,19 +2794,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