diff --git a/acinclude.m4 b/acinclude.m4
index 811e9c0b183..eaf6d628e4e 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1817,6 +1817,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])
diff --git a/configure.in b/configure.in
index 47965876627..6b8a78615c3 100644
--- a/configure.in
+++ b/configure.in
@@ -449,13 +449,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