moved ndb versioning to configure and fixed ndb docs make

4 files changed, 47 insertions, 15 deletions

diff --git a/acconfig.h b/acconfig.h
index 2065cefdad9..db2a1a8755d 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -278,6 +278,12 @@
 /* mysql client protocoll version */
 #undef PROTOCOL_VERSION
 
+/* ndb version */
+#undef NDB_VERSION_MAJOR
+#undef NDB_VERSION_MINOR
+#undef NDB_VERSION_BUILD
+#undef NDB_VERSION_STATUS
+
 /* Define if qsort returns void */
 #undef QSORT_TYPE_IS_VOID
 
diff --git a/configure.in b/configure.in
index 043f65b845f..f53aadf0bf7 100644
--- a/configure.in
+++ b/configure.in
@@ -12,6 +12,12 @@ DOT_FRM_VERSION=6
 # See the libtool docs for information on how to do shared lib versions.
 SHARED_LIB_VERSION=14:0:0
 
+# ndb version
+NDB_VERSION_MAJOR=3
+NDB_VERSION_MINOR=5
+NDB_VERSION_BUILD=0
+NDB_VERSION_STATUS=beta
+
 # Set all version vars based on $VERSION. How do we do this more elegant ?
 # Remember that regexps needs to quote [ and ] since this is run through m4
 MYSQL_NO_DASH_VERSION=`echo $VERSION | sed -e "s|[[a-z]]*-.*$||"`
@@ -64,6 +70,16 @@ AC_SUBST(AVAILABLE_LANGUAGES)
 AC_SUBST(AVAILABLE_LANGUAGES_ERRORS)
 AC_SUBST_FILE(AVAILABLE_LANGUAGES_ERRORS_RULES)
 
+AC_SUBST([NDB_VERSION_MAJOR])
+AC_SUBST([NDB_VERSION_MINOR])
+AC_SUBST([NDB_VERSION_BUILD])
+AC_SUBST([NDB_VERSION_STATUS])
+AC_DEFINE_UNQUOTED([NDB_VERSION_MAJOR], [$NDB_VERSION_MAJOR])
+AC_DEFINE_UNQUOTED([NDB_VERSION_MINOR], [$NDB_VERSION_MINOR])
+AC_DEFINE_UNQUOTED([NDB_VERSION_BUILD], [$NDB_VERSION_BUILD])
+AC_DEFINE_UNQUOTED([NDB_VERSION_STATUS], ["$NDB_VERSION_STATUS"])
+
+
 # Canonicalize the configuration name.
 SYSTEM_TYPE="$host_vendor-$host_os"
 MACHINE_TYPE="$host_cpu"
@@ -432,8 +448,14 @@ AC_SUBST(HOSTNAME)
 AC_SUBST(PERL)
 AC_SUBST(PERL5)
 
+# for build ndb docs
+
 AC_PATH_PROG(DOXYGEN, doxygen, no)
+AC_PATH_PROG(PDFLATEX, pdflatex, no)
+AC_PATH_PROG(MAKEINDEX, makeindex, no)
 AC_SUBST(DOXYGEN)
+AC_SUBST(PDFLATEX)
+AC_SUBST(MAKEINDEX)
 
 # Lock for PS
 AC_PATH_PROG(PS, ps, ps)
diff --git a/ndb/docs/Makefile.am b/ndb/docs/Makefile.am
index 0ece3607a09..fb367fb9345 100644
--- a/ndb/docs/Makefile.am
+++ b/ndb/docs/Makefile.am
@@ -5,19 +5,29 @@ DOXYDIR =	doxygen
 DOXYTMP =	.doxytmp
 DOXYOUT =	.doxyout
 
+NDB_RELEASE = @NDB_VERSION_MAJOR@.@NDB_VERSION_MINOR@.@NDB_VERSION_BUILD@-@NDB_VERSION_STATUS@
+
 clean:
 	rm -rf ndbapi.pdf ndbapi.html mgmapi.pdf mgmapi.html
 	rm -rf $(DOXYTMP) $(DOXYOUT)
 
 do-check:
 	@set -x; \
-	if test $(PERL) = no ; then \
+	if test @PERL@ = no ; then \
 	  echo "Perl needed to make docs"; \
 	  exit 1; \
 	fi; \
-	if test $(DOXYGEN) = no ; then \
+	if test @DOXYGEN@ = no ; then \
 	  echo "Doxygen needed to make docs"; \
 	  exit 1; \
+	fi; \
+	if test @PDFLATEX@ = no ; then \
+	  echo "Pdflatex needed to make docs"; \
+	  exit 1; \
+	fi; \
+	if test @MAKEINDEX@ = no ; then \
+	  echo "Makeindex needed to make docs"; \
+	  exit 1; \
 	fi;
 ###
 #
@@ -27,9 +37,10 @@ ndbapidoc: ndbapi.pdf
 
 ndbapi.pdf: $(top_srcdir)/ndb/include/ndb_version.h
 	@set -x; \
+	export NDB_RELEASE=$(NDB_RELEASE) \
 	@RM@ -f ndbapi.pdf ndbapi.html; \
 	@RM@ -rf $(DOXYTMP) $(DOXYOUT); \
-	@mkdir_p@ $(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; \
@@ -39,7 +50,7 @@ ndbapi.pdf: $(top_srcdir)/ndb/include/ndb_version.h
 	(cd $(DOXYOUT) && \
 		find ndbapi.html -print | cpio -pdm ..); \
 	(cd $(DOXYOUT)/ndbapi.latex && \
-		pdflatex refman.tex && makeindex refman && pdflatex refman.tex && \
+		@PDFLATEX@ refman.tex && @MAKEINDEX@ refman && @PDFLATEX@ refman.tex && \
 		cp -p refman.pdf ../../ndbapi.pdf);
 
 ###
@@ -50,9 +61,10 @@ mgmapidoc: mgmapi.pdf
 
 mgmapi.pdf: $(top_srcdir)/ndb/include/ndb_version.h
 	@set -x; \
+	export NDB_RELEASE=$(NDB_RELEASE) \
 	@RM@ -f mgmapi.pdf mgmapi.html; \
 	@RM@ -rf $(DOXYTMP) $(DOXYOUT); \
-	@mkdir_p@ $(DOXYTMP) $(DOXYOUT); \
+	mkdir -p $(DOXYTMP) $(DOXYOUT); \
 	@CP@ $(top_srcdir)/ndb/include/mgmapi/*  $(DOXYTMP); \
 	@PERL@ $(DOXYDIR)/predoxy.pl; \
 	mv footer.html $(DOXYTMP); \
@@ -61,7 +73,7 @@ mgmapi.pdf: $(top_srcdir)/ndb/include/ndb_version.h
 	(cd $(DOXYOUT) && \
 		find mgmapi.html -print | cpio -pdm ..); \
 	(cd $(DOXYOUT)/mgmapi.latex && \
-		pdflatex refman.tex && makeindex refman && pdflatex refman.tex && \
+		@PDFLATEX@ refman.tex && @MAKEINDEX@ refman && @PDFLATEX@ refman.tex && \
 		cp -p refman.pdf ../../mgmapi.pdf);
 
 ###
diff --git a/ndb/include/ndb_version.h b/ndb/include/ndb_version.h
index 9bb6af59590..56362020ebf 100644
--- a/ndb/include/ndb_version.h
+++ b/ndb/include/ndb_version.h
@@ -17,19 +17,11 @@
 #ifndef NDB_VERSION_H
 #define NDB_VERSION_H
 
+#include <ndb_global.h>
 #include <version.h>
 
 #define MAKE_VERSION(A,B,C) (((A) << 16) | ((B) << 8)  | ((C) << 0))
 
-/**
- * version of this build
- */
-
-#define NDB_VERSION_MAJOR 3
-#define NDB_VERSION_MINOR 5
-#define NDB_VERSION_BUILD 0
-#define NDB_VERSION_STATUS "alpha"
-
 #define NDB_VERSION_D MAKE_VERSION(NDB_VERSION_MAJOR, NDB_VERSION_MINOR, NDB_VERSION_BUILD)
 
 #define NDB_VERSION_STRING (getVersionString(NDB_VERSION, NDB_VERSION_STATUS))