summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2009-04-24 03:46:23 +0200
committerBruno Haible <bruno@clisp.org>2009-04-24 04:09:25 +0200
commit116c9afe2f690395dea59b38dddb6d5f1fd53b54 (patch)
tree1063add43b25f1b2f8db85f3020eb998febd6435
parentb62576e3a1e93867f3c916bfb5b543485090cf92 (diff)
downloadlibunistring-116c9afe2f690395dea59b38dddb6d5f1fd53b54.tar.gz
Fix recognition of nm command.
-rw-r--r--ChangeLog6
-rw-r--r--m4/libtool.m45
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ddda95..c3e4e98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2009-04-23 Bruno Haible <bruno@clisp.org>
+ Fix recognition of "nm" command.
+ * m4/libtool.m4 (LT_PATH_NM): Try "nm" program also when compiling for
+ mingw in a cygwin environment.
+
+2009-04-23 Bruno Haible <bruno@clisp.org>
+
* m4/libtool.m4: Fix recognition of 'link' command.
2009-01-26 Peter Rosin <peda@lysator.liu.se>
Don't settle for any dumpbin/link program as name lister.
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index ab8fbc6..53ef95a 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -3172,7 +3172,10 @@ AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
lt_cv_path_NM="$NM"
else
lt_nm_to_check="${ac_tool_prefix}nm"
- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+ if test -n "$ac_tool_prefix" \
+ && { test "$build" = "$host" \
+ || { test "$build_os" = cygwin && test "$host_os" = mingw32; }; \
+ }; then
lt_nm_to_check="$lt_nm_to_check nm"
fi
for lt_tmp_nm in $lt_nm_to_check; do