------------------------------------------------------------ revno: 12673 revision-id: squid3@treenet.co.nz-20140309020751-ecg34icp0zfq2psk parent: squid3@treenet.co.nz-20140220012716-wflk5chioja0f4xb committer: Amos Jeffries branch nick: 3.3 timestamp: Sat 2014-03-08 19:07:51 -0700 message: Fix pthread library detection on FreeBSD 10 We should not be using "cut -b1" anywhere to determine OS version number. It drops digits out of the major version number. ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20140309020751-ecg34icp0zfq2psk # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # testament_sha1: 26f698e586c1706f502715afcf967b625bc4dba0 # timestamp: 2014-03-09 02:23:35 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # base_revision_id: squid3@treenet.co.nz-20140220012716-\ # wflk5chioja0f4xb # # Begin patch === modified file 'configure.ac' --- configure.ac 2013-11-30 13:54:16 +0000 +++ configure.ac 2014-03-09 02:07:51 +0000 @@ -582,7 +582,7 @@ AC_MSG_NOTICE([Windows threads support automatically enabled]) ;; freebsd) - if test `echo "$squid_host_os_version" | cut -b1` -lt 7 ; then + if test `echo "$squid_host_os_version" | tr -d .` -lt 70 ; then AC_MSG_NOTICE(pthread library requires FreeBSD 7 or later) squid_opt_use_diskthreads="no" else