[Mockpp-commits] mockpp ChangeLog,1.90,1.91 configure.in,1.109,1.110 run-configure-unicode.sh,1.15,1.16

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13401

Modified Files:
	ChangeLog configure.in run-configure-unicode.sh 
Log Message:
fix framework dependencies 

Index: run-configure-unicode.sh
===================================================================
RCS file: /cvsroot/mockpp/mockpp/run-configure-unicode.sh,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- run-configure-unicode.sh	1 Jan 2006 10:27:21 -0000	1.15
+++ run-configure-unicode.sh	1 Jan 2006 19:40:35 -0000	1.16
@@ -11,7 +11,7 @@
 
 
 #OPTS="--enable-doxygen --enable-docbook"
-OPTS="$OPTS --enable-builtin-stl" # --disable-exceptions  --disable-rtti
+#OPTS="$OPTS --enable-builtin-stl" # --disable-exceptions  --disable-rtti
 OPTS="$OPTS --enable-debug=full"
 #OPTS="$OPTS --disable-builtin-cxxtest --enable-cppunit"
 OPTS="$OPTS --disable-builtin-cxxtest --enable-boosttest"

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- ChangeLog	30 Dec 2005 14:18:46 -0000	1.90
+++ ChangeLog	1 Jan 2006 19:40:35 -0000	1.91
@@ -9,6 +9,8 @@
  - update handbook, apidoc
  - sprinf_s only for msvc2005
  - do not create cxxtest library when usage disabled
+ - support for Boost.Test and optionally use it as framework for the internal
+   unit tests
 
 2005-11-29  1.11.0-beta1
 

Index: configure.in
===================================================================
RCS file: /cvsroot/mockpp/mockpp/configure.in,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- configure.in	1 Jan 2006 10:27:20 -0000	1.109
+++ configure.in	1 Jan 2006 19:40:35 -0000	1.110
@@ -90,7 +90,6 @@
   EA_FIND_FILE(cppunit/TestCase.h, $cppunit_inc_dirs, cppunit_inc, dummy)
   if test x$cppunit_inc != xNO; then
     echo "found cppunit/TestCase.h at $cppunit_inc"
-    EA_EXTRA_INC="$EA_EXTRA_INC -I$cppunit_inc"
     AC_DEFINE(HAVE_CPPUNIT, 1, [Define if you have CppUnit installed.])
   else
     echo "*******************************************************"
@@ -104,8 +103,6 @@
 EA_FIND_FILE(cppunit.la *cppunit.so* *cppunit*.a *cppunit*.dll*, $cppunit_lib_dirs, cppunit_lib, cppunit_name)
 if test x$cppunit_lib != xNO; then
   echo "found cppunit as $cppunit_name at $cppunit_lib"
-  LIBCPPUNIT="-lcppunit"
-  EA_EXTRA_LIB="$EA_EXTRA_LIB -L$cppunit_lib"
 else
   echo "*******************************************************"
   echo "***  *cppunit.{la,so,a,dll}* not found."
@@ -116,6 +113,9 @@
 
 if test x$cppunit_inc != xNO; then
   if test x$enable_cppunit = xyes; then
+    EA_EXTRA_INC="$EA_EXTRA_INC -I$cppunit_inc"
+    LIBCPPUNIT="-lcppunit"
+    EA_EXTRA_LIB="$EA_EXTRA_LIB -L$cppunit_lib"
     echo "*******************************************************"
     echo "**  using cppunit framework"
     echo "*******************************************************"
@@ -124,7 +124,7 @@
     echo "*******************************************************"
     echo "**  NOT using cppunit framework"
     echo "*******************************************************"
-    AH_TEMPLATE(MOCKPP_USE_CPPUNIT, [Define if you have cppunit installed.])
+    AH_TEMPLATE(MOCKPP_USE_CPPUNIT, [Define to use cppunit as framework.])
   fi
 fi