krb5 commit: Only run export-check.pl in maintainer mode

[Tom Yu]

https://github.com/krb5/krb5/commit/29255471d67077ac6f4ff8f06391e851e6451db7
commit 29255471d67077ac6f4ff8f06391e851e6451db7
Author: Tom Yu <tlyu at mit.edu>
Date:   Thu Dec 17 16:13:33 2015 -0500

    Only run export-check.pl in maintainer mode
    
    Cross compilation environments might not be using the default nm
    command.  Rather than try to communicate the correct value to
    util/export-check.pl, only run export-check.pl in maintainer mode.
    
    ticket: 8329 (new)

 src/config/pre.in     |    6 ++++++
 src/config/shlib.conf |    4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/config/pre.in b/src/config/pre.in
index b0d9015..e74a897 100644
--- a/src/config/pre.in
+++ b/src/config/pre.in
@@ -561,6 +561,12 @@ SHLIB_EXPORT_FILE=$(srcdir)/$(LIBPREFIX)$(LIBBASE).exports
 # it to another, intermediate form for the linker.
 SHLIB_EXPORT_FILE_DEP=@SHLIB_EXPORT_FILE_DEP@
 
+# Export file checker to run when building in maintainer mode on
+# Linux.  This gets included in LDCOMBINE_TAIL.
+EXPORT_CHECK_CMD = && $(PERL) -w $(top_srcdir)/util/export-check.pl \
+	$(SHLIB_EXPORT_FILE) $@
+EXPORT_CHECK = @MAINT@ $(EXPORT_CHECK_CMD)
+
 # Command to run to build a shared library.
 # In systems that require multiple commands, like AIX, it may need
 # to change to rearrange where the various parameters fit in.
diff --git a/src/config/shlib.conf b/src/config/shlib.conf
index 9dcf797..f5eb6e3 100644
--- a/src/config/shlib.conf
+++ b/src/config/shlib.conf
@@ -423,8 +423,8 @@ mips-*-netbsd*)
 	# Linux ld doesn't default to stuffing the SONAME field...
 	# Use objdump -x to examine the fields of the library
 	LDCOMBINE='$(CC) -shared -fPIC -Wl,-h,$(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT),--no-undefined'
-	# 
-	LDCOMBINE_TAIL='-Wl,--version-script binutils.versions && $(PERL) -w $(top_srcdir)/util/export-check.pl $(SHLIB_EXPORT_FILE) $@'
+	# $(EXPORT_CHECK) runs export-check.pl when in maintainer mode.
+	LDCOMBINE_TAIL='-Wl,--version-script binutils.versions $(EXPORT_CHECK)'
 	SHLIB_EXPORT_FILE_DEP=binutils.versions
 	RPATH_FLAG='-Wl,--enable-new-dtags -Wl,-rpath -Wl,'
 	# For cases where we do have dependencies on other libraries