From 61a2a24e913e5e18fa57fe82d29e73bdda78211f Mon Sep 17 00:00:00 2001
From: Igor Todorovski <itodorov@ca.ibm.com>
Date: Thu, 20 Apr 2023 13:16:44 -0400
Subject: [PATCH 1/2] Use a common cflags for m4

---
 buildenv | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildenv b/buildenv
index 304a1f5..7c6425f 100644
--- a/buildenv
+++ b/buildenv
@@ -17,13 +17,13 @@ export ZOPEN_EXTRA_LDFLAGS=""
 rm patches
 if [ "${ZOPEN_TYPE}x" = "TARBALLx" ]; then
 	export ZOPEN_BOOTSTRAP=skip
-	export ZOPEN_EXTRA_CFLAGS="-qnose -std=c11 -I\${ZOPEN_ROOT}/${ZOPEN_TARBALL_DIR}/lib,\${ZOPEN_ROOT}/patches/PR1/include,/usr/include/le"
 	ln -s tarball-patches patches
 else
-	export ZOPEN_EXTRA_CFLAGS="-std=c11 -fgnu89-inline -I\${ZOPEN_ROOT}/${ZOPEN_GIT_DIR}/lib -I\${ZOPEN_ROOT}/patches/PR1/include"
 	ln -s git-patches patches
 fi
 
+export ZOPEN_EXTRA_CFLAGS="-std=c11 -fgnu89-inline -I\${ZOPEN_ROOT}/${ZOPEN_GIT_DIR}/lib -I\${ZOPEN_ROOT}/patches/PR1/include"
+
 zopen_append_to_env()
 {
 cat <<ZZ

From 10a8657a86529f1339cd28b713b2c2e752efdeb4 Mon Sep 17 00:00:00 2001
From: Igor Todorovski <itodorov@ca.ibm.com>
Date: Mon, 24 Apr 2023 13:19:21 -0400
Subject: [PATCH 2/2] Change back to TARBALL to get successfull builds

---
 buildenv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildenv b/buildenv
index 7c6425f..21b93b7 100644
--- a/buildenv
+++ b/buildenv
@@ -1,7 +1,7 @@
 #
 # Set up environment variables for general build tool to operate
 #
-export ZOPEN_TYPE="GIT"
+export ZOPEN_TYPE="TARBALL"
 
 ZOPEN_TARBALL_DIR=m4-1.4.19
 export ZOPEN_TARBALL_URL="https://ftp.gnu.org/gnu/m4/${ZOPEN_TARBALL_DIR}.tar.gz"