From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 24 Oct 2011 01:15:17 +0000 (+1300)
Subject: Detect missing cppunit/extensions/HelperMacros.h for compat
X-Git-Tag: BumpSslServerFirst.take01~77
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7b81a8f7d5915a61d2a5105e018717bac9f35505;p=thirdparty%2Fsquid.git

Detect missing cppunit/extensions/HelperMacros.h for compat
---

diff --git a/compat/cppunit.h b/compat/cppunit.h
index 4ae60b66e4..55ba6581d1 100644
--- a/compat/cppunit.h
+++ b/compat/cppunit.h
@@ -3,6 +3,7 @@
 
 // CPPUNIT test suite uses auto_ptr which is deprecated in C++0x
 
+#if HAVE_CPPUNIT_EXTENSIONS_HELPERMACROS_H
 #if defined(__cplusplus) && HAVE_UNIQUE_PTR
 #include <cppunit/extensions/HelperMacros.h>
 
@@ -29,5 +30,5 @@
 
 
 #endif /* HAVE_UNIQUE_PTR */
-
+#endif /* HAVE_CPPUNIT_EXTENSIONS_HELPERMACROS_H */
 #endif /* SQUID_COMPAT_CPPUNIT_H */
diff --git a/configure.ac b/configure.ac
index 62ecb0220b..f639126b01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2252,6 +2252,10 @@ else
   AC_MSG_ERROR(Cannot find cppunit at $withval)
 fi
 ])
+SQUID_STATE_SAVE(squid_cppunit_state)
+CXXFLAGS="$CXXFLAGS $SQUID_CPPUNIT_INC"
+AC_CHECK_HEADERS(cppunit/extensions/HelperMacros.h)
+SQUID_STATE_ROLLBACK(squid_cppunit_state)
 AC_SUBST(SQUID_CPPUNIT_LIBS)
 AC_SUBST(SQUID_CPPUNIT_LA)
 AC_SUBST(SQUID_CPPUNIT_INC)