diff options
| author | Bruno Haible <bruno@clisp.org> | 2009-04-24 03:23:19 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-04-24 04:09:12 +0200 |
| commit | b62576e3a1e93867f3c916bfb5b543485090cf92 (patch) | |
| tree | 86a9a72cc0320fd6a5429134f678ada279feddd0 | |
| parent | 5f755fddada02a264f6381974a564538950fb54a (diff) | |
| download | libunistring-b62576e3a1e93867f3c916bfb5b543485090cf92.tar.gz | |
Fix recognition of 'link' command.
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | m4/libtool.m4 | 16 |
2 files changed, 26 insertions, 2 deletions
@@ -1,3 +1,15 @@ +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. + * m4/libtool.m4 (LT_PATH_NM): When locating dumpbin or + link -dump, check if they appear to really be capable of name + listing, in order to eliminate e.g. link from coreutils. This + makes the name lister decision fall back on nm as the default + if no acceptable candidate is found, which mainly happens on + (arguably broken) cross compiles. + 2008-04-21 Bruno Haible <bruno@clisp.org> Add version metainformation in Windows resource format. diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 69ca81f..ab8fbc6 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -1,7 +1,7 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008 Free Software Foundation, Inc. +# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -3214,7 +3214,19 @@ if test "$lt_cv_path_NM" != "no"; then NM="$lt_cv_path_NM" else # Didn't find any BSD compatible name lister, look for dumpbin. - AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) + if test -n "$DUMPBIN"; then : + # Let the user override the test. + else + AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols" + ;; + *) + DUMPBIN=: + ;; + esac + fi AC_SUBST([DUMPBIN]) if test "$DUMPBIN" != ":"; then NM="$DUMPBIN" |