Commit 42d9baf9 authored by unknown's avatar unknown
Browse files

ndb fixes for make dist 


mysql-test/ndb/ndbcluster.sh:
  Change mode to -rw-rw-r--
parent 61540a24

acinclude.m4

+16 −0
Original line number Diff line number Diff line
@@ -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.])

])

configure.in

+9 −2
Original line number Diff line number Diff line
@@ -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

mysql-test/ndb/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -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

mysql-test/ndb/ndbcluster.sh

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file

ndb/Makefile.am

+2 −1
Original line number Diff line number Diff line 
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