[Mockpp-commits] mockpp configure.in,1.99,1.100 run-configure-ascii.sh,1.3,1.4 run-configure-unicode.sh,1.9,1.10

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

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

Modified Files:
	configure.in run-configure-ascii.sh run-configure-unicode.sh 
Log Message:
ministl basically working

Index: run-configure-unicode.sh
===================================================================
RCS file: /cvsroot/mockpp/mockpp/run-configure-unicode.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- run-configure-unicode.sh	30 Nov 2005 21:47:31 -0000	1.9
+++ run-configure-unicode.sh	1 Dec 2005 18:15:08 -0000	1.10
@@ -8,7 +8,9 @@
 fi
 echo mycc: $MYCC
 
-# --disable-rtti --disable-exceptions
-OPTS="--enable-doxygen --enable-docbook --enable-builtin-stl"
 
-CFLAGS="$MYFLAGS" CXXFLAGS="$MYFLAGS" CXX=$MYCC CC=$MYCC ${0%/*}/configure  --enable-unicode --enable-debug=full $OPTS --prefix=/tmp/mockpp-install
+#OPTS="--enable-doxygen --enable-docbook"
+OPTS="$OPTS --enable-builtin-stl"  #   --disable-exceptions  --disable-rtti
+#OPTS="$OPTS --enable-debug=full"
+
+CFLAGS="$MYFLAGS" CXXFLAGS="$MYFLAGS" CXX=$MYCC CC=$MYCC ${0%/*}/configure  --enable-unicode $OPTS --prefix=/tmp/mockpp-install

Index: run-configure-ascii.sh
===================================================================
RCS file: /cvsroot/mockpp/mockpp/run-configure-ascii.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- run-configure-ascii.sh	7 Oct 2005 21:15:59 -0000	1.3
+++ run-configure-ascii.sh	1 Dec 2005 18:15:08 -0000	1.4
@@ -1,4 +1,16 @@
 #!/bin/sh
 MYFLAGS="-O0 -g3 -Wall -Werror"
-MYCC="ccache g++"
-CFLAGS="$MYFLAGS" CXXFLAGS="$MYFLAGS" CXX=$MYCC CC=$MYCC ${0%/*}/configure  --enable-debug=full  --prefix=/tmp/mockpp-install
\ No newline at end of file
+
+if  which "gcc-4.0"; then
+  MYCC="ccache g++-4.0";
+else
+  MYCC="ccache g++";
+fi
+echo mycc: $MYCC
+
+
+#OPTS="--enable-doxygen --enable-docbook"
+#OPTS="$OPTS --enable-builtin-stl --disable-rtti --disable-exceptions"
+#OPTS="$OPTS --enable-debug=full"
+
+CFLAGS="$MYFLAGS" CXXFLAGS="$MYFLAGS" CXX=$MYCC CC=$MYCC ${0%/*}/configure $OPTS --prefix=/tmp/mockpp-install

Index: configure.in
===================================================================
RCS file: /cvsroot/mockpp/mockpp/configure.in,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- configure.in	30 Nov 2005 21:47:31 -0000	1.99
+++ configure.in	1 Dec 2005 18:15:07 -0000	1.100
@@ -16,12 +16,12 @@
 # if backwards compatibility has been broken, set MOCKPP_BINARY_AGE and MOCKPP_INTERFACE_AGE to 0.
 #
 MOCKPP_MAJOR_VERSION=1
-MOCKPP_MINOR_VERSION=10
+MOCKPP_MINOR_VERSION=11
 MOCKPP_PATCH_VERSION=0
 
-MOCKPP_MICRO_VERSION=34
-MOCKPP_INTERFACE_AGE=0
-MOCKPP_BINARY_AGE=0
+MOCKPP_MICRO_VERSION=35
+MOCKPP_INTERFACE_AGE=1
+MOCKPP_BINARY_AGE=1
 
 MOCKPP_VERSION=$MOCKPP_MAJOR_VERSION.$MOCKPP_MINOR_VERSION.$MOCKPP_PATCH_VERSION
 
@@ -298,6 +298,7 @@
    [Define to use built-in mini stl.])
 fi
 ])
+AM_CONDITIONAL(BUILTIN_MINISTL, test x$enable_builtin_stl = xyes)
 
 dnl ------------------------------------------------------------------------
 dnl Find a file (or one of more files in a list of dirs)