------------------------------------------------------------
revno: 11813
revision-id: squid3@treenet.co.nz-20111024011517-6b7lg1834ydr05mp
parent: squid3@treenet.co.nz-20111024004216-a5i2mhjald6xs4u0
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: trunk
timestamp: Mon 2011-10-24 14:15:17 +1300
message:
  Detect missing cppunit/extensions/HelperMacros.h for compat
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20111024011517-6b7lg1834ydr05mp
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: f4cb45a7501f08846f8e6e666155932f8b36c687
# timestamp: 2011-10-24 02:01:16 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: squid3@treenet.co.nz-20111024004216-\
#   a5i2mhjald6xs4u0
# 
# Begin patch
=== modified file 'compat/cppunit.h'
--- compat/cppunit.h	2011-08-02 07:31:53 +0000
+++ compat/cppunit.h	2011-10-24 01:15:17 +0000
@@ -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 */

=== modified file 'configure.ac'
--- configure.ac	2011-10-23 02:03:09 +0000
+++ configure.ac	2011-10-24 01:15:17 +0000
@@ -2252,6 +2252,10 @@
   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)