From b2bc6e4ad6a15fd93bc256f26bcb2a05c052fb25 Mon Sep 17 00:00:00 2001
From: Eric Christopher <echristo@apple.com>
Date: Mon, 26 Mar 2012 02:09:01 +0000
Subject: Add some fixes to the configure script  for isInf and add
 --enable-libcpp to projects/sample.

Patch by Dmitri Shubin with additional fixes by me.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@153425 91177308-0d34-0410-b5e6-96231b3b80d8
---
 autoconf/m4/func_isinf.m4 | 2 +-
 autoconf/m4/huge_val.m4   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'autoconf')

diff --git a/autoconf/m4/func_isinf.m4 b/autoconf/m4/func_isinf.m4
index c936bf920d..5c000f8fad 100644
--- a/autoconf/m4/func_isinf.m4
+++ b/autoconf/m4/func_isinf.m4
@@ -19,7 +19,7 @@ fi
 
 AC_SINGLE_CXX_CHECK([ac_cv_func_std_isinf_in_cmath],
                     [std::isinf], [<cmath>],
-                    [float f; std::isinf(f)}])
+                    [float f; std::isinf(f);])
 if test "$ac_cv_func_std_isinf_in_cmath" = "yes" ; then 
   AC_DEFINE([HAVE_STD_ISINF_IN_CMATH],1,[Set to 1 if the std::isinf function is found in <cmath>])
 fi
diff --git a/autoconf/m4/huge_val.m4 b/autoconf/m4/huge_val.m4
index 5fffbfc8d3..7ef9dcae69 100644
--- a/autoconf/m4/huge_val.m4
+++ b/autoconf/m4/huge_val.m4
@@ -6,7 +6,7 @@ AC_DEFUN([AC_HUGE_VAL_CHECK],[
   AC_CACHE_CHECK([for HUGE_VAL sanity], [ac_cv_huge_val_sanity],[
     AC_LANG_PUSH([C++])
     ac_save_CXXFLAGS=$CXXFLAGS
-    CXXFLAGS=-pedantic
+    CXXFLAGS+=" -pedantic"
     AC_RUN_IFELSE(
       AC_LANG_PROGRAM(
         [#include <math.h>],
-- 
cgit v1.2.3