[Mockpp-commits] mockpp configure.in,1.115,1.116 run-configure-unicode.sh,1.19,1.20

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

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

Modified Files:
	configure.in run-configure-unicode.sh 
Log Message:
cleanup namespace disabling

Index: run-configure-unicode.sh
===================================================================
RCS file: /cvsroot/mockpp/mockpp/run-configure-unicode.sh,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- run-configure-unicode.sh	19 Mar 2006 11:09:36 -0000	1.19
+++ run-configure-unicode.sh	19 Mar 2006 16:26:49 -0000	1.20
@@ -17,8 +17,8 @@
 #OPTS="--enable-doxygen --enable-docbook"
 #OPTS="$OPTS --enable-builtin-stl" # --disable-exceptions  --disable-rtti
 OPTS="$OPTS --enable-debug=full"
-#OPTS="$OPTS --disable-namespace"
-OPTS="$OPTS --disable-builtin-cxxtest --enable-cppunit"
+OPTS="$OPTS --disable-namespace"
+#OPTS="$OPTS --disable-builtin-cxxtest --enable-cppunit"
 #OPTS="$OPTS --disable-builtin-cxxtest --enable-boosttest"
 
 CFLAGS="$MYFLAGS" CXXFLAGS="$MYFLAGS" CXX=$MYCC CC=$MYCC ${0%/*}/configure  --enable-unicode $OPTS --prefix=/tmp/mockpp-install

Index: configure.in
===================================================================
RCS file: /cvsroot/mockpp/mockpp/configure.in,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- configure.in	19 Mar 2006 11:09:36 -0000	1.115
+++ configure.in	19 Mar 2006 16:26:49 -0000	1.116
@@ -310,24 +310,26 @@
 
 AC_DEFUN([EA_DISABLE_NAMESPACE],
 [
-AC_ARG_ENABLE(disable_namespace, [  --disable-namespace do NOT use namespaces (no)], [disable_namespace=yes])
+AC_ARG_ENABLE(namespace, [  --disable-namespace do NOT use namespaces (no)], [disable_namespace=yes])
 
-if test x$disable_namespace = xyes; then
-  echo "*******************************************************"
-  echo "**  NOT using namespaces"
-  echo "*******************************************************"
-  AC_DEFINE(MOCKPP_NO_TYPENAME_FOR_STL_NS, 1, [restricted use of "typedef typename".])
-  AC_DEFINE(MOCKPP_NO_NAMESPACE, 1, [Define if you don't use mockpp namespace.])
-  AC_DEFINE(MINISTL_NO_NAMESPACE, 1, [Define if you don't use ministl namespace.])
-  AC_DEFINE(CXXTEST_NO_NAMESPACE, 1, [Define if you don't use CxxTest namespace.])
-else
+if test x$disable_namespace != xyes; then
   echo "*******************************************************"
   echo "**  normally using namespaces"
   echo "*******************************************************"
+  AH_TEMPLATE([MOCKPP_NO_STD_NUMERICLIMITS], [Define if std::numeric_limits is not working.])
   AH_TEMPLATE([MOCKPP_NO_TYPENAME_FOR_STL_NS], [restricted use of "typedef typename".])
-  AH_TEMPLATE([MOCKPP_NO_NAMESPACE], [Define if you don't use mockpp namespace.])
+  AH_TEMPLATE([MOCKPP_NO_NAMESPACE],  [Define if you don't use mockpp namespace.])
   AH_TEMPLATE([MINISTL_NO_NAMESPACE], [Define if you don't use ministl namespace.])
   AH_TEMPLATE([CXXTEST_NO_NAMESPACE], [Define if you don't use CxxTest namespace.])
+else
+  echo "*******************************************************"
+  echo "**  NOT using namespaces"
+  echo "*******************************************************"
+  AC_DEFINE(MOCKPP_NO_STD_NUMERICLIMITS, 1, [Define if std::numeric_limits is not working.])
+  AC_DEFINE(MOCKPP_NO_TYPENAME_FOR_STL_NS, 1, [restricted use of "typedef typename".])
+  AC_DEFINE(MOCKPP_NO_NAMESPACE,  1, [Define if you don't use mockpp namespace.])
+  AC_DEFINE(MINISTL_NO_NAMESPACE, 1, [Define if you don't use ministl namespace.])
+  AC_DEFINE(CXXTEST_NO_NAMESPACE, 1, [Define if you don't use CxxTest namespace.])
 fi
 ])
 AM_CONDITIONAL(DISABLE_NAMESPACE, test x$disable_namespace != xyes)
@@ -443,6 +445,36 @@
 
 # ----------------------------------------------------------------------------
 
+AC_DEFUN([EA_CHECK_STD_NS],
+[
+
+AC_MSG_CHECKING([for std namespace])
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+
+cat > conftest.$ac_ext <<EOF
+#include <string.h>
+int main()
+{
+  using namespace std;
+  return 0;
+}
+EOF
+
+ac_compile_link='${CXX} $CXXFLAGS $all_includes $all_libraries $CPPFLAGS conftest.$ac_ext'
+if AC_TRY_EVAL(ac_compile_link); then
+  AC_MSG_RESULT(yes)
+else
+  AC_DEFINE(MOCKPP_NO_STD_NS, 1, [Define if the std namespace is missing.])
+  AC_MSG_RESULT(no)
+fi
+
+AC_SUBST(MOCKPP_NO_STD_NS)
+AC_LANG_RESTORE
+])
+
+# ----------------------------------------------------------------------------
+
 AC_CXX_RTTI
 
 EA_DISABLE_EXCEPTIONS
@@ -459,6 +491,7 @@
 EA_CHECK_WCSCMP
 EA_CHECK_STD_WCSCMP
 EA_CHECK_STD_NUMERICLIMITS
+EA_CHECK_STD_NS
 EA_CHECK_LIBCPPUNIT
 EA_CHECK_BOOSTTEST