Skip to content

Commit cc6a1b2

Browse files
author
foobar
committed
Moved some messages to the end of configure process so they are easier
to notice.
1 parent 045acaf commit cc6a1b2

File tree

3 files changed

+33
-26
lines changed

3 files changed

+33
-26
lines changed

configure.in

Lines changed: 33 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,16 +1017,41 @@ cat <<X
10171017
X
10181018
fi
10191019
1020-
echo "+--------------------------------------------------------------------+"
1021-
echo "| License: |"
1022-
echo "| This software is subject to the PHP License, available in this |"
1023-
echo "| distribution in the file LICENSE. By continuing this installation |"
1024-
echo "| process, you are bound by the terms of this license agreement. |"
1025-
echo "| If you do not agree with the terms of this license, you must abort |"
1026-
echo "| the installation process at this point. |"
1027-
echo "+--------------------------------------------------------------------+"
1020+
# Warn about linking Apache with libpthread if oci8 extension is enabled on linux.
1021+
if test "$PHP_OCI8" != "no"; then
1022+
if test "$PHP_SAPI" = "apache"; then
1023+
if test `uname` = "Linux"; then
1024+
cat <<X
1025+
+--------------------------------------------------------------------+
1026+
| *** WARNING *** |
1027+
| |
1028+
| Please check that your Apache (httpd) is linked with libpthread. |
1029+
| If not, you have to recompile Apache with pthread. For more |
1030+
| details, see this page: http://www.php.net/manual/ref.oci8.php |
1031+
X
1032+
fi
1033+
fi
1034+
fi
1035+
1036+
if test "$PHP_SIGCHILD" != "yes"; then
1037+
cat <<X
1038+
+--------------------------------------------------------------------+
1039+
| Notice: |
1040+
| If you encounter <defunc> processes when using a local Oracle-DB |
1041+
| please recompile PHP and specify --enable-sigchild when configuring|
1042+
| (This problem has been reported un Linux using Oracle >= 8.1.5) |
1043+
X
1044+
fi
10281045
10291046
cat<<X
1047+
+--------------------------------------------------------------------+
1048+
| License: |
1049+
| This software is subject to the PHP License, available in this |
1050+
| distribution in the file LICENSE. By continuing this installation |
1051+
| process, you are bound by the terms of this license agreement. |
1052+
| If you do not agree with the terms of this license, you must abort |
1053+
| the installation process at this point. |
1054+
+--------------------------------------------------------------------+
10301055
10311056
Thank you for using PHP.
10321057

ext/oci8/config.m4

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,6 @@ if test "$PHP_OCI8" != "no"; then
3434
fi
3535
AC_MSG_RESULT($OCI8_DIR)
3636

37-
if test "$PHP_SIGCHILD" != "yes"; then
38-
echo "+--------------------------------------------------------------------+"
39-
echo "| Notice: |"
40-
echo "| If you encounter <defunc> processes when using a local Oracle-DB |"
41-
echo "| please recompile PHP and specify --enable-sigchild when configuring|"
42-
echo "| (This problem has been reported un Linux using Oracle >= 8.1.5) |"
43-
echo "+--------------------------------------------------------------------+"
44-
fi
45-
4637
if test -d "$OCI8_DIR/rdbms/public"; then
4738
PHP_ADD_INCLUDE($OCI8_DIR/rdbms/public)
4839
fi

ext/oracle/config.m4

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,6 @@ if test "$PHP_ORACLE" != "no"; then
3434
fi
3535
AC_MSG_RESULT($ORACLE_DIR)
3636

37-
if test "$PHP_SIGCHILD" != "yes"; then
38-
echo "+--------------------------------------------------------------------+"
39-
echo "| Notice: |"
40-
echo "| If you encounter <defunc> processes when using a local Oracle-DB |"
41-
echo "| please recompile PHP and specify --enable-sigchild when configuring|"
42-
echo "| (This problem has been reported un Linux using Oracle >= 8.1.5) |"
43-
echo "+--------------------------------------------------------------------+"
44-
fi
45-
4637
if test -d "$ORACLE_DIR/rdbms/public"; then
4738
PHP_ADD_INCLUDE($ORACLE_DIR/rdbms/public)
4839
fi

0 commit comments

Comments
 (0)