[Mockpp-commits] mockpp ChangeLog,1.75,1.76 configure.in,1.94,1.95 run-configure-unicode.sh,1.5,1.6

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

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

Modified Files:
	ChangeLog configure.in run-configure-unicode.sh 
Log Message:
conditional generation of the docs

Index: run-configure-unicode.sh
===================================================================
RCS file: /cvsroot/mockpp/mockpp/run-configure-unicode.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- run-configure-unicode.sh	25 Oct 2005 19:11:21 -0000	1.5
+++ run-configure-unicode.sh	18 Nov 2005 20:32:36 -0000	1.6
@@ -3,9 +3,11 @@
 
 if  which "gcc-4.0"; then
   MYCC="ccache g++-4.0";
-else  
+else
   MYCC="ccache g++";
 fi
 echo mycc: $MYCC
 
-CFLAGS="$MYFLAGS" CXXFLAGS="$MYFLAGS" CXX=$MYCC CC=$MYCC ${0%/*}/configure  --enable-unicode --enable-debug=full  --prefix=/tmp/mockpp-install
+OPTS="--enable-doxygen --enable-docbook"
+
+CFLAGS="$MYFLAGS" CXXFLAGS="$MYFLAGS" CXX=$MYCC CC=$MYCC ${0%/*}/configure  --enable-unicode --enable-debug=full $OPTS --prefix=/tmp/mockpp-install

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- ChangeLog	14 Nov 2005 17:26:11 -0000	1.75
+++ ChangeLog	18 Nov 2005 20:32:36 -0000	1.76
@@ -6,7 +6,7 @@
 2005-11-13  1.10.0:
 
  - fixes for g++ 4.0
- - format boolean as "true" istead "1"
+ - format boolean as "true" instead "1"
  - created generator scripts to build classes based on increasing numbers
    of parameters to enable methods with more than 5 parameters
  - added template based classes to mock methods (chainable and visitable)

Index: configure.in
===================================================================
RCS file: /cvsroot/mockpp/mockpp/configure.in,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- configure.in	14 Nov 2005 19:42:39 -0000	1.94
+++ configure.in	18 Nov 2005 20:32:36 -0000	1.95
@@ -195,6 +195,15 @@
 # ----------------------------------------------------------------------------
 
 AC_DEFUN([EA_ENABLE_DOXYGEN],[
+
+AC_ARG_ENABLE(doxygen, [  --enable-doxygen        enable documentation generation with doxygen (no)], [], [ enable_doxygen=no])
+if test "x$enable_doxygen" = xno; then
+        enable_doxy=no
+else
+        enable_doxy=yes
+fi
+AM_CONDITIONAL(DOXYGEN_DOC, test x$enable_doxy = xyes)
+
 AC_PATH_PROG(DOXYGEN, doxygen, , $PATH)
 if test x$DOXYGEN = x; then
   DOXYGEN=doxygen
@@ -225,6 +234,15 @@
 dnl ------------------------------------------------------------------------
 
 AC_DEFUN([EA_ENABLE_DOCBOOK],[
+
+AC_ARG_ENABLE(docbook, [  --enable-docbook        enable documentation generation with docbook (no)], [], [ enable_docbook=no])
+if test "x$enable_docbook" = xno; then
+        enable_docbook=no
+else
+        enable_docbook=yes
+fi
+AM_CONDITIONAL(DOCBOOK_DOC, test x$enable_docbook = xyes)
+
 possible_paths="/usr/bin /usr/local/bin"
 EA_FIND_FILE("xsltproc xmlto", $possible_paths, xsltproc_path, xsltproc_bin)
 if test x$xsltproc_path != xNO; then
@@ -238,34 +256,6 @@
 fi
 
 AC_SUBST(XSLTPROC)
-
-possible_paths="/usr/share/xml/docbook/stylesheet/nwalsh/current/html /usr/share/docbook-xsl/html"
-EA_FIND_FILE("chunk.xsl", $possible_paths, chunk_path, chunk_xsl)
-if test x$chunk_path != xNO; then
-  CHUNK_XSL=$chunk_path/$chunk_xsl
-  echo "** $CHUNK_XSL"
-else
-  CHUNK_XSL=/usr/share/xml/docbook/stylesheet/nwalsh/current/html
-  echo "*******************************************************"
-  echo "***  html/chunk.xsl not found."
-  echo "********************************************************"
-fi
-
-AC_SUBST(CHUNK_XSL)
-
-possible_paths="/usr/share/xml/docbook/stylesheet/nwalsh/current/fo /usr/share/docbook-xsl/fo"
-EA_FIND_FILE("docbook.xsl", $possible_paths, make_fo_path, make_fo_xsl)
-if test x$make_fo_path != xNO; then
-  MAKE_FO_XSL=$make_fo_path/$make_fo_xsl
-  echo "** $MAKE_FO_XSL"
-else
-  MAKE_FO_XSL=/usr/share/xml/docbook/stylesheet/nwalsh/current/html
-  echo "*******************************************************"
-  echo "***  fo/docbook.xsl not found."
-  echo "********************************************************"
-fi
-
-AC_SUBST(MAKE_FO_XSL)
 ])
 
 dnl ------------------------------------------------------------------------