From 5f4df1983388b1c28c47f73d8ff99fefbfb3aacb Mon Sep 17 00:00:00 2001
From: foobar <sniper@php.net>
Date: Sat, 29 Nov 2003 13:35:33 +0000
Subject: [PATCH] MFH: - fixed Bug #26462 (phpize + ext/bcmath -> compile
 error)

---
 NEWS                              | 1 +
 configure.in                      | 7 -------
 ext/bcmath/config.m4              | 2 +-
 ext/bcmath/libbcmath/src/bcmath.h | 5 ++---
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/NEWS b/NEWS
index e97f9a327e..b758599ac7 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ PHP 4                                                                      NEWS
 ?? ??? 2003, Version 4.3.5
 - Fixed header handler in NSAPI SAPI module (header->replace was ignored,
   send_default_content_type now sends value from php.ini). (Uwe Schindler)
+- Fixed bug #26462 (phpize + ext/bcmath -> compile error). (Jani)
 - Fixed bug #26458 (var_dump(), var_export(), debug_zval_dump() not binary
   safe for array keys). (Ilia)
 - Fixed bug #26447 (--with-openssl=shared causes compile errors). (Jani)
diff --git a/configure.in b/configure.in
index caaddc8baa..f0583304e0 100644
--- a/configure.in
+++ b/configure.in
@@ -1206,13 +1206,6 @@ if test "\$CONFIG_FILES" = "$ALL_OUTPUT_FILES" || test "\$CONFIG_FILES" = " $ALL
   REDO_ALL=yes
 fi
 
-if test ! -f $srcdir/ext/bcmath/number.c; then
-  echo "creating number.c"
-  echo "/* Dummy File */" > $srcdir/ext/bcmath/number.c
-  echo "creating number.h"
-  echo "/* Dummy File */" > $srcdir/ext/bcmath/number.h
-fi
-
 ################################################################
 # Create configuration headers
 #
diff --git a/ext/bcmath/config.m4 b/ext/bcmath/config.m4
index a4fbb60030..0e008e736d 100644
--- a/ext/bcmath/config.m4
+++ b/ext/bcmath/config.m4
@@ -7,7 +7,7 @@ PHP_ARG_ENABLE(bcmath, whether to enable bc style precision math functions,
 
 if test "$PHP_BCMATH" != "no"; then
   AC_DEFINE(WITH_BCMATH, 1, [Whether you have bcmath])
-  PHP_NEW_EXTENSION(bcmath, bcmath.c number.c \
+  PHP_NEW_EXTENSION(bcmath, bcmath.c \
 libbcmath/src/add.c libbcmath/src/div.c libbcmath/src/init.c libbcmath/src/neg.c libbcmath/src/outofmem.c libbcmath/src/raisemod.c libbcmath/src/rt.c libbcmath/src/sub.c \
 libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \
 libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \
diff --git a/ext/bcmath/libbcmath/src/bcmath.h b/ext/bcmath/libbcmath/src/bcmath.h
index 6833ce4bcf..7612eabf5d 100644
--- a/ext/bcmath/libbcmath/src/bcmath.h
+++ b/ext/bcmath/libbcmath/src/bcmath.h
@@ -52,9 +52,8 @@ typedef struct bc_struct
 			   in the case of leading zeros generated. */
     } bc_struct;
 
-#include <php.h>
-#include <ext/bcmath/php_bcmath.h>
-
+#include "php.h"
+#include "../../php_bcmath.h"
 
 /* The base used in storing the numbers in n_value above.
    Currently this MUST be 10. */
-- 
2.40.0