sniper Sun Jan 9 20:11:10 2005 EDT
Modified files:
/php-src configure.in
Log:
- The pic/no-pic patch by Joe Orton.
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.535&r2=1.536&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.535 php-src/configure.in:1.536
--- php-src/configure.in:1.535 Sun Jan 9 16:05:04 2005
+++ php-src/configure.in Sun Jan 9 20:11:09 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.535 2005/01/09 21:05:04 sniper Exp $ -*- autoconf
-*-
+dnl ## $Id: configure.in,v 1.536 2005/01/10 01:11:09 sniper Exp $ -*- autoconf
-*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -232,6 +232,21 @@
;;
esac
+# Disable PIC mode by default where it is known to be safe to do so,
+# to avoid the performance hit from the lost register
+AC_MSG_CHECKING([whether to force non-PIC code in shared modules])
+case $host_alias in
+i?86-*-linux*|i?86-*-freebsd*)
+ if test "${with_pic+set}" != "set"; then
+ with_pic=no
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ fi
+ ;;
+*) AC_MSG_RESULT(no) ;;
+esac
+
dnl Include Zend and TSRM configurations.
dnl -------------------------------------------------------------------------
@@ -881,7 +896,6 @@
enable_shared=yes
enable_static=yes
-unset with_pic
case $php_build_target in
program|static)
@@ -892,7 +906,9 @@
;;
shared)
enable_static=no
- standard_libtool_flag=-prefer-pic
+ if test "${with_pic+set}" != "set"; then
+ standard_libtool_flag='-prefer-pic'
+ fi
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module"
;;
esac
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
