From 9ad10af803d1ef398e325ab600abd26afd2df845 Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Fri, 24 Sep 2010 04:43:32 +0000
Subject: [PATCH] m4 is still not cooperating...  more work is needed to get
 this one to work correctly.  it's failing to find Makefile.in near the end of
 configure, but it is there.  And when you try to remove the work directory it
 won't go willingly.  Need to check the 1.4.12 patch and see if anything else
 from it is still needed.

---
 sys-devel/m4/m4-1.4.15.bep           | 13 +++++++++----
 sys-devel/m4/patches/m4-1.4.15.patch | 29 +++++++++++++++++++++-------
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/sys-devel/m4/m4-1.4.15.bep b/sys-devel/m4/m4-1.4.15.bep
index b0db3210d..219f45abc 100644
--- a/sys-devel/m4/m4-1.4.15.bep
+++ b/sys-devel/m4/m4-1.4.15.bep
@@ -7,12 +7,17 @@ STATUS_HAIKU="stable"
 DEPEND=""
 BUILD {
 	cd m4-1.4.15
+	echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.ac
+	echo >> configure.ac
+	echo "LT_INIT" >> configure.ac
+	rm aclocal.m4
 	libtoolize --force --copy --install
 	aclocal -I m4
-	autoconf
-	automake
-	autoheader
-	./configure --prefix=/boot/common --enable-changeword
+	autoreconf
+#	autoconf
+#	autoheader
+#	automake
+	./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-changeword
 	make
 }
 INSTALL {
diff --git a/sys-devel/m4/patches/m4-1.4.15.patch b/sys-devel/m4/patches/m4-1.4.15.patch
index 5105676ab..dc0cf9c76 100644
--- a/sys-devel/m4/patches/m4-1.4.15.patch
+++ b/sys-devel/m4/patches/m4-1.4.15.patch
@@ -1,15 +1,30 @@
 diff -urN m4-1.4.15/lib/pipe2.c m4-1.4.15-haiku/lib/pipe2.c
---- m4-1.4.15/lib/pipe2.c	2010-01-28 13:04:07.051118080 +0000
-+++ m4-1.4.15-haiku/lib/pipe2.c	2010-02-27 20:00:33.547094528 +0000
-@@ -78,7 +78,11 @@
+--- m4-1.4.15/lib/pipe2.c	2010-03-08 21:47:53.064225280 +0000
++++ m4-1.4.15-haiku/lib/pipe2.c	2010-09-24 04:13:33.514064384 +0000
+@@ -78,8 +78,11 @@
  /* Unix API.  */
  
    /* Check the supported flags.  */
+-  if ((flags & ~(O_CLOEXEC | O_NONBLOCK | O_TEXT | O_BINARY)) != 0)
+-    {
 +#if (defined __BEOS__ || defined __HAIKU__)
-+  if ((flags & ~(O_CLOEXEC | O_NONBLOCK)) != 0)
++   if ((flags & ~(O_CLOEXEC | O_NONBLOCK)) != 0)
 +#else
-   if ((flags & ~(O_CLOEXEC | O_NONBLOCK | O_TEXT | O_BINARY)) != 0)
-+#endif
-     {
++   if ((flags & ~(O_CLOEXEC | O_NONBLOCK | O_TEXT | O_BINARY)) != 0)
++#endif    {
        errno = EINVAL;
        return -1;
+     }
+diff -urN m4-1.4.15/src/m4.c m4-1.4.15-haiku/src/m4.c
+--- m4-1.4.15/src/m4.c	2010-06-04 17:33:48.024379392 +0000
++++ m4-1.4.15-haiku/src/m4.c	2010-09-24 04:18:51.275513344 +0000
+@@ -408,7 +408,8 @@
+   sigaction (SIGABRT, &act, NULL);
+   sigaction (SIGILL, &act, NULL);
+   sigaction (SIGFPE, &act, NULL);
+-  sigaction (SIGBUS, &act, NULL);
++  if (SIGBUS != SIGSEGV)
++    sigaction (SIGBUS, &act, NULL);
+   if (c_stack_action (fault_handler) == 0)
+     nesting_limit = 0;
+