[vte] build: m4: Respect language

[Christian Persch <chpe src gnome org>]

commit bad099d7bf3922fb7ea7e537f96167d0a052d332
Author: Christian Persch <chpe gnome org>
Date:   Tue Mar 31 19:56:29 2015 +0200

    build: m4: Respect language
    
    Make it possible to use the CC_* macros with C and C++ in the same
    configure script, by renaming the cache variables appropriately.

 acinclude.m4 |   72 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 36 insertions(+), 36 deletions(-)
---
diff --git a/acinclude.m4 b/acinclude.m4
index 6f019f1..e345ee1 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -39,16 +39,16 @@ dnl -W* as gcc cannot test for negated warnings.
 dnl CC_CHECK_FLAG_APPEND([WHERE-TO-APPEND], [ENV-VAR], [FLAG])
 
 AC_DEFUN([CC_CHECK_FLAG_APPEND], [
-  AC_CACHE_CHECK([if $CC supports flag $3 in envvar $2],
-                 AS_TR_SH([cc_cv_$2_$3]),
+  AC_CACHE_CHECK([if $_AC_CC supports flag $3 in envvar $2],
+                 AS_TR_SH([cc_cv_[]_AC_LANG_ABBREV[]_$2_$3]),
           [eval "AS_TR_SH([cc_save_$2])='${$2}'"
            eval "AS_TR_SH([$2])='-Werror `echo "$3" | sed 's/^-Wno-/-W/'`'"
            AC_LINK_IFELSE([AC_LANG_SOURCE([int main(void) { return 0; } ])],
-                          [eval "AS_TR_SH([cc_cv_$2_$3])='yes'"],
-                          [eval "AS_TR_SH([cc_cv_$2_$3])='no'"])
+                          [eval "AS_TR_SH([cc_cv_[]_AC_LANG_ABBREV[]_$2_$3])='yes'"],
+                          [eval "AS_TR_SH([cc_cv_[]_AC_LANG_ABBREV[]_$2_$3])='no'"])
            eval "AS_TR_SH([$2])='$cc_save_$2'"])
 
-  AS_IF([eval test x$]AS_TR_SH([cc_cv_$2_$3])[ = xyes],
+  AS_IF([eval test x$]AS_TR_SH([cc_cv_[]_AC_LANG_ABBREV[]_$2_$3])[ = xyes],
         [eval "$1='${$1} $3'"])
 ])
 
@@ -63,17 +63,17 @@ dnl Check if the flag is supported by linker (cacheable)
 dnl CC_CHECK_LDFLAGS([FLAG], [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
 
 AC_DEFUN([CC_CHECK_LDFLAGS], [
-  AC_CACHE_CHECK([if $CC supports $1 flag],
-    AS_TR_SH([cc_cv_ldflags_$1]),
+  AC_CACHE_CHECK([if $_AC_CC supports $1 flag],
+    AS_TR_SH([cc_cv_[]_AC_LANG_ABBREV[]_ldflags_$1]),
     [ac_save_LDFLAGS="$LDFLAGS"
      LDFLAGS="$LDFLAGS $1"
      AC_LINK_IFELSE([AC_LANG_SOURCE([int main() { return 1; }])],
-       [eval "AS_TR_SH([cc_cv_ldflags_$1])='yes'"],
-       [eval "AS_TR_SH([cc_cv_ldflags_$1])="])
+       [eval "AS_TR_SH([cc_cv_[]_AC_LANG_ABBREV[]_ldflags_$1])='yes'"],
+       [eval "AS_TR_SH([cc_cv_[]_AC_LANG_ABBREV[]_ldflags_$1])="])
      LDFLAGS="$ac_save_LDFLAGS"
     ])
 
-  AS_IF([eval test x$]AS_TR_SH([cc_cv_ldflags_$1])[ = xyes],
+  AS_IF([eval test x$]AS_TR_SH([cc_cv_[]_AC_LANG_ABBREV[]_ldflags_$1])[ = xyes],
     [$2], [$3])
 ])
 
@@ -112,26 +112,26 @@ dnl an equivalent flag:
 dnl  - Sun Studio compiler supports -errwarn=%all
 AC_DEFUN([CC_CHECK_WERROR], [
   AC_CACHE_CHECK(
-    [for $CC way to treat warnings as errors],
-    [cc_cv_werror],
-    [CC_CHECK_CFLAGS_SILENT([-Werror], [cc_cv_werror=-Werror],
-      [CC_CHECK_CFLAGS_SILENT([-errwarn=%all], [cc_cv_werror=-errwarn=%all])])
+    [for $_AC_CC way to treat warnings as errors],
+    [cc_cv_[]_AC_LANG_ABBREV[]_werror],
+    [CC_CHECK_CFLAGS_SILENT([-Werror], [cc_cv_[]_AC_LANG_ABBREV[]_werror=-Werror],
+      [CC_CHECK_CFLAGS_SILENT([-errwarn=%all], [cc_cv_[]_AC_LANG_ABBREV[]_werror=-errwarn=%all])])
     ])
 ])
 
 AC_DEFUN([CC_CHECK_ATTRIBUTE], [
   AC_REQUIRE([CC_CHECK_WERROR])
-  AC_CACHE_CHECK([if $CC supports __attribute__(( ifelse([$2], , [$1], [$2]) ))],
-    AS_TR_SH([cc_cv_attribute_$1]),
+  AC_CACHE_CHECK([if $_AC_CC supports __attribute__(( ifelse([$2], , [$1], [$2]) ))],
+    AS_TR_SH([cc_cv_[]_AC_LANG_ABBREV[]_attribute_$1]),
     [ac_save_CFLAGS="$CFLAGS"
-     CFLAGS="$CFLAGS $cc_cv_werror"
+     CFLAGS="$CFLAGS $cc_cv_[]_AC_LANG_ABBREV[]_werror"
      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'"])
+       [eval "AS_TR_SH([cc_cv_[]_AC_LANG_ABBREV[]_attribute_$1])='yes'"],
+       [eval "AS_TR_SH([cc_cv_[]_AC_LANG_ABBREV[]_attribute_$1])='no'"])
      CFLAGS="$ac_save_CFLAGS"
     ])
 
-  AS_IF([eval test x$]AS_TR_SH([cc_cv_attribute_$1])[ = xyes],
+  AS_IF([eval test x$]AS_TR_SH([cc_cv_[]_AC_LANG_ABBREV[]_attribute_$1])[ = xyes],
     [AC_DEFINE(
        AS_TR_CPP([SUPPORT_ATTRIBUTE_$1]), 1,
          [Define this if the compiler supports __attribute__(( ifelse([$2], , [$1], [$2]) ))]
@@ -227,16 +227,16 @@ AC_DEFUN([CC_ATTRIBUTE_CONST], [
 
 AC_DEFUN([CC_FLAG_VISIBILITY], [
   AC_REQUIRE([CC_CHECK_WERROR])
-  AC_CACHE_CHECK([if $CC supports -fvisibility=hidden],
-    [cc_cv_flag_visibility],
+  AC_CACHE_CHECK([if $_AC_CC supports -fvisibility=hidden],
+    [cc_cv_[]_AC_LANG_ABBREV[]_flag_visibility],
     [cc_flag_visibility_save_CFLAGS="$CFLAGS"
-     CFLAGS="$CFLAGS $cc_cv_werror"
+     CFLAGS="$CFLAGS $cc_cv_[]_AC_LANG_ABBREV[]_werror"
      CC_CHECK_CFLAGS_SILENT([-fvisibility=hidden],
-     cc_cv_flag_visibility='yes',
-     cc_cv_flag_visibility='no')
+     cc_cv_[]_AC_LANG_ABBREV[]_flag_visibility='yes',
+     cc_cv_[]_AC_LANG_ABBREV[]_flag_visibility='no')
      CFLAGS="$cc_flag_visibility_save_CFLAGS"])
 
-  AS_IF([test "x$cc_cv_flag_visibility" = "xyes"],
+  AS_IF([test "x$cc_cv_[]_AC_LANG_ABBREV[]_flag_visibility" = "xyes"],
     [AC_DEFINE([SUPPORT_FLAG_VISIBILITY], 1,
        [Define this if the compiler supports the -fvisibility flag])
      $1],
@@ -246,20 +246,20 @@ AC_DEFUN([CC_FLAG_VISIBILITY], [
 AC_DEFUN([CC_FUNC_EXPECT], [
   AC_REQUIRE([CC_CHECK_WERROR])
   AC_CACHE_CHECK([if compiler has __builtin_expect function],
-    [cc_cv_func_expect],
+    [cc_cv_[]_AC_LANG_ABBREV[]_func_expect],
     [ac_save_CFLAGS="$CFLAGS"
-     CFLAGS="$CFLAGS $cc_cv_werror"
+     CFLAGS="$CFLAGS $cc_cv_[]_AC_LANG_ABBREV[]_werror"
      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])
+       [cc_cv_[]_AC_LANG_ABBREV[]_func_expect=yes],
+       [cc_cv_[]_AC_LANG_ABBREV[]_func_expect=no])
      CFLAGS="$ac_save_CFLAGS"
     ])
 
-  AS_IF([test "x$cc_cv_func_expect" = "xyes"],
+  AS_IF([test "x$cc_cv_[]_AC_LANG_ABBREV[]_func_expect" = "xyes"],
     [AC_DEFINE([SUPPORT__BUILTIN_EXPECT], 1,
      [Define this if the compiler supports __builtin_expect() function])
      $1],
@@ -269,21 +269,21 @@ AC_DEFUN([CC_FUNC_EXPECT], [
 AC_DEFUN([CC_ATTRIBUTE_ALIGNED], [
   AC_REQUIRE([CC_CHECK_WERROR])
   AC_CACHE_CHECK([highest __attribute__ ((aligned ())) supported],
-    [cc_cv_attribute_aligned],
+    [cc_cv_[]_AC_LANG_ABBREV[]_attribute_aligned],
     [ac_save_CFLAGS="$CFLAGS"
-     CFLAGS="$CFLAGS $cc_cv_werror"
+     CFLAGS="$CFLAGS $cc_cv_[]_AC_LANG_ABBREV[]_werror"
      for cc_attribute_align_try in 64 32 16 8 4 2; do
         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_[]_AC_LANG_ABBREV[]_attribute_aligned=$cc_attribute_align_try; break])
      done
      CFLAGS="$ac_save_CFLAGS"
   ])
 
-  if test "x$cc_cv_attribute_aligned" != "x"; then
-     AC_DEFINE_UNQUOTED([ATTRIBUTE_ALIGNED_MAX], [$cc_cv_attribute_aligned],
+  if test "x$cc_cv_[]_AC_LANG_ABBREV[]_attribute_aligned" != "x"; then
+     AC_DEFINE_UNQUOTED([ATTRIBUTE_ALIGNED_MAX], [$cc_cv_[]_AC_LANG_ABBREV[]_attribute_aligned],
        [Define the highest alignment supported])
   fi
 ])