Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb

configure.in

@@ -432,6 +432,9 @@ AC_SUBST(HOSTNAME)
 AC_SUBST(PERL)
 AC_SUBST(PERL5)
 
+AC_PATH_PROG(DOXYGEN, doxygen, no)
+AC_SUBST(DOXYGEN)
+
 # Lock for PS
 AC_PATH_PROG(PS, ps, ps)
 AC_MSG_CHECKING("how to check if pid exists")
@@ -2907,6 +2910,7 @@ AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS)
 
 # Output results
 AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile dnl
+   ndb/docs/Makefile dnl
    ndb/Makefile ndb/include/Makefile dnl
    ndb/src/Makefile ndb/src/common/Makefile dnl
    ndb/tools/Makefile dnl

ndb/docs/Makefile → ndb/docs/Makefile.am

-include .defs.mk
-#
-# hack before full autoconf
-replace-targets := all clean
-first-docs: all
-
-include $(NDB_TOP)/Epilogue.mk
 
-all: 	ndbapidoc mgmapidoc
+all: 	do-check ndbapidoc mgmapidoc
 
-DOXYGEN =	doxygen
-DOXYTOP =	$(shell cd $(NDB_TOP); pwd)/docs
-DOXYDIR =	$(DOXYTOP)/doxygen
-DOXYTMP =	$(DOXYTOP)/.doxytmp
-DOXYOUT =	$(DOXYTOP)/.doxyout
+DOXYDIR =	doxygen
+DOXYTMP =	.doxytmp
+DOXYOUT =	.doxyout
 
 clean:
 	rm -rf ndbapi.pdf ndbapi.html mgmapi.pdf mgmapi.html
 	rm -rf $(DOXYTMP) $(DOXYOUT)
 
+do-check:
+	@set -x; \
+	if test $(PERL) = no ; then \
+	  echo "Perl needed to make docs"; \
+	  exit 1; \
+	fi; \
+	if test $(DOXYGEN) = no ; then \
+	  echo "Doxygen needed to make docs"; \
+	  exit 1; \
+	fi;
 ###
 #
 #  NDB API Programmer's Guide
 #
 ndbapidoc: ndbapi.pdf
 
-ndbapi.pdf: $(NDB_TOP)/include/ndb_version.h
+ndbapi.pdf: $(top_srcdir)/ndb/include/ndb_version.h
 	@set -x; \
-	rm -rf ndbapi.pdf ndbapi.html; \
-	rm -rf $(DOXYTMP) $(DOXYOUT); \
-	mkdir -p $(DOXYTMP) $(DOXYOUT); \
-	(cd $(NDB_TOP)/include/ndbapi && \
-		find . -type f -print | \
-		grep -v /SCCS | \
-		cpio -pdm $(DOXYTMP)); \
-	(cd $(NDB_TOP)/examples && \
-		cp -p */*.[ch]pp $(DOXYTMP)); \
-	$(DOXYDIR)/predoxy.pl; \
+	@RM@ -f ndbapi.pdf ndbapi.html; \
+	@RM@ -rf $(DOXYTMP) $(DOXYOUT); \
+	@mkdir_p@ $(DOXYTMP) $(DOXYOUT); \
+	@CP@ $(top_srcdir)/ndb/include/ndbapi/*  $(DOXYTMP); \
+	@CP@ $(top_srcdir)/ndb/examples/*/*.[ch]pp $(DOXYTMP); \
+	@PERL@ $(DOXYDIR)/predoxy.pl; \
 	mv footer.html $(DOXYTMP); \
-	(cd $(DOXYTMP) && \
-		$(DOXYGEN) $(DOXYDIR)/Doxyfile.ndbapi); \
-	$(DOXYDIR)/postdoxy.pl $(DOXYOUT)/ndbapi.latex "NDB API Programmer Guide"; \
+	(cd $(DOXYTMP) ; @DOXYGEN@ ../$(DOXYDIR)/Doxyfile.ndbapi); \
+	@PERL@ $(DOXYDIR)/postdoxy.pl $(DOXYOUT)/ndbapi.latex "NDB API Programmer Guide"; \
 	(cd $(DOXYOUT) && \
-		find ndbapi.html -print | cpio -pdm $(DOXYTOP)); \
+		find ndbapi.html -print | cpio -pdm ..); \
 	(cd $(DOXYOUT)/ndbapi.latex && \
 		pdflatex refman.tex && makeindex refman && pdflatex refman.tex && \
-		cp -p refman.pdf $(DOXYTOP)/ndbapi.pdf);
+		cp -p refman.pdf ../../ndbapi.pdf);
 
 ###
 #
@@ -52,25 +48,21 @@ ndbapi.pdf: $(NDB_TOP)/include/ndb_version.h
 #
 mgmapidoc: mgmapi.pdf
 
-mgmapi.pdf: $(NDB_TOP)/include/ndb_version.h
+mgmapi.pdf: $(top_srcdir)/ndb/include/ndb_version.h
 	@set -x; \
-	rm -rf mgmapi.pdf mgmapi.html; \
-	rm -rf $(DOXYTMP) $(DOXYOUT); \
-	mkdir -p $(DOXYTMP) $(DOXYOUT); \
-	(cd $(NDB_TOP)/include/mgmapi && \
-		find . -type f -print | \
-		grep -v /SCCS | \
-		cpio -pdm $(DOXYTMP)); \
-	$(DOXYDIR)/predoxy.pl; \
+	@RM@ -f mgmapi.pdf mgmapi.html; \
+	@RM@ -rf $(DOXYTMP) $(DOXYOUT); \
+	@mkdir_p@ $(DOXYTMP) $(DOXYOUT); \
+	@CP@ $(top_srcdir)/ndb/include/mgmapi/*  $(DOXYTMP); \
+	@PERL@ $(DOXYDIR)/predoxy.pl; \
 	mv footer.html $(DOXYTMP); \
-	(cd $(DOXYTMP) && \
-		$(DOXYGEN) $(DOXYDIR)/Doxyfile.mgmapi); \
-	$(DOXYDIR)/postdoxy.pl $(OUTDIR)/mgmapi.latex "NDB Cluster MGM API Guide"; \
+	(cd $(DOXYTMP) ; @DOXYGEN@ ../$(DOXYDIR)/Doxyfile.mgmapi); \
+	@PERL@ $(DOXYDIR)/postdoxy.pl $(DOXYOUT)/mgmapi.latex "NDB Cluster MGM API Guide"; \
 	(cd $(DOXYOUT) && \
-		find mgmapi.html -print | cpio -pdm $(DOXYTOP)); \
+		find mgmapi.html -print | cpio -pdm ..); \
 	(cd $(DOXYOUT)/mgmapi.latex && \
 		pdflatex refman.tex && makeindex refman && pdflatex refman.tex && \
-		cp -p refman.pdf $(DOXYTOP)/mgmapi.pdf);
+		cp -p refman.pdf ../../mgmapi.pdf);
 
 ###
 #  
@@ -82,7 +74,7 @@ mgmapi.pdf: $(NDB_TOP)/include/ndb_version.h
 #        src/client
 ndbdoc: DUMMY
 	mkdir -p $(OUTDIR)
-	cd $(NDB_TOP) ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.ndb
+	cd $(top_srcdir)/ndb ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.ndb
 
 ###
 #
@@ -90,8 +82,8 @@ ndbdoc: DUMMY
 
 odbcdoc: DUMMY
 	mkdir -p $(OUTDIR)
-	cd $(NDB_TOP) ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.odbc
+	cd $(top_srcdir)/ndb ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.odbc
 
 testdoc: DUMMY
 	mkdir -p $(OUTDIR)
-	cd $(NDB_TOP) ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.test
+	cd $(top_srcdir)/ndb ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.test

ndb/docs/doxygen/postdoxy.pl

-#!/usr/local/bin/perl
 #
 #  Written by Lars Thalmann, lars@mysql.com, 2003.
 #

ndb/docs/doxygen/predoxy.pl

-#!/usr/local/bin/perl
 #
 #  Written by Lars Thalmann, lars@mysql.com, 2003.
 #