Fixed the make distcheck problem. We only really need to create libndb.ver if we are building Ndb. (dab88cfa) · Commits · Software / OSDI20 Artifacts / mariadb

config/ac-macros/ha_ndbcluster.m4

+9 −0

Original line number	Diff line number	Diff line
		@@ -145,6 +145,14 @@ AC_DEFUN([MYSQL_CHECK_NDBCLUSTER], [
		ndbcluster_system_libs=""
		ndb_mgmclient_libs="\$(top_builddir)/ndb/src/mgmclient/libndbmgmclient.la"
		MYSQL_CHECK_NDB_OPTIONS

		# libndbclient versioning when linked with GNU ld.
		if $LD --version 2>/dev/null\|grep -q GNU; then
		NDB_LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_builddir)/ndb/src/libndb.ver"
		AC_CONFIG_FILES(ndb/src/libndb.ver)
		fi
		AC_SUBST(NDB_LD_VERSION_SCRIPT)

		;;
		* )
		AC_MSG_RESULT([Not using NDB Cluster])
		@@ -156,6 +164,7 @@ AC_DEFUN([MYSQL_CHECK_NDBCLUSTER], [
		AC_SUBST(ndbcluster_libs)
		AC_SUBST(ndbcluster_system_libs)
		AC_SUBST(ndb_mgmclient_libs)

		])

		dnl ---------------------------------------------------------------------------

+0 −7

Original line number	Diff line number	Diff line
		@@ -388,13 +388,6 @@ if $LD --version 2>/dev/null\|grep -q GNU; then
		fi
		AC_SUBST(LD_VERSION_SCRIPT)

		# libndbclient versioning when linked with GNU ld.
		if $LD --version 2>/dev/null\|grep -q GNU; then
		NDB_LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_builddir)/ndb/src/libndb.ver"
		AC_CONFIG_FILES(ndb/src/libndb.ver)
		fi
		AC_SUBST(NDB_LD_VERSION_SCRIPT)


		# Avoid bug in fcntl on some versions of linux
		AC_MSG_CHECKING([if we should use 'skip-external-locking' as default for $target_os])

+0 −2

Original line number	Diff line number	Diff line
		@@ -23,8 +23,6 @@ libndbclient_la_SOURCES =

		libndbclient_la_LDFLAGS = -version-info @NDB_SHARED_LIB_VERSION@ @NDB_LD_VERSION_SCRIPT@

		BUILT_SOURCES = libndb.ver

		libndbclient_la_LIBADD = \
		ndbapi/libndbapi.la \
		common/transporter/libtransporter.la \