mockpp-commits

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

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

Modified Files:
	TODO configure.in run-configure-unicode.sh 
Log Message:
select test framework

Index: run-configure-unicode.sh
===================================================================
RCS file: /cvsroot/mockpp/mockpp/run-configure-unicode.sh,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- run-configure-unicode.sh	18 Dec 2005 16:56:22 -0000	1.13
+++ run-configure-unicode.sh	28 Dec 2005 09:23:30 -0000	1.14
@@ -13,5 +13,5 @@
 #OPTS="--enable-doxygen --enable-docbook"
 OPTS="$OPTS --enable-builtin-stl" # --disable-exceptions  --disable-rtti
 OPTS="$OPTS --enable-debug=full"
-OPTS="$OPTS --enable-builtin-cxxtest"
+#OPTS="$OPTS --disable-builtin-cxxtest --enable-cppunit"
 CFLAGS="$MYFLAGS" CXXFLAGS="$MYFLAGS" CXX=$MYCC CC=$MYCC ${0%/*}/configure  --enable-unicode $OPTS --prefix=/tmp/mockpp-install

Index: TODO
===================================================================
RCS file: /cvsroot/mockpp/mockpp/TODO,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- TODO	29 Jul 2005 08:00:38 -0000	1.50
+++ TODO	28 Dec 2005 09:23:29 -0000	1.51
@@ -5,6 +5,7 @@
 
 verify();
 
+ThreadedTest
 
 DOC:
 ----

Index: configure.in
===================================================================
RCS file: /cvsroot/mockpp/mockpp/configure.in,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- configure.in	18 Dec 2005 16:56:22 -0000	1.105
+++ configure.in	28 Dec 2005 09:23:30 -0000	1.106
@@ -112,6 +112,22 @@
   echo "*******************************************************"
 fi
 
+AC_ARG_ENABLE(cppunit, [  --enable-cppunit        use cppunit as framework, unless cxxtest selected (no) ], [enable_cppunit=yes])
+
+if test x$cppunit_inc != xNO; then
+  if test x$enable_cppunit = xyes; then
+    echo "*******************************************************"
+    echo "**  using cppunit framework"
+    echo "*******************************************************"
+    AC_DEFINE(MOCKPP_USE_CPPUNIT, 1, [Define to use cppunit as framework.])
+  else
+    echo "*******************************************************"
+    echo "**  NOT using cppunit framework"
+    echo "*******************************************************"
+    AH_TEMPLATE(MOCKPP_USE_CPPUNIT, [Define if you have cppunit installed.])
+  fi
+fi
+
 AC_SUBST(LIBCPPUNIT)
 ])
 
@@ -270,25 +286,25 @@
 
 AC_DEFUN([EA_BUILTIN_CXXTEST],
 [
-AC_ARG_ENABLE(builtin_cxxtest, [  --enable-builtin-cxxtest use built-in cxxtest (no)])
+AC_ARG_ENABLE(builtin_cxxtest, [  --disable-builtin-cxxtest do NOT use built-in cxxtest (no)], [disable_builtin_cxxtest=yes])
 
-if test x$enable_builtin_cxxtest = xyes; then
+if test x$disable_builtin_cxxtest != xyes; then
   echo "*******************************************************"
   echo "**  using builtin cxxtest"
   echo "*******************************************************"
   AC_DEFINE(MOCKPP_USE_BUILTIN_CXXTEST, 1, [Define to use built-in cxxtest.])
   EA_EXTRA_INC="$EA_EXTRA_INC -I\$(top_srcdir)/3party/cxxtest"
 #  EA_EXTRA_LIB="$EA_EXTRA_LIB -lmockpp_cxxtest"
-  AC_DEFINE(HAVE_CXXTEST, 1, [Define if you have CxxTest installed.])
+  AC_DEFINE(MOCKPP_USE_CXXTEST, 1, [Define if you have CxxTest installed.])
 else
   echo "*******************************************************"
   echo "**  NOT using builtin cxxtest"
   echo "*******************************************************"
-  AH_TEMPLATE(HAVE_CXXTEST, [Define if you have CxxTest installed.])
+  AH_TEMPLATE(MOCKPP_USE_CXXTEST, [Define if you have CxxTest installed.])
   AH_TEMPLATE([MOCKPP_USE_BUILTIN_CXXTEST], [Define to use built-in cxxtest.])
 fi
 ])
-AM_CONDITIONAL(BUILTIN_CXXTEST, test x$enable_builtin_cxxtest = xyes)
+AM_CONDITIONAL(BUILTIN_CXXTEST, test x$disable_builtin_cxxtest != xyes)
 
 dnl ------------------------------------------------------------------------
 dnl Find a file (or one of more files in a list of dirs)
@@ -388,6 +404,11 @@
 EA_CHECK_STD_WCSCMP
 EA_CHECK_LIBCPPUNIT
 
+# TODO
+AM_CONDITIONAL(WORKING_QT,    test x = y)
+AM_CONDITIONAL(WORKING_X11,   test x = y)
+AM_CONDITIONAL(WORKING_WIN32, test x = y)
+
 # ----------------------------------------------------------------------------
 
 AC_PATH_PROG(BZIP2, bzip2, , $PATH)