From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 21 Dec 2010 15:09:15 +0000 (-0700)
Subject: Author: Francesco Chemolli <kinkie@squid-cache.org>
X-Git-Tag: SQUID_3_1_10~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=241351dcb8a10b8b874c7e4f7ba64e0e6e6c79ef;p=thirdparty%2Fsquid.git

Author: Francesco Chemolli <kinkie@squid-cache.org>
Port from 3.2: simplified OS host and version detection

* part of the configure upgrade. These variables are used by some features now.
  This makes backporting simpler.
---

diff --git a/configure.ac b/configure.ac
index 9cb2470f5b..ee3d91424a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,6 +27,18 @@ AC_PROG_CXX
 AC_LANG([C++])
 AC_CANONICAL_HOST
 
+AC_MSG_CHECKING([simplified host os])
+simple_host_os=`echo $host_os|sed 's/[0-9].*//g;s/-.*//g'`
+squid_host_os_version=`echo $host_os|tr -d "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-"`
+if test -n "$squid_host_os_version"; then
+        squid_host_os="`echo $simple_host_os| sed s/$squid_host_os_version//g`"
+else
+        squid_host_os="$simple_host_os"
+fi 
+AC_MSG_RESULT($squid_host_os (version $squid_host_os_version))
+# on windows squid_host_os is either mingw or cygwin, version is 32
+
+
 dnl Make the squid top srcdir available to sub-packages as --with-squid=PATH
 new_configure_args="$ac_configure_args --with-squid=$ac_abs_confdir"
 ac_configure_args="$new_configure_args"