diff options
| -rw-r--r-- | acinclude.m4 | 16 | ||||
| -rw-r--r-- | configure.in | 11 | ||||
| -rw-r--r-- | mysql-test/ndb/Makefile.am | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | mysql-test/ndb/ndbcluster.sh | 0 | ||||
| -rw-r--r-- | ndb/Makefile.am | 3 | ||||
| -rw-r--r-- | ndb/docs/Makefile.am | 7 |
6 files changed, 33 insertions, 8 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 7c0e8890b95..8ef32c8163a 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1383,6 +1383,11 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [ --with-ndb-test Include the NDB Cluster ndbapi test programs], [ndb_test="$withval"], [ndb_test=no]) + AC_ARG_WITH([ndb-docs], + [ + --with-ndb-docs Include the NDB Cluster ndbapi and mgmapi documentation], + [ndb_docs="$withval"], + [ndb_docs=no]) AC_MSG_CHECKING([for NDB Cluster options]) AC_MSG_RESULT([]) @@ -1422,6 +1427,17 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [ ;; esac + have_ndb_docs=no + case "$ndb_docs" in + yes ) + AC_MSG_RESULT([-- including ndbapi and mgmapi documentation]) + have_ndb_docs="yes" + ;; + * ) + AC_MSG_RESULT([-- not including ndbapi and mgmapi documentation]) + ;; + esac + AC_MSG_RESULT([done.]) ]) diff --git a/configure.in b/configure.in index 6708c10347e..b8e4135a829 100644 --- a/configure.in +++ b/configure.in @@ -2919,16 +2919,23 @@ then fi AC_SUBST([ndb_transporter_opt_objs]) +ndb_opt_subdirs= ndb_bin_am_ldflags="-static" if test X"$have_ndb_test" = Xyes then - ndb_opt_test_subdirs="test" + ndb_opt_subdirs="test" + ndb_bin_am_ldflags="" +fi +if test X"$have_ndb_docs" = Xyes +then + ndb_opt_subdirs="$ndb_opt_subdirs docs" ndb_bin_am_ldflags="" fi AC_SUBST([ndb_bin_am_ldflags]) -AC_SUBST([ndb_opt_test_subdirs]) +AC_SUBST([ndb_opt_subdirs]) AC_CONFIG_FILES(ndb/Makefile ndb/include/Makefile dnl ndb/src/Makefile ndb/src/common/Makefile dnl + ndb/docs/Makefile dnl ndb/tools/Makefile dnl ndb/src/common/debugger/Makefile ndb/src/common/debugger/signaldata/Makefile dnl ndb/src/common/portlib/Makefile dnl diff --git a/mysql-test/ndb/Makefile.am b/mysql-test/ndb/Makefile.am index 44627c85bb5..3ed222344a6 100644 --- a/mysql-test/ndb/Makefile.am +++ b/mysql-test/ndb/Makefile.am @@ -4,9 +4,9 @@ testdir = $(benchdir_root)/mysql-test/ndb test_SCRIPTS = ndbcluster -EXTRA_SCRIPTS = ndbcluster.sh +noinst_HEADERS = ndbcluster.sh -test_DATA = ndb_config_2_node.ini +dist_test_DATA = ndb_config_2_node.ini SUFFIXES = .sh diff --git a/mysql-test/ndb/ndbcluster.sh b/mysql-test/ndb/ndbcluster.sh index 5334604db33..5334604db33 100755..100644 --- a/mysql-test/ndb/ndbcluster.sh +++ b/mysql-test/ndb/ndbcluster.sh diff --git a/ndb/Makefile.am b/ndb/Makefile.am index 5cd52010f1d..82f424fcfb4 100644 --- a/ndb/Makefile.am +++ b/ndb/Makefile.am @@ -1,4 +1,5 @@ -SUBDIRS = src tools . include $(ndb_opt_test_subdirs) +SUBDIRS = src tools . include @ndb_opt_subdirs@ +DIST_SUBDIRS = src tools include test docs EXTRA_DIST = config include $(top_srcdir)/ndb/config/common.mk.am diff --git a/ndb/docs/Makefile.am b/ndb/docs/Makefile.am index fb367fb9345..554b2fb256e 100644 --- a/ndb/docs/Makefile.am +++ b/ndb/docs/Makefile.am @@ -1,7 +1,8 @@ +DOXYDIR = doxygen +noinst_HEADERS = $(DOXYDIR)/predoxy.pl $(DOXYDIR)/postdoxy.pl $(DOXYDIR)/Doxyfile.ndbapi $(DOXYDIR)/Doxyfile.mgmapi $(DOXYDIR)/header.ndbapi.tex $(DOXYDIR)/header.mgmapi.tex all: do-check ndbapidoc mgmapidoc -DOXYDIR = doxygen DOXYTMP = .doxytmp DOXYOUT = .doxyout @@ -35,7 +36,7 @@ do-check: # ndbapidoc: ndbapi.pdf -ndbapi.pdf: $(top_srcdir)/ndb/include/ndb_version.h +ndbapi.pdf: $(noinst_HEADERS) @set -x; \ export NDB_RELEASE=$(NDB_RELEASE) \ @RM@ -f ndbapi.pdf ndbapi.html; \ @@ -59,7 +60,7 @@ ndbapi.pdf: $(top_srcdir)/ndb/include/ndb_version.h # mgmapidoc: mgmapi.pdf -mgmapi.pdf: $(top_srcdir)/ndb/include/ndb_version.h +mgmapi.pdf: $(noinst_HEADERS) @set -x; \ export NDB_RELEASE=$(NDB_RELEASE) \ @RM@ -f mgmapi.pdf mgmapi.html; \ |