diff options
author | NAKAMURA Takumi <geek4civic@gmail.com> | 2013-01-30 01:37:55 +0000 |
---|---|---|
committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2013-01-30 01:37:55 +0000 |
commit | a4afeef1863d2dd5e9deb7fa4baeeecf229d5f7c (patch) | |
tree | 497fcf235e1328c2db843505ed3a133a5bff69e6 /autoconf/m4 | |
parent | fd6fbec86dec667372d37b096fd4f96010ff1659 (diff) | |
download | llvm-a4afeef1863d2dd5e9deb7fa4baeeecf229d5f7c.tar.gz llvm-a4afeef1863d2dd5e9deb7fa4baeeecf229d5f7c.tar.bz2 llvm-a4afeef1863d2dd5e9deb7fa4baeeecf229d5f7c.tar.xz |
[autoconf] Fix m4 quoting for newer autotools
This simply fixes up quoting of macro invocations to appease newer versions of autotools.
http://llvm-reviews.chandlerc.com/D332
Signed-off-by: Saleem Abdulrasool <compnerd@compnerd.org>
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@173878 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'autoconf/m4')
-rw-r--r-- | autoconf/m4/huge_val.m4 | 10 | ||||
-rw-r--r-- | autoconf/m4/single_cxx_check.m4 | 20 |
2 files changed, 17 insertions, 13 deletions
diff --git a/autoconf/m4/huge_val.m4 b/autoconf/m4/huge_val.m4 index 6c9a22eab0..d224d7cb64 100644 --- a/autoconf/m4/huge_val.m4 +++ b/autoconf/m4/huge_val.m4 @@ -7,12 +7,10 @@ AC_DEFUN([AC_HUGE_VAL_CHECK],[ AC_LANG_PUSH([C++]) ac_save_CXXFLAGS=$CXXFLAGS CXXFLAGS="$CXXFLAGS -pedantic" - AC_RUN_IFELSE( - AC_LANG_PROGRAM( - [#include <math.h>], - [double x = HUGE_VAL; return x != x; ]), - [ac_cv_huge_val_sanity=yes],[ac_cv_huge_val_sanity=no], - [ac_cv_huge_val_sanity=yes]) + AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <math.h>]], + [[double x = HUGE_VAL; return x != x;]])], + [ac_cv_huge_val_sanity=yes],[ac_cv_huge_val_sanity=no], + [ac_cv_huge_val_sanity=yes]) CXXFLAGS=$ac_save_CXXFLAGS AC_LANG_POP([C++]) ]) diff --git a/autoconf/m4/single_cxx_check.m4 b/autoconf/m4/single_cxx_check.m4 index 21efa4bed3..cb47326418 100644 --- a/autoconf/m4/single_cxx_check.m4 +++ b/autoconf/m4/single_cxx_check.m4 @@ -1,10 +1,16 @@ +dnl dnl AC_SINGLE_CXX_CHECK(CACHEVAR, FUNCTION, HEADER, PROGRAM) -dnl $1, $2, $3, $4, -dnl +dnl $1, $2, $3, $4, + AC_DEFUN([AC_SINGLE_CXX_CHECK], - [AC_CACHE_CHECK([for $2 in $3], [$1], - [AC_LANG_PUSH([C++]) - AC_COMPILE_IFELSE(AC_LANG_PROGRAM([#include $3],[$4]),[$1=yes],[$1=no]) - AC_LANG_POP([C++])]) - ]) +[ + AC_CACHE_CHECK([for $2 in $3], [$1], + [ + AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]][$3], [$4])], + [$1][[=yes]], + [$1][[=no]]) + AC_LANG_POP([C++]) + ]) +]) |