From e33064051410caba2fb488541eaefed962fa1d3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sat, 19 Feb 2022 19:29:19 +0100
Subject: Teaching m4 about Haiku

included 32bit fixes

diff --git a/ext/bz2/config.m4 b/ext/bz2/config.m4
index 89efb26..7fe9847 100644
--- a/ext/bz2/config.m4
+++ b/ext/bz2/config.m4
@@ -10,6 +10,18 @@ if test "$PHP_BZ2" != "no"; then
     done
   ])
 
+  AS_IF([test -r $PHP_BZ2/develop/headers/bzlib.h], [BZIP_DIR=$PHP_BZ2], [
+    for i in /boot/system /system; do
+      AS_IF([test -r $i/develop/headers/bzlib.h], [BZIP_DIR=$i; break;])
+    done
+  ])
+
+  AS_IF([test -r $PHP_BZ2/develop/headers/$(getarch)/bzlib.h], [BZIP_DIR=$PHP_BZ2], [
+    for i in /boot/system /system; do
+      AS_IF([test -r $i/develop/headers/$(getarch)/bzlib.h], [BZIP_DIR=$i; break;])
+    done
+  ])
+
   AC_MSG_CHECKING([for BZip2])
   AS_VAR_IF([BZIP_DIR],, [
     AC_MSG_RESULT([bzlib.h not found])
diff --git a/ext/gettext/config.m4 b/ext/gettext/config.m4
index 6235658..82c418a 100644
--- a/ext/gettext/config.m4
+++ b/ext/gettext/config.m4
@@ -8,6 +8,14 @@ if test "$PHP_GETTEXT" != "no"; then
     AS_IF([test -r $i/include/libintl.h], [GETTEXT_DIR=$i; break;])
   done
 
+  for i in $PHP_GETTEXT /boot/system /system; do
+    AS_IF([test -r $i/develop/headers/libintl.h], [GETTEXT_DIR=$i; break;])
+  done
+
+  for i in $PHP_GETTEXT /boot/system /system; do
+    AS_IF([test -r $i/develop/headers/$(getarch)/libintl.h], [GETTEXT_DIR=$i; break;])
+  done
+
   AS_VAR_IF([GETTEXT_DIR],,
     [AC_MSG_ERROR([Cannot locate header file libintl.h])])
 
-- 
2.52.0