From cc6a1b20fd477858a5405235a406ae0604add699 Mon Sep 17 00:00:00 2001
From: foobar <sniper@php.net>
Date: Sat, 23 Jun 2001 10:21:00 +0000
Subject: [PATCH] Moved some messages to the end of configure process so they
 are easier to notice.

---
 configure.in         | 41 +++++++++++++++++++++++++++++++++--------
 ext/oci8/config.m4   |  9 ---------
 ext/oracle/config.m4 |  9 ---------
 3 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/configure.in b/configure.in
index 5f853f727a..141d01fd9e 100644
--- a/configure.in
+++ b/configure.in
@@ -1017,16 +1017,41 @@ cat <<X
 X
   fi
 
-  echo "+--------------------------------------------------------------------+"
-  echo "| License:                                                           |"
-  echo "| This software is subject to the PHP License, available in this     |"
-  echo "| distribution in the file LICENSE.  By continuing this installation |"
-  echo "| process, you are bound by the terms of this license agreement.     |"
-  echo "| If you do not agree with the terms of this license, you must abort |"
-  echo "| the installation process at this point.                            |"
-  echo "+--------------------------------------------------------------------+"
+  # Warn about linking Apache with libpthread if oci8 extension is enabled on linux.
+  if test "$PHP_OCI8" != "no"; then
+    if test "$PHP_SAPI" = "apache"; then
+      if test `uname` = "Linux"; then
+cat <<X
++--------------------------------------------------------------------+
+|                        *** WARNING ***                             |
+|                                                                    |
+| Please check that your Apache (httpd) is linked with libpthread.   |
+| If not, you have to recompile Apache with pthread. For more        |
+| details, see this page: http://www.php.net/manual/ref.oci8.php     |
+X
+      fi
+    fi
+  fi
+
+  if test "$PHP_SIGCHILD" != "yes"; then
+cat <<X
++--------------------------------------------------------------------+
+| Notice:                                                            |
+| If you encounter <defunc> processes when using a local Oracle-DB   |
+| please recompile PHP and specify --enable-sigchild when configuring|
+| (This problem has been reported un Linux using Oracle >= 8.1.5)    |
+X
+  fi
 
 cat<<X
++--------------------------------------------------------------------+
+| License:                                                           |
+| This software is subject to the PHP License, available in this     |
+| distribution in the file LICENSE.  By continuing this installation |
+| process, you are bound by the terms of this license agreement.     |
+| If you do not agree with the terms of this license, you must abort |
+| the installation process at this point.                            |
++--------------------------------------------------------------------+
 
 Thank you for using PHP.
 
diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4
index 246a7ce641..165ab9942c 100644
--- a/ext/oci8/config.m4
+++ b/ext/oci8/config.m4
@@ -34,15 +34,6 @@ if test "$PHP_OCI8" != "no"; then
   fi
   AC_MSG_RESULT($OCI8_DIR)
 
-  if test "$PHP_SIGCHILD" != "yes"; then
-	echo "+--------------------------------------------------------------------+"
-	echo "| Notice:                                                            |"
-	echo "| If you encounter <defunc> processes when using a local Oracle-DB   |"
-	echo "| please recompile PHP and specify --enable-sigchild when configuring|"
-	echo "| (This problem has been reported un Linux using Oracle >= 8.1.5)    |"
-	echo "+--------------------------------------------------------------------+"
-  fi
-
   if test -d "$OCI8_DIR/rdbms/public"; then
   	PHP_ADD_INCLUDE($OCI8_DIR/rdbms/public)
   fi
diff --git a/ext/oracle/config.m4 b/ext/oracle/config.m4
index 7dc8722936..2150b01700 100644
--- a/ext/oracle/config.m4
+++ b/ext/oracle/config.m4
@@ -34,15 +34,6 @@ if test "$PHP_ORACLE" != "no"; then
   fi
   AC_MSG_RESULT($ORACLE_DIR)
 
-  if test "$PHP_SIGCHILD" != "yes"; then
-    echo "+--------------------------------------------------------------------+"
-    echo "| Notice:                                                            |"
-    echo "| If you encounter <defunc> processes when using a local Oracle-DB   |"
-    echo "| please recompile PHP and specify --enable-sigchild when configuring|"
-    echo "| (This problem has been reported un Linux using Oracle >= 8.1.5)    |"
-    echo "+--------------------------------------------------------------------+"
-  fi                                                                                          
-
   if test -d "$ORACLE_DIR/rdbms/public"; then
   	PHP_ADD_INCLUDE($ORACLE_DIR/rdbms/public)
   fi
-- 
2.40.0