From ac1eba1d2cd22e62b24b963028f2cd623b1ab1da Mon Sep 17 00:00:00 2001
From: Sam Varshavchik
Date: Sun, 22 May 2022 13:35:13 -0400
Subject: gcc 12 and autotools updates.

---
 unicode/m4/courier-unicode.m4 | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'unicode/m4/courier-unicode.m4')

diff --git a/unicode/m4/courier-unicode.m4 b/unicode/m4/courier-unicode.m4
index 673bc65..9619b45 100644
--- a/unicode/m4/courier-unicode.m4
+++ b/unicode/m4/courier-unicode.m4
@@ -4,16 +4,19 @@ dnl use the courier-unicode package.
 
 AC_DEFUN([AX_COURIER_UNICODE_CXXFLAGS],[
 
+AC_REQUIRE([AC_PROG_CXX])
+
 save_FLAGS="$CXXFLAGS"
 
 AC_LANG_PUSH([C++])
 
-AC_TRY_COMPILE([
+
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <string>
-], [
+]], [[
      std::u32string s;
      char32_t c;
-     ],
+     ]])],
      [
      ],
      [
@@ -21,12 +24,12 @@ AC_TRY_COMPILE([
 COURIER_UNICODE_CXXFLAGS="-std=c++11"
 CXXFLAGS="$save_CFLAGS $COURIER_UNICODE_CXXFLAGS"
 
-AC_TRY_COMPILE([
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <string>
-], [
+]], [[
      std::u32string s;
      char32_t c;
-     ],
+     ]])],
      [
      ],
      [
@@ -34,12 +37,12 @@ AC_TRY_COMPILE([
 COURIER_UNICODE_CXXFLAGS="-std=c++0x"
 CXXFLAGS="$save_CFLAGS $COURIER_UNICODE_CXXFLAGS"
 
-AC_TRY_COMPILE([
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <string>
-], [
+]], [[
      std::u32string s;
      char32_t c;
-     ],
+     ]])],
      [
      ],
      [
@@ -48,5 +51,6 @@ AC_MSG_ERROR([*** A compiler with C++11 Unicode support was not found])
 ])
 ])
 CXXFLAGS="$save_FLAGS"
+
 AC_LANG_POP([C++])
 ])
-- 
cgit v1.2.3