summaryrefslogtreecommitdiff
path: root/libsframe/configure
diff options
context:
space:
mode:
Diffstat (limited to 'libsframe/configure')
-rwxr-xr-xlibsframe/configure17
1 files changed, 10 insertions, 7 deletions
diff --git a/libsframe/configure b/libsframe/configure
index 7bbed5d8ccf..12de8b35e00 100755
--- a/libsframe/configure
+++ b/libsframe/configure
@@ -5776,15 +5776,18 @@ else
tmp_nm_to_nm="`$ECHO "$tmp_nm" | sed 's, -.*$,,'`"
if test -f "$tmp_nm_to_nm" || test -f "$tmp_nm_to_nm$ac_exeext" ; then
# Check to see if the nm accepts a BSD-compat flag.
- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # We discard lines that mention 'unknown', 'invalid', or 'usage', hopefully
+ # placating systems like Darwin and HP-UX, which mention the name of nm
+ # in error output.
# nm: unknown option "B" ignored
- case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
- *$tmp_nm*) lt_cv_path_NM="$tmp_nm -B"
+ case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | $GREP -v '^ *$' | $GREP -v 'nknown ' | $GREP -v 'nvalid ' | $GREP -v 'sage: ' | sed '1q'` in
+ *$tmp_nm*|*\ \ \ [A-Za-z]\ *|*[0-9a-f][0-9a-f][0-9a-f]\ [A-Za-z]\ *)
+ lt_cv_path_NM="$tmp_nm -B"
break
;;
*)
- case `"$tmp_nm" -p "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
- *$tmp_nm*)
+ case `"$tmp_nm" -p "$tmp_nm_to_nm" 2>&1 | $GREP -v '^ *$' | $GREP -v 'nknown ' | $GREP -v 'nvalid ' | $GREP -v 'sage: ' | sed '1q'` in
+ *$tmp_nm*|*\ \ \ [A-Za-z]\ *|*[0-9a-f][0-9a-f][0-9a-f]\ [A-Za-z]\ *)
lt_cv_path_NM="$tmp_nm -p"
break
;;
@@ -11443,7 +11446,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11446 "configure"
+#line 11449 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11549,7 +11552,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11552 "configure"
+#line 11555 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H