[Mockpp-commits] mockpp configure.in,1.79,1.80

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

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

Modified Files:
	configure.in 
Log Message:
cygwin fix

Index: configure.in
===================================================================
RCS file: /cvsroot/mockpp/mockpp/configure.in,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- configure.in	21 May 2005 14:17:49 -0000	1.79
+++ configure.in	27 May 2005 08:20:06 -0000	1.80
@@ -194,44 +194,87 @@
 
 # ----------------------------------------------------------------------------
 
-AC_DEFUN([EA_ENABLE_DOXYGEN],
-[
-AC_ARG_ENABLE(doxygen, [  --enable-doxygen        enable documentation generation with doxygen (auto)])
-AC_ARG_ENABLE(dot, [  --enable-dot            use 'dot' to generate graphs in doxygen (auto)])
-AC_ARG_ENABLE(html-docs, [  --enable-html-docs      enable HTML generation with doxygen (yes)], [], [ enable_html_docs=yes])
-AC_ARG_ENABLE(latex-docs, [  --enable-latex-docs     enable LaTeX documentation generation with doxygen (no)], [], [ enable_latex_docs=no])
-
-if test "x$enable_doxygen" = xno; then
-        enable_doc=no
+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
-                if test "x$enable_doxygen" = xyes; then
-                        AC_MSG_ERROR([could not find doxygen])
-                fi
-                enable_doc=no
-        else
-                enable_doc=yes
-                AC_PATH_PROG(DOT, dot, , $PATH)
-        fi
+  DOXYGEN=doxygen
+  echo "*******************************************************"
+  echo "***  doxygen not found."
+  echo "********************************************************"
 fi
 
-AM_CONDITIONAL(DOC, test x$enable_doc = xyes)
+AC_SUBST(DOXYGEN)
+AC_SUBST(DOXYGEN_REPLACEMENTS)
+AC_SUBST(DOXYTAGS_DIR)
 
-if test x$DOT = x; then
-        if test "x$enable_dot" = xyes; then
-                AC_MSG_ERROR([could not find dot])
-        fi
-        enable_dot=no
+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
+  HAVE_DOT=yes
 else
-        enable_dot=yes
+  DOT_PATH=/usr/bin
+  echo "*******************************************************"
+  echo "***  dot not found."
+  echo "********************************************************"
+  HAVE_DOT=no
 fi
-AC_SUBST(enable_dot)
-AC_SUBST(enable_html_docs)
-AC_SUBST(enable_latex_docs)
+
+AC_SUBST(DOT_PATH)
+AC_SUBST(HAVE_DOT)
 ])
 
-# ----------------------------------------------------------------------------
+dnl ------------------------------------------------------------------------
+
+AC_DEFUN([EA_ENABLE_DOCBOOK],[
+possible_paths="$PATH"
+EA_FIND_FILE("xsltproc xmlto", $possible_paths, xsltproc_path, xsltproc_bin)
+if test x$xsltproc_path != xNO; then
+  XSLTPROC=$xsltproc_path/$xsltproc_bin
+  echo "** $XSLTPROC"
+else
+  XSLTPROC=xsltproc
+  echo "*******************************************************"
+  echo "***  xsl processor not found."
+  echo "********************************************************"
+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 ------------------------------------------------------------------------
+])
 
 AC_DEFUN([EA_ENABLE_UNICODE],
 [
@@ -333,6 +376,7 @@
 
 # ----------------------------------------------------------------------------
 
+EA_ENABLE_DOCBOOK
 EA_CHECK_LIBDL
 EA_ENABLE_DOXYGEN
 EA_CHECK_LIBCPPUNIT