From: Patrick McCarty <pnorcks@gmail.com>
Date: Thu, 6 May 2010 23:50:00 +0000 (-0700)
Subject: Build: Set C++ as the default language for tests.
X-Git-Tag: release/2.13.21-1~13
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=8edae5461deb871618c490aa0df9a271ff046df2;p=lilypond.git

Build: Set C++ as the default language for tests.

We already check for C/C++ compilers, but the feature tests
should use g++, not gcc.
---

diff --git a/configure.in b/configure.in
index 5177b33a67..cf7ac0535e 100644
--- a/configure.in
+++ b/configure.in
@@ -83,7 +83,7 @@ else
 fi
 AC_MSG_RESULT($NCSB_SOURCE_FILES)
 
-
+AC_LANG([C++])
 
 STEPMAKE_PYTHON(REQUIRED, 2.4)
 STEPMAKE_GCC(REQUIRED, 3.4)
@@ -100,7 +100,6 @@ STEPMAKE_BISON(OPTIONAL, 1.29)
 STEPMAKE_FLEX(REQUIRED)
 STEPMAKE_FLEXLEXER(REQUIRED)
 STEPMAKE_FLEXLEXER_LOCATION
-AC_LANG([C])
 STEPMAKE_LOCALE
 STEPMAKE_GETTEXT
 STEPMAKE_MSGFMT(REQUIRED)
@@ -138,9 +137,7 @@ STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20050624)
 STEPMAKE_PATH_PROG(T1ASM, t1asm, REQUIRED)
 
 AC_CHECK_HEADERS([assert.h grp.h libio.h pwd.h sys/stat.h wchar.h fpu_control.h])
-AC_LANG_PUSH(C++)
 AC_CHECK_HEADERS([sstream])
-AC_LANG_POP(C++)
 AC_HEADER_STAT
 AC_FUNC_MEMCMP
 AC_FUNC_VPRINTF
diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 2a6e2233c6..01dc81e4b5 100644
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -258,7 +258,6 @@ AC_DEFUN(STEPMAKE_COMPILE, [
 ])
 
 AC_DEFUN(STEPMAKE_CXX, [
-    AC_LANG([C++])
     AC_PROG_CXX
     STEPMAKE_OPTIONAL_REQUIRED(CXX, c++, $1)
 
@@ -452,7 +451,6 @@ AC_DEFUN(STEPMAKE_FLEXLEXER, [
     fi
     # check for yyFlexLexer.yy_current_buffer,
     # in 2.5.4 <= flex < 2.5.29
-    AC_LANG_PUSH(C++)
     AC_CACHE_CHECK([for yyFlexLexer.yy_current_buffer],
 	[stepmake_cv_flexlexer_yy_current_buffer],
 	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
@@ -472,7 +470,6 @@ class yy_flex_lexer: public yyFlexLexer
     if test $stepmake_cv_flexlexer_yy_current_buffer = yes; then
 	AC_DEFINE(HAVE_FLEXLEXER_YY_CURRENT_BUFFER, 1, [Define to 1 if yyFlexLexer has yy_current_buffer.])
     fi
-    AC_LANG_POP(C++)
 ])
   
 
@@ -1016,7 +1013,6 @@ AC_DEFUN(STEPMAKE_PYTHON_DEVEL, [
 
 
 AC_DEFUN(STEPMAKE_STL_DATA_METHOD, [
-    AC_LANG_PUSH(C++)
     AC_CACHE_CHECK([for stl.data () method],
 	[stepmake_cv_stl_data_method],
 	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
@@ -1030,7 +1026,6 @@ void *p = v.data ();
     if test $stepmake_cv_stl_data_method = yes; then
 	AC_DEFINE(HAVE_STL_DATA_METHOD, 1, [define if stl classes have data () method])
     fi
-    AC_LANG_POP(C++)
 ])