From f5ddf4b416dfd67f317bf1d78214bbc0ce4b9646 Mon Sep 17 00:00:00 2001
From: gustavo-padilla <gustavo.padilla@ibm.com>
Date: Fri, 15 Aug 2025 10:47:15 -0500
Subject: [PATCH 1/4] working on configure.ac

---
 configure.ac | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index f28d2b28..6c003058 100644
--- a/configure.ac
+++ b/configure.ac
@@ -334,15 +334,31 @@ then
 
 fi
 
+dnl
+dnl Check Linux Distro and save it
+AC_MSG_CHECKING([for Linux distribution])
+linux_distro=`(grep '^ID=' /etc/os-release | cut -d= -f2 | tr -d '"') 2>/dev/null`
+AC_MSG_RESULT([$linux_distro])
+
 dnl
 dnl Check for ICU
 dnl
-ICU_MODULE_CFLAGS="`icu-config --cppflags 2> /dev/null`";
-ICU_MODULE_LIBS="`icu-config --ldflags 2> /dev/null`";
-if test -z "$ICU_MODULE_LIBS"
-then
-    PKG_CHECK_MODULES([ICU_MODULE], [icu >= 0.21])
-fi
+ICU_MODULE_CFLAGS=""
+ICU_MODULE_LIBS=""
+AS_IF([test "$linux_distro" = "ubuntu"],
+[
+  AC_MSG_NOTICE([Detected Ubuntu - using pkg-config for ICU])
+  ICU_MODULE_CFLAGS="`pkg-config --cflags icu-uc icu-i18n`"
+  ICU_MODULE_LIBS="`pkg-config --libs icu-uc icu-i18n`"
+],
+[
+  AC_MSG_NOTICE([Detected non-Ubuntu - using icu-config for ICU])
+  ICU_MODULE_CFLAGS="`icu-config --cppflags 2>/dev/null`"
+  ICU_MODULE_LIBS="`icu-config --ldflags 2>/dev/null`"
+
+  AS_IF([test -z "$ICU_MODULE_LIBS"],
+    [AC_MSG_ERROR([icu-config failed to return valid flags. Please install ICU or set ICU_MODULE_LIBS manually.])])
+])
 
 AC_MSG_CHECKING([use latest ICU])
 AC_ARG_ENABLE([icu_6x],

From c4be727b75d742bba51ff4057d915d9e744ca9f5 Mon Sep 17 00:00:00 2001
From: "Gustavo P." <47061318+Piloalucard@users.noreply.github.com>
Date: Wed, 1 Jul 2026 17:27:05 -0600
Subject: [PATCH 2/4] fix: ICU detection method

---
 configure.ac | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/configure.ac b/configure.ac
index 65adcd6f..40228912 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 ;;  OO_Copyright_BEGIN
 ;;
 ;;
-;;  Copyright 2010, 2021 IBM Corp. All rights reserved.
+;;  Copyright 2010, 2026 IBM Corp. All rights reserved.
 ;;
 ;;  Redistribution and use in source and binary forms, with or without
 ;;   modification, are permitted provided that the following conditions
@@ -346,22 +346,12 @@ AC_MSG_RESULT([$linux_distro])
 dnl
 dnl Check for ICU
 dnl
-ICU_MODULE_CFLAGS=""
-ICU_MODULE_LIBS=""
-AS_IF([test "$linux_distro" = "ubuntu"],
-[
-  AC_MSG_NOTICE([Detected Ubuntu - using pkg-config for ICU])
-  ICU_MODULE_CFLAGS="`pkg-config --cflags icu-uc icu-i18n`"
-  ICU_MODULE_LIBS="`pkg-config --libs icu-uc icu-i18n`"
-],
-[
-  AC_MSG_NOTICE([Detected non-Ubuntu - using icu-config for ICU])
-  ICU_MODULE_CFLAGS="`icu-config --cppflags 2>/dev/null`"
-  ICU_MODULE_LIBS="`icu-config --ldflags 2>/dev/null`"
-
-  AS_IF([test -z "$ICU_MODULE_LIBS"],
-    [AC_MSG_ERROR([icu-config failed to return valid flags. Please install ICU or set ICU_MODULE_LIBS manually.])])
-])
+ICU_MODULE_CFLAGS="`icu-config --cppflags 2> /dev/null`";
+ICU_MODULE_LIBS="`icu-config --ldflags 2> /dev/null`";
+if test -z "$ICU_MODULE_LIBS"
+then
+    PKG_CHECK_MODULES([ICU_MODULE], [icu-uc >= 0.21])
+fi
 
 AC_MSG_CHECKING([use latest ICU])
 AC_ARG_ENABLE([icu_6x],

From 1a0293f3e10b55f63435731e69cf0b7de2f28db6 Mon Sep 17 00:00:00 2001
From: "Gustavo P." <47061318+Piloalucard@users.noreply.github.com>
Date: Wed, 1 Jul 2026 17:28:47 -0600
Subject: [PATCH 3/4] Remove Linux distribution check

---
 configure.ac | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 40228912..7155f292 100644
--- a/configure.ac
+++ b/configure.ac
@@ -337,11 +337,6 @@ then
 
 fi
 
-dnl
-dnl Check Linux Distro and save it
-AC_MSG_CHECKING([for Linux distribution])
-linux_distro=`(grep '^ID=' /etc/os-release | cut -d= -f2 | tr -d '"') 2>/dev/null`
-AC_MSG_RESULT([$linux_distro])
 
 dnl
 dnl Check for ICU

From 9052d68b645a3267f4ce5a5ef4723b5735ae2592 Mon Sep 17 00:00:00 2001
From: "Gustavo P." <47061318+Piloalucard@users.noreply.github.com>
Date: Wed, 1 Jul 2026 17:29:45 -0600
Subject: [PATCH 4/4] Remove unnecessary newline in configure.ac

---
 configure.ac | 1 -
 1 file changed, 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 7155f292..071fdb78 100644
--- a/configure.ac
+++ b/configure.ac
@@ -337,7 +337,6 @@ then
 
 fi
 
-
 dnl
 dnl Check for ICU
 dnl