* libtool.m4: Ignore Tru64's nm's complaint.

* ltconfig.in: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 051cc12258d7734012a054f10312b9b4fa84181d..00d9768f2e645ac0d9e2182372aa52acf7089ae7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-02  Tom Kacvinsky  <tjk@ams.org>, Tim Mooney <mooney@dogbert.cc.ndsu.NoDak.edu>
+
+       * libtool.m4: Ignore Tru64's nm's complaint.
+       * ltconfig.in: Likewise.
+
 2000-09-02  Pavel Roskin <proski@gnu.org>
 
        * ltconfig.in: only load $cache_file if it's a regular file

diff --git a/libtool.m4 b/libtool.m4
index 6788fe845739935cd3918fca4f92073362f8fc38..ca6cc98c212f8f8c3775336fafdbf5b36843a8c4 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -329,7 +329,8 @@ else
       # Check to see if the nm accepts a BSD-compat flag.
       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
       #   nm: unknown option "B" ignored
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+      # Tru64's nm complains that /dev/null is an invalid object file
+      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null||Invalid file or object type)' >/dev/null; then
        ac_cv_path_NM="$tmp_nm -B"
        break
       elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then

diff --git a/ltconfig.in b/ltconfig.in
index 3bdc93007f4789cd5d1e76570929fe3079cb434a..b08999448278d6fb519b5837795a022efca894f0 100755 (executable)
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -1572,7 +1572,8 @@ if test -z "$NM"; then
        # Check to see if the nm accepts a BSD-compat flag.
        # Adding the `sed 1q' prevents false positives on HP-UX, which says:
        #   nm: unknown option "B" ignored
-       if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+       # Tru64's nm complains that /dev/null is an invalid object file
+       if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
          NM="$ac_dir/nm -B"
          break
        elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then