Update of /cvsroot/mockpp/mockpp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv613
Modified Files:
configure.in mockpp.doxygen.in
Log Message:
cygwin fix
Index: mockpp.doxygen.in
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp.doxygen.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- mockpp.doxygen.in 27 May 2005 08:00:24 -0000 1.13
+++ mockpp.doxygen.in 27 May 2005 16:50:10 -0000 1.14
@@ -1097,7 +1097,7 @@
# toolkit from AT&T and Lucent Bell Labs. The other options in this section
# have no effect if this option is set to NO (the default)
-HAVE_DOT = YES
+HAVE_DOT = @HAVE_DOT@
# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
# will generate a graph for each documented class showing the direct and
Index: configure.in
===================================================================
RCS file: /cvsroot/mockpp/mockpp/configure.in,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- configure.in 27 May 2005 08:20:06 -0000 1.80
+++ configure.in 27 May 2005 16:50:10 -0000 1.81
@@ -17,7 +17,7 @@
#
MOCKPP_MAJOR_VERSION=1
MOCKPP_MINOR_VERSION=8
-MOCKPP_PATCH_VERSION=1
+MOCKPP_PATCH_VERSION=2
MOCKPP_MICRO_VERSION=29
MOCKPP_INTERFACE_AGE=1
@@ -195,12 +195,8 @@
# ----------------------------------------------------------------------------
AC_DEFUN([EA_ENABLE_DOXYGEN],[
-possible_paths="$PATH"
-EA_FIND_FILE(doxygen, $possible_paths, doxy_path, dummy)
-if test x$doxy_path != xNO; then
- echo "** $doxy_path/doxygen"
- DOXYGEN=$doxy_path/doxygen
-else
+AC_PATH_PROG(DOXYGEN, doxygen, , $PATH)
+if test x$DOXYGEN = x; then
DOXYGEN=doxygen
echo "*******************************************************"
echo "*** doxygen not found."
@@ -208,14 +204,10 @@
fi
AC_SUBST(DOXYGEN)
-AC_SUBST(DOXYGEN_REPLACEMENTS)
-AC_SUBST(DOXYTAGS_DIR)
-possible_paths="$PATH"
-EA_FIND_FILE(dot, $possible_paths, dot_path, dummy)
-if test x$dot_path != xNO; then
- echo "** $dot_path/dot"
- DOT_PATH=$dot_path
+AC_PATH_PROG(DOT, dot, , $PATH)
+if ! test x$DOT = x; then
+ DOT_PATH=`dirname $DOT`
HAVE_DOT=yes
else
DOT_PATH=/usr/bin
@@ -226,13 +218,14 @@
fi
AC_SUBST(DOT_PATH)
+AC_SUBST(DOT)
AC_SUBST(HAVE_DOT)
])
dnl ------------------------------------------------------------------------
AC_DEFUN([EA_ENABLE_DOCBOOK],[
-possible_paths="$PATH"
+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
XSLTPROC=$xsltproc_path/$xsltproc_bin
@@ -465,6 +458,7 @@
mockpp/docs/Makefile \
mockpp/docs/api/Makefile \
mockpp/docs/en/Makefile \
+ mockpp/docs/en/customize.xsl \
mockpp/docs/en/common/Makefile \
mockpp/docs/en/images/Makefile \
mockpp/docs/en/images/callouts/Makefile \
|
