diff options
| author | Lucas De Marchi <lucas.demarchi@profusion.mobi> | 2011-01-26 17:59:11 -0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-02-08 12:11:53 +0100 |
| commit | c18514440d7edce2ca7ae14cc2c88cfbac436e67 (patch) | |
| tree | 8ed6a1e77186100b0446828e0a1463c8e1ea3cb1 /m4 | |
| parent | 591622d7efbc828f00f190d91b6608148b967ff5 (diff) | |
| download | systemd-c18514440d7edce2ca7ae14cc2c88cfbac436e67.tar.gz | |
build-sys: fix AC_COMPILE_IFELSE tests
This removes some warnings when bootstrapping. The warnings were introduced
in autoconf 2.68. Reference:
http://www.flameeyes.eu/autotools-mythbuster/forwardporting/autoconf.html
The following code
AC_COMPILE_IFELSE([
<MY C CODE HERE>
], ...)
is changed to
AC_COMPILE_IFELSE(
[AC_COMPILE_IFELSE([AC_LANG_SOURCE([
<MY C CODE HERE>
])], ...)
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/acx_libwrap.m4 | 4 | ||||
| -rw-r--r-- | m4/attributes.m4 | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/m4/acx_libwrap.m4 b/m4/acx_libwrap.m4 index e1602144b5..ccf8afc0aa 100644 --- a/m4/acx_libwrap.m4 +++ b/m4/acx_libwrap.m4 @@ -4,13 +4,13 @@ saved_LIBS="$LIBS" LIBS="$LIBS -lwrap" AC_MSG_CHECKING([for tcpwrap library and headers]) AC_LINK_IFELSE( -AC_LANG_PROGRAM( +[AC_LANG_PROGRAM( [#include <tcpd.h> #include <syslog.h> int allow_severity = LOG_INFO; int deny_severity = LOG_WARNING;], [struct request_info *req; -return hosts_access (req);]), +return hosts_access (req);])], [AC_DEFINE(HAVE_LIBWRAP, [], [Have tcpwrap?]) LIBWRAP_LIBS="-lwrap" AC_MSG_RESULT(yes)], diff --git a/m4/attributes.m4 b/m4/attributes.m4 index 3bf96a304b..9d561c244b 100644 --- a/m4/attributes.m4 +++ b/m4/attributes.m4 @@ -39,7 +39,7 @@ AC_DEFUN([CC_CHECK_CFLAGS_SILENT], [ AC_CACHE_VAL(AS_TR_SH([cc_cv_cflags_$1]), [ac_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $1" - AC_COMPILE_IFELSE([int a;], + AC_COMPILE_IFELSE([AC_LANG_SOURCE([int a;])], [eval "AS_TR_SH([cc_cv_cflags_$1])='yes'"], [eval "AS_TR_SH([cc_cv_cflags_$1])='no'"]) CFLAGS="$ac_save_CFLAGS" @@ -147,7 +147,7 @@ AC_DEFUN([CC_CHECK_ATTRIBUTE], [ AS_TR_SH([cc_cv_attribute_$1]), [ac_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $cc_cv_werror" - AC_COMPILE_IFELSE([$3], + AC_COMPILE_IFELSE([AC_LANG_SOURCE([$3])], [eval "AS_TR_SH([cc_cv_attribute_$1])='yes'"], [eval "AS_TR_SH([cc_cv_attribute_$1])='no'"]) CFLAGS="$ac_save_CFLAGS" @@ -271,11 +271,11 @@ AC_DEFUN([CC_FUNC_EXPECT], [ [cc_cv_func_expect], [ac_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $cc_cv_werror" - AC_COMPILE_IFELSE( + AC_COMPILE_IFELSE([AC_LANG_SOURCE( [int some_function() { int a = 3; return (int)__builtin_expect(a, 3); - }], + }])], [cc_cv_func_expect=yes], [cc_cv_func_expect=no]) CFLAGS="$ac_save_CFLAGS" @@ -295,11 +295,11 @@ AC_DEFUN([CC_ATTRIBUTE_ALIGNED], [ [ac_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $cc_cv_werror" for cc_attribute_align_try in 64 32 16 8 4 2; do - AC_COMPILE_IFELSE([ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ int main() { static char c __attribute__ ((aligned($cc_attribute_align_try))) = 0; return c; - }], [cc_cv_attribute_aligned=$cc_attribute_align_try; break]) + }])], [cc_cv_attribute_aligned=$cc_attribute_align_try; break]) done CFLAGS="$ac_save_CFLAGS" ]) |