[Mockpp-commits] mockpp ChangeLog,1.38,1.39 Makefile.am,1.23,1.24 configure.in,1.68,1.69

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

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

Modified Files:
	ChangeLog Makefile.am configure.in 
Log Message:
fixes for cygwin (unicode+ascii)

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- ChangeLog	28 Mar 2005 09:39:24 -0000	1.38
+++ ChangeLog	2 Apr 2005 13:46:26 -0000	1.39
@@ -6,6 +6,7 @@
 2005-03-22  1.7.0:    - ReturnObjectList::addObjectToReturn has a counter value
                         and returns a reference to itself for chaining
                       - project files for msvc 7.1
+                      - fix for cygwin (compiles at least without unicode and static libs)
                       - minor internal cleanups
 
 2005-03-13  1.6.1:    - added missing file to the distribution

Index: Makefile.am
===================================================================
RCS file: /cvsroot/mockpp/mockpp/Makefile.am,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Makefile.am	22 Mar 2005 20:49:06 -0000	1.23
+++ Makefile.am	2 Apr 2005 13:46:26 -0000	1.24
@@ -1,4 +1,4 @@
-SUBDIRS = tool mockpp bcb5 bcbX msvc6 msvc7 msvc71 
+SUBDIRS = tool mockpp bcb5 bcbX msvc6 msvc7 msvc71
 
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
 
@@ -17,6 +17,7 @@
   INSTALL \
   README \
   TODO \
+  Makefile.cvs \
   mockpp.lsm
 
 CLEANFILES = *.~* *.~~* *~ cachegrind.out.*

Index: configure.in
===================================================================
RCS file: /cvsroot/mockpp/mockpp/configure.in,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- configure.in	25 Mar 2005 16:30:26 -0000	1.68
+++ configure.in	2 Apr 2005 13:46:26 -0000	1.69
@@ -304,6 +304,35 @@
 
 # ----------------------------------------------------------------------------
 
+AC_DEFUN([EA_CHECK_STD_WCSCMP],
+[
+
+AC_MSG_CHECKING([for std::wcscmp])
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+
+cat > conftest.$ac_ext <<EOF
+#include <string>
+int main()
+{
+  std::wcscmp(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)
+  AC_DEFINE(HAVE_STD_WCSCMP, 1, [Define if you have the std::wcscmp function.])
+else
+  AC_MSG_RESULT(no)
+fi
+
+AC_SUBST(HAVE_STD_WCSCMP)
+AC_LANG_RESTORE
+])
+
+# ----------------------------------------------------------------------------
+
 EA_CHECK_LIBDL
 EA_ENABLE_DOXYGEN
 EA_CHECK_LIBCPPUNIT
@@ -311,6 +340,7 @@
 EA_CHECK_MSGFMT
 EA_CHECK_WSTRING
 EA_CHECK_WCSCMP
+EA_CHECK_STD_WCSCMP
 
 # ----------------------------------------------------------------------------