Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #67091: make install fails to install libphp5.so on FreeBSD 10.0
This commit is contained in:
Ferenc Kovacs 2014-06-30 01:34:05 +02:00
commit a52616b759

8
build/libtool.m4 vendored
View File

@ -1532,10 +1532,6 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
freebsd1*)
dynamic_linker=no
;;
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
@ -5843,10 +5839,6 @@ _LT_EOF
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
freebsd1*)
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
# FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
# support. Future versions do this automatically, but an explicit c++rt0.o
# does not break anything, and helps significantly (at the cost of a little