------------------------------------------------------------
revno: 13747
revision-id: squid3@treenet.co.nz-20150210031556-bb8jutvkz9jqqm44
parent: squid3@treenet.co.nz-20150206155958-vjemankvzysep68n
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.5
timestamp: Mon 2015-02-09 19:15:56 -0800
message:
  Cygwin: Disable C++11 detection and default use
  
  The flags to enable can still be presented explicitly by the user but
  there are known clashes with POSIX / ANSI definitions that sound
  remarkably sinmilar to the Clang issues with -std=c++0x
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20150210031556-bb8jutvkz9jqqm44
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: 5d6676d1a45e2ade9e1b250d9aca571145a86f20
# timestamp: 2015-02-10 03:51:05 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squid3@treenet.co.nz-20150206155958-\
#   vjemankvzysep68n
# 
# Begin patch
=== modified file 'configure.ac'
--- configure.ac	2015-02-01 09:15:44 +0000
+++ configure.ac	2015-02-10 03:15:56 +0000
@@ -92,16 +92,19 @@
 	AC_USE_SYSTEM_EXTENSIONS
 fi
 
+# Guess the compiler type (sets squid_cv_compiler)
+SQUID_CC_GUESS_VARIANT
+
 # Check for C++11 compiler support
-if test "x$squid_host_os" != "xmingw" ; then
-    #BUG 3613: when clang -std=c++0x is used, it activates a "strict mode"
-    # in the system libraries, which makes some c99 methods unavailable
-    # (e.g. strtoll), yet configure detects them as avilable.
-    case "$CXX" in
-      *clang++*) ;; #do nothing
-      *)
-      AX_CXX_COMPILE_STDCXX_11([noext],[optional])
-    esac
+#
+# BUG 3613: when clang -std=c++0x is used, it activates a "strict mode"
+# in the system libraries, which makes some c99 methods unavailable
+# (e.g. strtoll), yet configure detects them as avilable.
+#
+# Similar POSIX issues on MinGW 32-bit and Cygwin
+#
+if ! test "x$squid_host_os" = "xmingw" -o "x$squid_host_os" = "xcygwin" -o "x$squid_cv_compiler" = "xclang"; then
+  AX_CXX_COMPILE_STDCXX_11([noext],[optional])
 fi
 
 # test for programs
@@ -198,7 +201,6 @@
   AC_SUBST([LIBADD_DL])
 fi
 
-SQUID_CC_GUESS_VARIANT
 SQUID_CC_GUESS_OPTIONS
 
 dnl find out the exe extension for this platform.