SDL_ttf: Fix configuration errors related to OS_WIN32 condition.

From a01c7e96b09a4bd8a5421d0d1cd39c461f2ed9b5 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Sat, 3 Jul 2021 01:40:00 +0300
Subject: [PATCH] Fix configuration errors related to OS_WIN32 condition.

Fixes: https://github.com/libsdl-org/SDL_ttf/issues/137
---
 configure    | 22 +++++++++++-----------
 configure.ac |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/configure b/configure
index 3f57a8a..eb0be03 100755
--- a/configure
+++ b/configure
@@ -784,10 +784,10 @@ X_CFLAGS
 XMKMF
 USE_BUILTIN_HARFBUZZ_FALSE
 USE_BUILTIN_HARFBUZZ_TRUE
-HB_LIBS
-HB_CFLAGS
 OS_WIN32_FALSE
 OS_WIN32_TRUE
+HB_LIBS
+HB_CFLAGS
 HAVE_CXX11
 USE_BUILTIN_FREETYPE_FALSE
 USE_BUILTIN_FREETYPE_TRUE
@@ -18269,7 +18269,7 @@ _ACEOF
 
 
 		case "$host" in
-		  *-*-mingw*) is_win32=yes
+		  *-*-mingw*) hb_os_win32=yes
 			CXXFLAGS="$CXXFLAGS -static-libgcc"
 			CFLAGS="$CFLAGS -static-libgcc"
 		  ;;
@@ -18281,14 +18281,6 @@ _ACEOF
 		    fi
 		  ;;
 		esac
-		 if test "$hb_os_win32" = "yes"; then
-  OS_WIN32_TRUE=
-  OS_WIN32_FALSE='#'
-else
-  OS_WIN32_TRUE='#'
-  OS_WIN32_FALSE=
-fi
-
 				CXXFLAGS="$CXXFLAGS -Wno-unused-result"
 				CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions -fno-threadsafe-statics"
 	else
@@ -18381,6 +18373,14 @@ else
 	SUMMARY="${SUMMARY}Using HarfBuzz          : NO\n"
 	enable_harfbuzz_builtin=no
 fi
+ if test x$hb_os_win32 = xyes; then
+  OS_WIN32_TRUE=
+  OS_WIN32_FALSE='#'
+else
+  OS_WIN32_TRUE='#'
+  OS_WIN32_FALSE=
+fi
+
  if test x$enable_harfbuzz_builtin = xyes; then
   USE_BUILTIN_HARFBUZZ_TRUE=
   USE_BUILTIN_HARFBUZZ_FALSE='#'
diff --git a/configure.ac b/configure.ac
index 976b9e9..b3260bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -131,7 +131,7 @@ if test x$enable_harfbuzz = xyes; then
 		AX_CXX_COMPILE_STDCXX(11)
 		AC_CHECK_ALIGNOF([struct{char;}])
 		case "$host" in
-		  *-*-mingw*) is_win32=yes
+		  *-*-mingw*) hb_os_win32=yes
 			CXXFLAGS="$CXXFLAGS -static-libgcc"
 			CFLAGS="$CFLAGS -static-libgcc"
 		  ;;
@@ -143,7 +143,6 @@ if test x$enable_harfbuzz = xyes; then
 		    fi
 		  ;;
 		esac
-		AM_CONDITIONAL(OS_WIN32, test "$hb_os_win32" = "yes")
 		dnl silence a lot of harfbuzz warnings:
 		CXXFLAGS="$CXXFLAGS -Wno-unused-result"
 		dnl prevent linking to libstdc++:
@@ -167,6 +166,7 @@ else
 	SUMMARY="${SUMMARY}Using HarfBuzz          : NO\n"
 	enable_harfbuzz_builtin=no
 fi
+AM_CONDITIONAL(OS_WIN32, test x$hb_os_win32 = xyes)
 AM_CONDITIONAL(USE_BUILTIN_HARFBUZZ, test x$enable_harfbuzz_builtin = xyes)
 
 dnl See if GCC's -fvisibility=hidden is supported (gcc4 and later, usually).