* libtool.m4: Handle case where /bin/nm -p outputs multiple

symbol types (like under HP-UX 11.00).

diff --git a/ChangeLog b/ChangeLog
index f95c13c42724d5119d8678167f1408ce7dbb9f60..e32081c259ae7c58cdd60bf4e50462fc5491379a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-24 Albert Chin-A-Young <china@thewrittenword.com>
+
+       * libtool.m4: Handle case where /bin/nm -p outputs multiple
+       symbol types (like under HP-UX 11.00).
+
 2001-04-24  Thomas Tanner  <tanner@ffii.org>
 
        * TODO: describe problems with libltdl

diff --git a/libtool.m4 b/libtool.m4
index 21a9419c43366349ea57c20a9c530ef7c23c62a9..8f58a03c00046cad83d7b5365e53e1ffdd61fcf3 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -188,7 +188,7 @@ cygwin* | mingw* | pw32*)
   [symcode='[ABCDGISTW]']
   ;;
 hpux*) # Its linker distinguishes data from code symbols
-  lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^. .* \(.*\)$/extern char \1;/p'"
+  lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
   ;;
 irix*)
   [symcode='[BCDEGRST]']
@@ -218,7 +218,7 @@ fi
 for ac_symprfx in "" "_"; do
 
   # Write the raw and C identifiers.
-[lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[       ]\($symcode\)[  ][      ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"]
+[lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[       ]\($symcode$symcode*\)[         ][      ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"]
 
   # Check to see that the pipe works correctly.
   pipe_works=no
@@ -274,7 +274,7 @@ const struct {
 [lt_preloaded_symbols[] =]
 {
 EOF
-         sed 's/^. \(.*\) \(.*\)$/  {"\2", (lt_ptr_t) \&\2},/' < "$nlist" >> conftest.$ac_ext
+         sed "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" >> conftest.$ac_ext
          cat <<\EOF >> conftest.$ac_ext
   {0, (lt_ptr_t) 0}
 };