Don't detect FreeBSD 10 as FreeBSD 1 in libtool.m4.

Fixes bug #70370 (Bundled libtool.m4 doesn't handle FreeBSD 10 when building
extensions).

diff --git a/NEWS b/NEWS
index 717cac3abb017347f5f11c51f832aa97704525d2..a73fd3766c0c39f0fe7516138681123aaf4bb424 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,10 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2015, PHP 5.6.14
 
+- Core:
+  . Fixed bug #70370 (Bundled libtool.m4 doesn't handle FreeBSD 10 when
+    building extensions). (Adam)
+
 - OpenSSL:
   .  Fixed bug #55259 (openssl extension does not get the DH parameters from 
      DH key resource). (Jakub Zelenka)

diff --git a/build/libtool.m4 b/build/libtool.m4
index 37dc159882cd04860f0f0e5514f76d3259405524..f7f51642920f9888dbddb7b2a1dc5e788465849d 100644 (file)
--- a/build/libtool.m4
+++ b/build/libtool.m4
@@ -1545,7 +1545,7 @@ freebsd* | dragonfly*)
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
+    freebsd[[123]].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -3162,7 +3162,7 @@ case $host_os in
        ;;
     esac
     ;;
-  freebsd[[12]]*)
+  freebsd[[12]].*)
     # C++ shared libraries reported to be fairly broken before switch to ELF
     _LT_AC_TAGVAR(ld_shlibs, $1)=no
     ;;